diff options
author | Auke Kok <auke-jan.h.kok@intel.com> | 2006-04-14 22:05:12 -0400 |
---|---|---|
committer | Auke Kok <auke-jan.h.kok@intel.com> | 2006-04-14 22:05:12 -0400 |
commit | 6fc7a7eca70780dc1539ce68a6513f9b11891f3c (patch) | |
tree | 474efb015129d75368637ee28aecbb3262da8680 /drivers/net/e1000/e1000_main.c | |
parent | 5d51b80f9224ca5b0ba1efc5a6348cd29b5c16b7 (diff) |
e1000: Dead variable cleanup
Removal of unused rx_dropped counter.
Removed reference to E1000_CTRL_EXT_CANC which is no longer valid,
replaced with E1000_CTRL_EXT_INT_TIMER_CLR
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 7ba1b1668bf..6d7ba0bb233 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -1715,7 +1715,7 @@ e1000_configure_rx(struct e1000_adapter *adapter) | |||
1715 | if (hw->mac_type >= e1000_82571) { | 1715 | if (hw->mac_type >= e1000_82571) { |
1716 | ctrl_ext = E1000_READ_REG(hw, CTRL_EXT); | 1716 | ctrl_ext = E1000_READ_REG(hw, CTRL_EXT); |
1717 | /* Reset delay timers after every interrupt */ | 1717 | /* Reset delay timers after every interrupt */ |
1718 | ctrl_ext |= E1000_CTRL_EXT_CANC; | 1718 | ctrl_ext |= E1000_CTRL_EXT_INT_TIMER_CLR; |
1719 | #ifdef CONFIG_E1000_NAPI | 1719 | #ifdef CONFIG_E1000_NAPI |
1720 | /* Auto-Mask interrupts upon ICR read. */ | 1720 | /* Auto-Mask interrupts upon ICR read. */ |
1721 | ctrl_ext |= E1000_CTRL_EXT_IAME; | 1721 | ctrl_ext |= E1000_CTRL_EXT_IAME; |
@@ -3165,7 +3165,6 @@ e1000_update_stats(struct e1000_adapter *adapter) | |||
3165 | adapter->stats.crcerrs + adapter->stats.algnerrc + | 3165 | adapter->stats.crcerrs + adapter->stats.algnerrc + |
3166 | adapter->stats.ruc + adapter->stats.roc + | 3166 | adapter->stats.ruc + adapter->stats.roc + |
3167 | adapter->stats.cexterr; | 3167 | adapter->stats.cexterr; |
3168 | adapter->net_stats.rx_dropped = 0; | ||
3169 | adapter->net_stats.rx_length_errors = adapter->stats.ruc + | 3168 | adapter->net_stats.rx_length_errors = adapter->stats.ruc + |
3170 | adapter->stats.roc; | 3169 | adapter->stats.roc; |
3171 | adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs; | 3170 | adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs; |