aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Boot <bootc@bootc.net>2012-04-24 03:24:58 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-05-03 05:32:36 -0400
commit59aed95263bdd0e2b48eb9be5a94346d2d4abf90 (patch)
tree73b9473fafa2bed2e325cb323fb4c3dbb139adab
parentd4a4206ebbaf48b55803a7eb34e330530d83a889 (diff)
e1000e: Remove special case for 82573/82574 ASPM L1 disablement
For the 82573, ASPM L1 gets disabled wholesale so this special-case code is not required. For the 82574 the previous patch does the same as for the 82573, disabling L1 on the adapter. Thus, this code is no longer required and can be removed. Signed-off-by: Chris Boot <bootc@bootc.net> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index ab4505c99e67..9c4576ec36b4 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5272,14 +5272,6 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
5272 return -EINVAL; 5272 return -EINVAL;
5273 } 5273 }
5274 5274
5275 /* 82573 Errata 17 */
5276 if (((adapter->hw.mac.type == e1000_82573) ||
5277 (adapter->hw.mac.type == e1000_82574)) &&
5278 (max_frame > ETH_FRAME_LEN + ETH_FCS_LEN)) {
5279 adapter->flags2 |= FLAG2_DISABLE_ASPM_L1;
5280 e1000e_disable_aspm(adapter->pdev, PCIE_LINK_STATE_L1);
5281 }
5282
5283 while (test_and_set_bit(__E1000_RESETTING, &adapter->state)) 5275 while (test_and_set_bit(__E1000_RESETTING, &adapter->state))
5284 usleep_range(1000, 2000); 5276 usleep_range(1000, 2000);
5285 /* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */ 5277 /* e1000e_down -> e1000e_reset dependent on max_frame_size & mtu */