diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2010-06-17 20:59:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-23 21:58:39 +0200 |
| commit | dbcb9fec5c79780152e32282297de6ddb1f6a43b (patch) | |
| tree | 0ee67157ec29215cdd4cf3e7c267ca199e5d8d2c /drivers/net/e1000e | |
| parent | e1000e: do not touch PHY page 800 registers when link speed is 1000Mbps (diff) | |
| download | linux-dbcb9fec5c79780152e32282297de6ddb1f6a43b.tar.xz linux-dbcb9fec5c79780152e32282297de6ddb1f6a43b.zip | |
e1000e: packet split should not be used with early receive
Originally it was thought there were issues with ICHx/PCH parts with packet
split when jumbo frames were enabled but in fact it is really only when
early-receive is enabled (via ERT register) on these parts. Use packet
split with jumbos but only when early-receive is not enabled.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Jeff Pieper <jeffrey.e.pieper@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/e1000e')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index aa14976c8221..71592ed2e686 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -2772,7 +2772,7 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter) * per packet. */ pages = PAGE_USE_COUNT(adapter->netdev->mtu); - if (!(adapter->flags & FLAG_IS_ICH) && (pages <= 3) && + if (!(adapter->flags & FLAG_HAS_ERT) && (pages <= 3) && (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE)) adapter->rx_ps_pages = pages; else |