diff options
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 5 | 
1 files changed, 1 insertions, 4 deletions
| diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index c44ed6f4ba78..a9e55dc10c55 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -1628,9 +1628,6 @@ e1000_setup_rctl(struct e1000_adapter *adapter) | |||
| 1628 | E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF | | 1628 | E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF | | 
| 1629 | (adapter->hw.mc_filter_type << E1000_RCTL_MO_SHIFT); | 1629 | (adapter->hw.mc_filter_type << E1000_RCTL_MO_SHIFT); | 
| 1630 | 1630 | ||
| 1631 | if (adapter->hw.mac_type > e1000_82543) | ||
| 1632 | rctl |= E1000_RCTL_SECRC; | ||
| 1633 | |||
| 1634 | if (adapter->hw.tbi_compatibility_on == 1) | 1631 | if (adapter->hw.tbi_compatibility_on == 1) | 
| 1635 | rctl |= E1000_RCTL_SBP; | 1632 | rctl |= E1000_RCTL_SBP; | 
| 1636 | else | 1633 | else | 
| @@ -1696,7 +1693,7 @@ e1000_setup_rctl(struct e1000_adapter *adapter) | |||
| 1696 | rfctl |= E1000_RFCTL_IPV6_DIS; | 1693 | rfctl |= E1000_RFCTL_IPV6_DIS; | 
| 1697 | E1000_WRITE_REG(&adapter->hw, RFCTL, rfctl); | 1694 | E1000_WRITE_REG(&adapter->hw, RFCTL, rfctl); | 
| 1698 | 1695 | ||
| 1699 | rctl |= E1000_RCTL_DTYP_PS | E1000_RCTL_SECRC; | 1696 | rctl |= E1000_RCTL_DTYP_PS; | 
| 1700 | 1697 | ||
| 1701 | psrctl |= adapter->rx_ps_bsize0 >> | 1698 | psrctl |= adapter->rx_ps_bsize0 >> | 
| 1702 | E1000_PSRCTL_BSIZE0_SHIFT; | 1699 | E1000_PSRCTL_BSIZE0_SHIFT; | 
