e1000 2/10:

* Changed flow control defaults to minimize packet drops

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 5919a1f38666fda56d292a0f7b6ba61919cd2c61..47cdd3afd26d3ec28373ba9ea06a2133367b93d3 100644 (file)
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -95,6 +95,15 @@ struct e1000_adapter;
 #define E1000_RXBUFFER_8192  8192
 #define E1000_RXBUFFER_16384 16384
 
+/* Flow Control High-Watermark: 43464 bytes */
+#define E1000_FC_HIGH_THRESH 0xA9C8
+
+/* Flow Control Low-Watermark: 43456 bytes */
+#define E1000_FC_LOW_THRESH 0xA9C0
+
+/* Flow Control Pause Time: 858 usec */
+#define E1000_FC_PAUSE_TIME 0x0680
+
 /* How many Tx Descriptors do we need to call netif_wake_queue ? */
 #define E1000_TX_QUEUE_WAKE    16
 /* How many Rx Buffers do we bundle into one write to the hardware ? */

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 4074d06c343466770eea99f06830c16aa97fc2cb..94d2c66483e8fa109921fcd23088e614556c1c93 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -591,9 +591,9 @@ e1000_sw_init(struct e1000_adapter *adapter)
 
        /* flow control settings */
 
-       hw->fc_high_water = FC_DEFAULT_HI_THRESH;
-       hw->fc_low_water = FC_DEFAULT_LO_THRESH;
-       hw->fc_pause_time = FC_DEFAULT_TX_TIMER;
+       hw->fc_high_water = E1000_FC_HIGH_THRESH;
+       hw->fc_low_water = E1000_FC_LOW_THRESH;
+       hw->fc_pause_time = E1000_FC_PAUSE_TIME;
        hw->fc_send_xon = 1;
 
        /* Media type - copper or fiber */