e1000 3/10:

* Set interrupt delay timer defaults to 0 across all adapters

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 94d2c66483e8fa109921fcd23088e614556c1c93..2641313621c5531c10570ea0b4beb29fa6442b38 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -914,8 +914,9 @@ e1000_configure_rx(struct e1000_adapter *adapter)
 
        /* set the Receive Delay Timer Register */
 
+       E1000_WRITE_REG(&adapter->hw, RDTR, adapter->rx_int_delay);
+
        if(adapter->hw.mac_type >= e1000_82540) {
-               E1000_WRITE_REG(&adapter->hw, RDTR, adapter->rx_int_delay);
                E1000_WRITE_REG(&adapter->hw, RADV, adapter->rx_abs_int_delay);
 
                /* Set the interrupt throttling rate.  Value is calculated
@@ -923,9 +924,6 @@ e1000_configure_rx(struct e1000_adapter *adapter)
 #define MAX_INTS_PER_SEC        8000
 #define DEFAULT_ITR             1000000000/(MAX_INTS_PER_SEC * 256)
                E1000_WRITE_REG(&adapter->hw, ITR, DEFAULT_ITR);
-
-       } else {
-               E1000_WRITE_REG(&adapter->hw, RDTR, adapter->rx_int_delay);
        }
 
        /* Setup the Base and Length of the Rx Descriptor Ring */

diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index 3ba9774a975008dbbefb094dadd496a29e5d7eba..0d1872c46b11c40da8cd28b5992309eb862c5722 100644 (file)
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -197,8 +197,7 @@ E1000_PARAM(RxAbsIntDelay, "Receive Absolute Interrupt Delay");
 #define MIN_RXD                       80
 #define MAX_82544_RXD               4096
 
-#define DEFAULT_RDTR                 128
-#define DEFAULT_RDTR_82544             0
+#define DEFAULT_RDTR                   0
 #define MAX_RXDELAY               0xFFFF
 #define MIN_RXDELAY                    0
 
@@ -398,16 +397,13 @@ e1000_check_options(struct e1000_adapter *adapter)
        }
        { /* Receive Interrupt Delay */
                char *rdtr = "using default of " __MODULE_STRING(DEFAULT_RDTR);
-               char *rdtr_82544 = "using default of "
-                                  __MODULE_STRING(DEFAULT_RDTR_82544);
                struct e1000_option opt = {
                        .type = range_option,
                        .name = "Receive Interrupt Delay",
                        .arg  = { r: { min: MIN_RXDELAY, max: MAX_RXDELAY }}
                };
-               e1000_mac_type mac_type = adapter->hw.mac_type;
-               opt.def = mac_type > e1000_82544 ? DEFAULT_RDTR : 0;
-               opt.err = mac_type > e1000_82544 ? rdtr : rdtr_82544;
+               opt.def = DEFAULT_RDTR;
+               opt.err = rdtr;
 
                adapter->rx_int_delay = RxIntDelay[bd];
                e1000_validate_option(&adapter->rx_int_delay, &opt);