diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2008-11-25 01:03:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-25 01:03:26 -0800 |
| commit | 9b07f3d3157487e6467dfa4640f7fb9446165494 (patch) | |
| tree | bce5310fadccb72b632324ab2da631667f922605 /drivers/net/igb/igb_main.c | |
| parent | 7a6b6f515f77d1c62a2f383b6dce18cb0af0cf4f (diff) | |
| download | lwn-9b07f3d3157487e6467dfa4640f7fb9446165494.tar.gz lwn-9b07f3d3157487e6467dfa4640f7fb9446165494.zip | |
igb: remove unneeded bit refrence when enabling jumbo frames
There is a reference to a Buffer Size extention bit that is unneded by
82575/82576 hardware. Since it is not needed it should be removed from the
code.
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 | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index b64c41a44dfc..ae65fae4333d 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1791,37 +1791,29 @@ static void igb_setup_rctl(struct igb_adapter *adapter) */ rctl |= E1000_RCTL_SECRC; - rctl &= ~E1000_RCTL_SBP; + /* + * disable store bad packets, long packet enable, and clear size bits. + */ + rctl &= ~(E1000_RCTL_SBP | E1000_RCTL_LPE | E1000_RCTL_SZ_256); - if (adapter->netdev->mtu <= ETH_DATA_LEN) - rctl &= ~E1000_RCTL_LPE; - else - rctl |= E1000_RCTL_LPE; - if (adapter->rx_buffer_len <= IGB_RXBUFFER_2048) { + if (adapter->netdev->mtu <= ETH_DATA_LEN) { /* Setup buffer sizes */ - rctl &= ~E1000_RCTL_SZ_4096; - rctl |= E1000_RCTL_BSEX; switch (adapter->rx_buffer_len) { case IGB_RXBUFFER_256: rctl |= E1000_RCTL_SZ_256; - rctl &= ~E1000_RCTL_BSEX; break; case IGB_RXBUFFER_512: rctl |= E1000_RCTL_SZ_512; - rctl &= ~E1000_RCTL_BSEX; break; case IGB_RXBUFFER_1024: rctl |= E1000_RCTL_SZ_1024; - rctl &= ~E1000_RCTL_BSEX; break; - case IGB_RXBUFFER_2048: default: rctl |= E1000_RCTL_SZ_2048; - rctl &= ~E1000_RCTL_BSEX; break; } } else { - rctl &= ~E1000_RCTL_BSEX; + rctl |= E1000_RCTL_LPE; srrctl = adapter->rx_buffer_len >> E1000_SRRCTL_BSIZEPKT_SHIFT; } |