diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2008-11-25 04:04:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-25 04:04:03 -0500 |
| commit | 69d728baf620839d1a3c874eecac316729f89de4 (patch) | |
| tree | 52be287a59e4f2f4cd089239b02c5488408cfff7 /drivers/net/igb/igb_main.c | |
| parent | 9b07f3d3157487e6467dfa4640f7fb9446165494 (diff) | |
igb: loopback bits not correctly cleared from RCTL register
This change forces the bits to 0 by using an &= operation with an inverted
mask of all options instead of using an |= with a value of 0.
Signed-off-by: Alexander Duyck <alexander.h.duyck@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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index ae65fae4333..ab37ab03a45 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -1779,9 +1779,9 @@ static void igb_setup_rctl(struct igb_adapter *adapter) | |||
| 1779 | rctl = rd32(E1000_RCTL); | 1779 | rctl = rd32(E1000_RCTL); |
| 1780 | 1780 | ||
| 1781 | rctl &= ~(3 << E1000_RCTL_MO_SHIFT); | 1781 | rctl &= ~(3 << E1000_RCTL_MO_SHIFT); |
| 1782 | rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC); | ||
| 1782 | 1783 | ||
| 1783 | rctl |= E1000_RCTL_EN | E1000_RCTL_BAM | | 1784 | rctl |= E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_RDMTS_HALF | |
| 1784 | E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF | | ||
| 1785 | (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT); | 1785 | (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT); |
| 1786 | 1786 | ||
| 1787 | /* | 1787 | /* |