All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Kok, Auke" <auke-jan.h.kok@intel.com>
To: "Garzik, Jeff" <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org, "Brandeburg,
	Jesse" <jesse.brandeburg@intel.com>,
	"Kok, Auke" <auke-jan.h.kok@intel.com>,
	"Kok, Auke" <auke@foo-projects.org>,
	"Ronciak, John" <john.ronciak@intel.com>
Subject: [PATCH 4/8] e1000: FIX: disable LPE for IPV6, only enable for jumbo frames
Date: Tue, 17 Oct 2006 12:02:41 -0700	[thread overview]
Message-ID: <20061017190241.4194.89455.stgit@gitlost.site> (raw)
In-Reply-To: <20061017190139.4194.20128.stgit@gitlost.site>


Allocations using alloc_page are taking too long for normal MTU, so
use LPE only for jumbo frames. Disable packet split for IPV6 extension
headers since malformed headers can hang the RX.

Signed-off-bu: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---

 drivers/net/e1000/e1000_main.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index de3dced..f19b43c 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1808,9 +1808,11 @@ e1000_setup_rctl(struct e1000_adapter *a
 	 * followed by the page buffers.  Therefore, skb->data is
 	 * sized to hold the largest protocol header.
 	 */
+	/* allocations using alloc_page take too long for regular MTU
+	 * so only enable packet split for jumbo frames */
 	pages = PAGE_USE_COUNT(adapter->netdev->mtu);
-	if ((adapter->hw.mac_type > e1000_82547_rev_2) && (pages <= 3) &&
-	    PAGE_SIZE <= 16384)
+	if ((adapter->hw.mac_type >= e1000_82571) && (pages <= 3) &&
+	    PAGE_SIZE <= 16384 && (rctl & E1000_RCTL_LPE))
 		adapter->rx_ps_pages = pages;
 	else
 		adapter->rx_ps_pages = 0;



---
Auke Kok <auke-jan.h.kok@intel.com>

  parent reply	other threads:[~2006-10-17 18:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-17 19:01 [PATCH 0/8] e100, e1000: Fixes for netdev-2.6#upstream-fixes Kok, Auke
2006-10-17 19:02 ` [PATCH 1/8] e1000: FIX: don't poke at manageability registers for incompatible adapters Kok, Auke
2006-10-17 19:02 ` [PATCH 2/8] e1000: FIX: 82542 doesn't support WoL Kok, Auke
2006-10-17 19:02 ` [PATCH 3/8] e1000: FIX: fix wrong txdctl threshold bitmasks Kok, Auke
2006-10-17 19:02 ` Kok, Auke [this message]
2006-10-17 19:02 ` [PATCH 5/8] e1000: FIX: Don't limit descriptor size to 4kb for PCI-E adapters Kok, Auke
2006-10-17 19:02 ` [PATCH 6/8] e1000: FIX: move length adjustment due to crc stripping disabled Kok, Auke
2006-10-17 19:02 ` [PATCH 7/8] e1000: Increment version to 7.2.9-k4 Kok, Auke
2006-10-17 19:02 ` [PATCH 8/8] e100: FIX: fix netconsole fast reboot attached to e100 Kok, Auke
2006-10-21 18:31 ` [PATCH 0/8] e100, e1000: Fixes for netdev-2.6#upstream-fixes Jeff Garzik
2006-10-23 15:13   ` Auke Kok
2006-10-24 21:43     ` please pull from git://lost.foo-projects.org/~ahkok/git/netdev-2.6 upstream-fixes Auke Kok

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20061017190241.4194.89455.stgit@gitlost.site \
    --to=auke-jan.h.kok@intel.com \
    --cc=auke@foo-projects.org \
    --cc=jesse.brandeburg@intel.com \
    --cc=jgarzik@pobox.com \
    --cc=john.ronciak@intel.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.