diff options
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 7b1c092d921c..35d6d080522f 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
@@ -602,9 +602,6 @@ void | |||
602 | e1000_reset(struct e1000_adapter *adapter) | 602 | e1000_reset(struct e1000_adapter *adapter) |
603 | { | 603 | { |
604 | uint32_t pba, manc; | 604 | uint32_t pba, manc; |
605 | #ifdef DISABLE_MULR | ||
606 | uint32_t tctl; | ||
607 | #endif | ||
608 | uint16_t fc_high_water_mark = E1000_FC_HIGH_DIFF; | 605 | uint16_t fc_high_water_mark = E1000_FC_HIGH_DIFF; |
609 | 606 | ||
610 | /* Repartition Pba for greater than 9k mtu | 607 | /* Repartition Pba for greater than 9k mtu |
@@ -671,12 +668,7 @@ e1000_reset(struct e1000_adapter *adapter) | |||
671 | e1000_reset_hw(&adapter->hw); | 668 | e1000_reset_hw(&adapter->hw); |
672 | if (adapter->hw.mac_type >= e1000_82544) | 669 | if (adapter->hw.mac_type >= e1000_82544) |
673 | E1000_WRITE_REG(&adapter->hw, WUC, 0); | 670 | E1000_WRITE_REG(&adapter->hw, WUC, 0); |
674 | #ifdef DISABLE_MULR | ||
675 | /* disable Multiple Reads in Transmit Control Register for debugging */ | ||
676 | tctl = E1000_READ_REG(hw, TCTL); | ||
677 | E1000_WRITE_REG(hw, TCTL, tctl & ~E1000_TCTL_MULR); | ||
678 | 671 | ||
679 | #endif | ||
680 | if (e1000_init_hw(&adapter->hw)) | 672 | if (e1000_init_hw(&adapter->hw)) |
681 | DPRINTK(PROBE, ERR, "Hardware Error\n"); | 673 | DPRINTK(PROBE, ERR, "Hardware Error\n"); |
682 | e1000_update_mng_vlan(adapter); | 674 | e1000_update_mng_vlan(adapter); |