diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2006-01-18 16:01:30 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-18 16:17:57 -0500 |
commit | 35ec56bb78fda9c88cd1ad30e048ce5b4398d33f (patch) | |
tree | 8dab8de21d249b735a33c262837c991e5b23aa17 /drivers/net/e1000 | |
parent | 7eb9b2f56c9812d03ac63031869bcc42151067b1 (diff) |
[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/net/e1000')
-rw-r--r-- | drivers/net/e1000/e1000_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
1621 | { | 1621 | { |
1622 | uint32_t rctl, rfctl; | 1622 | uint32_t rctl, rfctl; |
1623 | uint32_t psrctl = 0; | 1623 | uint32_t psrctl = 0; |
1624 | #ifdef CONFIG_E1000_PACKET_SPLIT | 1624 | #ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT |
1625 | uint32_t pages = 0; | 1625 | uint32_t pages = 0; |
1626 | #endif | 1626 | #endif |
1627 | 1627 | ||
@@ -1672,7 +1672,7 @@ e1000_setup_rctl(struct e1000_adapter *adapter) | |||
1672 | } | 1672 | } |
1673 | } | 1673 | } |
1674 | 1674 | ||
1675 | #ifdef CONFIG_E1000_PACKET_SPLIT | 1675 | #ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT |
1676 | /* 82571 and greater support packet-split where the protocol | 1676 | /* 82571 and greater support packet-split where the protocol |
1677 | * header is placed in skb->data and the packet data is | 1677 | * header is placed in skb->data and the packet data is |
1678 | * placed in pages hanging off of skb_shinfo(skb)->nr_frags. | 1678 | * placed in pages hanging off of skb_shinfo(skb)->nr_frags. |