From: Bruce Allan Date: Thu, 17 Jun 2010 18:59:27 +0000 (+0000) Subject: e1000e: packet split should not be used with early receive X-Git-Tag: v2.6.36-rc1~571^2~516 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dbcb9fec5c79780152e32282297de6ddb1f6a43b;p=karo-tx-linux.git 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 Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller --- 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