mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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>
This commit is contained in:
parent
9b07f3d315
commit
69d728baf6
2 changed files with 4 additions and 3 deletions
|
@ -1339,8 +1339,9 @@ static int igb_setup_desc_rings(struct igb_adapter *adapter)
|
|||
wr32(E1000_RDLEN(0), rx_ring->size);
|
||||
wr32(E1000_RDH(0), 0);
|
||||
wr32(E1000_RDT(0), 0);
|
||||
rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
|
||||
rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_SZ_2048 |
|
||||
E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
|
||||
E1000_RCTL_RDMTS_HALF |
|
||||
(adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
|
||||
wr32(E1000_RCTL, rctl);
|
||||
wr32(E1000_SRRCTL(0), 0);
|
||||
|
|
|
@ -1779,9 +1779,9 @@ static void igb_setup_rctl(struct igb_adapter *adapter)
|
|||
rctl = rd32(E1000_RCTL);
|
||||
|
||||
rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
|
||||
rctl &= ~(E1000_RCTL_LBM_TCVR | E1000_RCTL_LBM_MAC);
|
||||
|
||||
rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
|
||||
E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
|
||||
rctl |= E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_RDMTS_HALF |
|
||||
(adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue