1 files changed, 28 insertions, 9 deletions

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 0b032c3c7b61..2f43c45b7ad6 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -4202,7 +4202,14 @@ struct l2_fhdr {
 
 #define BNX2_RBUF_CONFIG                                0x0020000c
 #define BNX2_RBUF_CONFIG_XOFF_TRIP                       (0x3ffL<<0)
+#define BNX2_RBUF_CONFIG_XOFF_TRIP_VAL(mtu)              \
+        ((((mtu) - 1500) * 31 / 1000) + 54)
 #define BNX2_RBUF_CONFIG_XON_TRIP                        (0x3ffL<<16)
+#define BNX2_RBUF_CONFIG_XON_TRIP_VAL(mtu)               \
+        ((((mtu) - 1500) * 39 / 1000) + 66)
+#define BNX2_RBUF_CONFIG_VAL(mtu)                        \
+        (BNX2_RBUF_CONFIG_XOFF_TRIP_VAL(mtu) |           \
+        (BNX2_RBUF_CONFIG_XON_TRIP_VAL(mtu) << 16))
 
 #define BNX2_RBUF_FW_BUF_ALLOC                          0x00200010
 #define BNX2_RBUF_FW_BUF_ALLOC_VALUE                     (0x1ffL<<7)
@@ -4224,11 +4231,25 @@ struct l2_fhdr {
 
 #define BNX2_RBUF_CONFIG2                               0x0020001c
 #define BNX2_RBUF_CONFIG2_MAC_DROP_TRIP                  (0x3ffL<<0)
+#define BNX2_RBUF_CONFIG2_MAC_DROP_TRIP_VAL(mtu)         \
+        ((((mtu) - 1500) * 4 / 1000) + 5)
 #define BNX2_RBUF_CONFIG2_MAC_KEEP_TRIP                  (0x3ffL<<16)
+#define BNX2_RBUF_CONFIG2_MAC_KEEP_TRIP_VAL(mtu)         \
+        ((((mtu) - 1500) * 2 / 100) + 30)
+#define BNX2_RBUF_CONFIG2_VAL(mtu)                       \
+        (BNX2_RBUF_CONFIG2_MAC_DROP_TRIP_VAL(mtu) |      \
+        (BNX2_RBUF_CONFIG2_MAC_KEEP_TRIP_VAL(mtu) << 16))
 
 #define BNX2_RBUF_CONFIG3                               0x00200020
 #define BNX2_RBUF_CONFIG3_CU_DROP_TRIP                   (0x3ffL<<0)
+#define BNX2_RBUF_CONFIG3_CU_DROP_TRIP_VAL(mtu)          \
+        ((((mtu) - 1500) * 12 / 1000) + 18)
 #define BNX2_RBUF_CONFIG3_CU_KEEP_TRIP                   (0x3ffL<<16)
+#define BNX2_RBUF_CONFIG3_CU_KEEP_TRIP_VAL(mtu)          \
+        ((((mtu) - 1500) * 2 / 100) + 30)
+#define BNX2_RBUF_CONFIG3_VAL(mtu)                       \
+        (BNX2_RBUF_CONFIG3_CU_DROP_TRIP_VAL(mtu) |       \
+        (BNX2_RBUF_CONFIG3_CU_KEEP_TRIP_VAL(mtu) << 16))
 
 #define BNX2_RBUF_PKT_DATA                              0x00208000
 #define BNX2_RBUF_CLIST_DATA                            0x00210000
@@ -6661,8 +6682,6 @@ struct bnx2_napi {
         struct bnx2_tx_ring_info        tx_ring;
 };
 
-#define BNX2_TIMER_INTERVAL                     HZ
-
 struct bnx2 {
         /* Fields used in the tx and intr/napi performance paths are grouped */
         /* together in the beginning of the structure. */
@@ -6710,7 +6729,11 @@ struct bnx2 {
 
         /* End of fields used in the performance code paths. */
 
-        int                     current_interval;
+        unsigned int            current_interval;
+#define BNX2_TIMER_INTERVAL             HZ
+#define BNX2_SERDES_AN_TIMEOUT          (HZ / 3)
+#define BNX2_SERDES_FORCED_TIMEOUT      (HZ / 10)
+
         struct                  timer_list timer;
         struct work_struct      reset_task;
 
@@ -6842,8 +6865,6 @@ struct bnx2 {
 #define PHY_LOOPBACK            2
 
         u8                      serdes_an_pending;
-#define SERDES_AN_TIMEOUT       (HZ / 3)
-#define SERDES_FORCED_TIMEOUT   (HZ / 10)
 
         u8                      mac_addr[8];
 
@@ -6854,8 +6875,6 @@ struct bnx2 {
         int                     pm_cap;
         int                     pcix_cap;
 
-        struct net_device_stats net_stats;
-
         struct flash_spec       *flash_info;
         u32                     flash_size;
 
@@ -6944,14 +6963,14 @@ struct fw_info {
 /* This value (in milliseconds) determines the frequency of the driver
  * issuing the PULSE message code.  The firmware monitors this periodic
  * pulse to determine when to switch to an OS-absent mode. */
-#define DRV_PULSE_PERIOD_MS                 250
+#define BNX2_DRV_PULSE_PERIOD_MS                 250
 
 /* This value (in milliseconds) determines how long the driver should
  * wait for an acknowledgement from the firmware before timing out.  Once
  * the firmware has timed out, the driver will assume there is no firmware
  * running and there won't be any firmware-driver synchronization during a
  * driver reset. */
-#define FW_ACK_TIME_OUT_MS                  1000
+#define BNX2_FW_ACK_TIME_OUT_MS                  1000
 
 
 #define BNX2_DRV_RESET_SIGNATURE                0x00000000