diff options
| author | Auke Kok <auke\-jan.h.kok@intel.com> | 2006-11-01 08:47:33 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-02 00:11:58 -0500 |
| commit | b00dae7cce465323850c3e1fd3ac8b2d9229735c (patch) | |
| tree | ac478985ba0f65a85371095a5628c8b8e60dabb0 /drivers/net/e1000 | |
| parent | 90fb51358a264f2f7e0cabdca6fc229bbc40cd91 (diff) | |
| download | op-kernel-dev-b00dae7cce465323850c3e1fd3ac8b2d9229735c.zip op-kernel-dev-b00dae7cce465323850c3e1fd3ac8b2d9229735c.tar.gz | |
e1000: Remove DISABLE_MULR debug code
Remove debugging code disabling MULR (multiple reads). It's not usable
for a wide audience and there are no known problems with MULR right
now.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
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 7b1c092..35d6d08 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -602,9 +602,6 @@ void e1000_reset(struct e1000_adapter *adapter) { uint32_t pba, manc; -#ifdef DISABLE_MULR - uint32_t tctl; -#endif uint16_t fc_high_water_mark = E1000_FC_HIGH_DIFF; /* Repartition Pba for greater than 9k mtu @@ -671,12 +668,7 @@ e1000_reset(struct e1000_adapter *adapter) e1000_reset_hw(&adapter->hw); if (adapter->hw.mac_type >= e1000_82544) E1000_WRITE_REG(&adapter->hw, WUC, 0); -#ifdef DISABLE_MULR - /* disable Multiple Reads in Transmit Control Register for debugging */ - tctl = E1000_READ_REG(hw, TCTL); - E1000_WRITE_REG(hw, TCTL, tctl & ~E1000_TCTL_MULR); -#endif if (e1000_init_hw(&adapter->hw)) DPRINTK(PROBE, ERR, "Hardware Error\n"); e1000_update_mng_vlan(adapter); |
