usbnet: ratelimit warning messages invoked from callback handler

[safe/jmp/linux-2.6] / drivers / net / bnx2x_hsi.h

diff --git a/drivers/net/bnx2x_hsi.h b/drivers/net/bnx2x_hsi.h
index c779999..03c6242 100644 (file)
--- a/drivers/net/bnx2x_hsi.h
+++ b/drivers/net/bnx2x_hsi.h
@@ -1,6 +1,6 @@
 /* bnx2x_hsi.h: Broadcom Everest network driver.
  *
- * Copyright (c) 2007-2008 Broadcom Corporation
+ * Copyright (c) 2007-2009 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -806,11 +806,7 @@ struct mf_cfg {
 
        struct shared_mf_cfg    shared_mf_config;
        struct port_mf_cfg      port_mf_config[PORT_MAX];
-#if defined(b710)
-       struct func_mf_cfg      func_mf_config[E1_FUNC_MAX];
-#else
        struct func_mf_cfg      func_mf_config[E1H_FUNC_MAX];
-#endif
 
 };
 
@@ -1671,7 +1667,7 @@ struct xstorm_eth_ag_context {
 };
 
 /*
- * The eth aggregative context section of Tstorm
+ * The eth extra aggregative context section of Tstorm
  */
 struct tstorm_eth_extra_ag_context_section {
        u32 __agg_val1;
@@ -2238,16 +2234,6 @@ union eth_ramrod_data {
 
 
 /*
- * Rx Last BD in page (in ETH)
- */
-struct eth_rx_bd_next_page {
-       u32 addr_lo;
-       u32 addr_hi;
-       u8 reserved[8];
-};
-
-
-/*
  * Eth Rx Cqe structure- general structure for ramrods
  */
 struct common_ramrod_eth_rx_cqe {