diff options
Diffstat (limited to 'drivers/net/igb/igb_ethtool.c')
-rw-r--r-- | drivers/net/igb/igb_ethtool.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c index bd050b1dab7f..30b7bc008d9d 100644 --- a/drivers/net/igb/igb_ethtool.c +++ b/drivers/net/igb/igb_ethtool.c | |||
@@ -1366,8 +1366,7 @@ static int igb_setup_desc_rings(struct igb_adapter *adapter) | |||
1366 | wr32(E1000_RDH(0), 0); | 1366 | wr32(E1000_RDH(0), 0); |
1367 | wr32(E1000_RDT(0), 0); | 1367 | wr32(E1000_RDT(0), 0); |
1368 | rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC); | 1368 | rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC); |
1369 | rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 | | 1369 | rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_RDMTS_HALF | |
1370 | E1000_RCTL_RDMTS_HALF | | ||
1371 | (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT); | 1370 | (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT); |
1372 | wr32(E1000_RCTL, rctl); | 1371 | wr32(E1000_RCTL, rctl); |
1373 | wr32(E1000_SRRCTL(0), 0); | 1372 | wr32(E1000_SRRCTL(0), 0); |
@@ -1855,9 +1854,6 @@ static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) | |||
1855 | return 0; | 1854 | return 0; |
1856 | } | 1855 | } |
1857 | 1856 | ||
1858 | /* toggle LED 4 times per second = 2 "blinks" per second */ | ||
1859 | #define IGB_ID_INTERVAL (HZ/4) | ||
1860 | |||
1861 | /* bit defines for adapter->led_status */ | 1857 | /* bit defines for adapter->led_status */ |
1862 | #define IGB_LED_ON 0 | 1858 | #define IGB_LED_ON 0 |
1863 | 1859 | ||