diff options
author | Nick Nunley <nicholasx.d.nunley@intel.com> | 2010-02-16 20:02:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-17 16:21:34 -0500 |
commit | 2d0b0f693578109aff347e055d47f2797c802261 (patch) | |
tree | 5b8f07bbf94a0c4d8aa5ece1aeb2cc44c9b3b48e /drivers/net/igb/igb_main.c | |
parent | 3025a446b6d0255ae4399ca5f9b259bd1b51539e (diff) |
igb: remove adaptive IFS from driver
Adaptive IFS support has been included in the igb driver since its
initial release, but it is not a feature on any igb NICs. This patch
removes it from the driver.
Signed-off-by: Nicholas Nunley <nicholasx.d.nunley@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r-- | drivers/net/igb/igb_main.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 30fb5a89c42..eb48e1a084d 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -1365,7 +1365,6 @@ void igb_reset(struct igb_adapter *adapter) | |||
1365 | /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */ | 1365 | /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */ |
1366 | wr32(E1000_VET, ETHERNET_IEEE_VLAN_TYPE); | 1366 | wr32(E1000_VET, ETHERNET_IEEE_VLAN_TYPE); |
1367 | 1367 | ||
1368 | igb_reset_adaptive(hw); | ||
1369 | igb_get_phy_info(hw); | 1368 | igb_get_phy_info(hw); |
1370 | } | 1369 | } |
1371 | 1370 | ||
@@ -1508,7 +1507,6 @@ static int __devinit igb_probe(struct pci_dev *pdev, | |||
1508 | igb_get_bus_info_pcie(hw); | 1507 | igb_get_bus_info_pcie(hw); |
1509 | 1508 | ||
1510 | hw->phy.autoneg_wait_to_complete = false; | 1509 | hw->phy.autoneg_wait_to_complete = false; |
1511 | hw->mac.adaptive_ifs = true; | ||
1512 | 1510 | ||
1513 | /* Copper options */ | 1511 | /* Copper options */ |
1514 | if (hw->phy.media_type == e1000_media_type_copper) { | 1512 | if (hw->phy.media_type == e1000_media_type_copper) { |
@@ -3159,7 +3157,6 @@ static void igb_watchdog_task(struct work_struct *work) | |||
3159 | } | 3157 | } |
3160 | 3158 | ||
3161 | igb_update_stats(adapter); | 3159 | igb_update_stats(adapter); |
3162 | igb_update_adaptive(hw); | ||
3163 | 3160 | ||
3164 | for (i = 0; i < adapter->num_tx_queues; i++) { | 3161 | for (i = 0; i < adapter->num_tx_queues; i++) { |
3165 | struct igb_ring *tx_ring = adapter->tx_ring[i]; | 3162 | struct igb_ring *tx_ring = adapter->tx_ring[i]; |
@@ -4064,11 +4061,8 @@ void igb_update_stats(struct igb_adapter *adapter) | |||
4064 | adapter->stats.mptc += rd32(E1000_MPTC); | 4061 | adapter->stats.mptc += rd32(E1000_MPTC); |
4065 | adapter->stats.bptc += rd32(E1000_BPTC); | 4062 | adapter->stats.bptc += rd32(E1000_BPTC); |
4066 | 4063 | ||
4067 | /* used for adaptive IFS */ | 4064 | adapter->stats.tpt += rd32(E1000_TPT); |
4068 | hw->mac.tx_packet_delta = rd32(E1000_TPT); | 4065 | adapter->stats.colc += rd32(E1000_COLC); |
4069 | adapter->stats.tpt += hw->mac.tx_packet_delta; | ||
4070 | hw->mac.collision_delta = rd32(E1000_COLC); | ||
4071 | adapter->stats.colc += hw->mac.collision_delta; | ||
4072 | 4066 | ||
4073 | adapter->stats.algnerrc += rd32(E1000_ALGNERRC); | 4067 | adapter->stats.algnerrc += rd32(E1000_ALGNERRC); |
4074 | adapter->stats.rxerrc += rd32(E1000_RXERRC); | 4068 | adapter->stats.rxerrc += rd32(E1000_RXERRC); |