From: Auke Kok <auke-jan.h.kok@intel.com>
To: jeff@garzik.org
Cc: netdev@vger.kernel.org, john.ronciak@intel.com,
akpm@linux-foundation.org
Subject: [PATCH 3/3] e1000e: Remove conditional packet split disable flag
Date: Wed, 22 Aug 2007 08:08:49 -0700 [thread overview]
Message-ID: <20070822150849.19918.77272.stgit@localhost.localdomain> (raw)
In-Reply-To: <20070822150839.19918.86665.stgit@localhost.localdomain>
This flag conflicts with e1000's Kconfig symbol and we'll leave
the feature enabled by default for now.
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
---
drivers/net/e1000e/netdev.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 420e111..372da46 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2009,7 +2009,6 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
break;
}
-#ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT
/*
* 82571 and greater support packet-split where the protocol
* header is placed in skb->data and the packet data is
@@ -2029,7 +2028,7 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
pages = PAGE_USE_COUNT(adapter->netdev->mtu);
if ((pages <= 3) && (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE))
adapter->rx_ps_pages = pages;
-#endif
+
if (adapter->rx_ps_pages) {
/* Configure extra packet-split registers */
rfctl = er32(RFCTL);
next prev parent reply other threads:[~2007-08-22 15:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-22 15:08 [PATCH 1/3] e1000e: retire last_tx_tso workaround Auke Kok
2007-08-22 15:08 ` [PATCH 2/3] e1000e: Add read code and printout of PBA number (board identifier) Auke Kok
2007-08-22 15:08 ` Auke Kok [this message]
2007-08-25 7:49 ` [PATCH 1/3] e1000e: retire last_tx_tso workaround Jeff Garzik
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=20070822150849.19918.77272.stgit@localhost.localdomain \
--to=auke-jan.h.kok@intel.com \
--cc=akpm@linux-foundation.org \
--cc=jeff@garzik.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).