diff options
| author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2006-01-18 13:01:30 -0800 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-18 16:17:57 -0500 |
| commit | 35ec56bb78fda9c88cd1ad30e048ce5b4398d33f (patch) | |
| tree | 8dab8de21d249b735a33c262837c991e5b23aa17 /drivers | |
| parent | 7eb9b2f56c9812d03ac63031869bcc42151067b1 (diff) | |
| download | talos-op-linux-35ec56bb78fda9c88cd1ad30e048ce5b4398d33f.tar.gz talos-op-linux-35ec56bb78fda9c88cd1ad30e048ce5b4398d33f.zip | |
[PATCH] e1000: Added disable packet split capability
Adds the ability to disability packet split at compile time and use the legacy receive path on PCI express hardware. Made this a CONFIG option and modified the Kconfig, to reflect the new option.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 1421941487c4..0c69918671ca 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1914,6 +1914,15 @@ config E1000_NAPI If in doubt, say N. +config E1000_DISABLE_PACKET_SPLIT + bool "Disable Packet Split for PCI express adapters" + depends on E1000 + help + Say Y here if you want to use the legacy receive path for PCI express + hadware. + + If in doubt, say N. + source "drivers/net/ixp2000/Kconfig" config MYRI_SBUS diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index d0a5d1656c5f..73b2a7be2126 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -1621,7 +1621,7 @@ e1000_setup_rctl(struct e1000_adapter *adapter) { uint32_t rctl, rfctl; uint32_t psrctl = 0; -#ifdef CONFIG_E1000_PACKET_SPLIT +#ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT uint32_t pages = 0; #endif @@ -1672,7 +1672,7 @@ e1000_setup_rctl(struct e1000_adapter *adapter) } } -#ifdef CONFIG_E1000_PACKET_SPLIT +#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 * placed in pages hanging off of skb_shinfo(skb)->nr_frags. |
