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 /arch/ppc | |
| 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 'arch/ppc')
| -rw-r--r-- | arch/ppc/configs/bamboo_defconfig | 1 | ||||
| -rw-r--r-- | arch/ppc/configs/katana_defconfig | 1 | ||||
| -rw-r--r-- | arch/ppc/configs/mpc834x_sys_defconfig | 1 | ||||
| -rw-r--r-- | arch/ppc/configs/power3_defconfig | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/ppc/configs/bamboo_defconfig b/arch/ppc/configs/bamboo_defconfig index 0ba4e70d50b6..41fd3938fa5c 100644 --- a/arch/ppc/configs/bamboo_defconfig +++ b/arch/ppc/configs/bamboo_defconfig | |||
| @@ -499,6 +499,7 @@ CONFIG_NATSEMI=y | |||
| 499 | # CONFIG_DL2K is not set | 499 | # CONFIG_DL2K is not set |
| 500 | CONFIG_E1000=y | 500 | CONFIG_E1000=y |
| 501 | # CONFIG_E1000_NAPI is not set | 501 | # CONFIG_E1000_NAPI is not set |
| 502 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 502 | # CONFIG_NS83820 is not set | 503 | # CONFIG_NS83820 is not set |
| 503 | # CONFIG_HAMACHI is not set | 504 | # CONFIG_HAMACHI is not set |
| 504 | # CONFIG_YELLOWFIN is not set | 505 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/ppc/configs/katana_defconfig b/arch/ppc/configs/katana_defconfig index 0f3bb9af9c22..7311fe6b42de 100644 --- a/arch/ppc/configs/katana_defconfig +++ b/arch/ppc/configs/katana_defconfig | |||
| @@ -488,6 +488,7 @@ CONFIG_E100=y | |||
| 488 | # CONFIG_DL2K is not set | 488 | # CONFIG_DL2K is not set |
| 489 | CONFIG_E1000=y | 489 | CONFIG_E1000=y |
| 490 | # CONFIG_E1000_NAPI is not set | 490 | # CONFIG_E1000_NAPI is not set |
| 491 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 491 | # CONFIG_NS83820 is not set | 492 | # CONFIG_NS83820 is not set |
| 492 | # CONFIG_HAMACHI is not set | 493 | # CONFIG_HAMACHI is not set |
| 493 | # CONFIG_YELLOWFIN is not set | 494 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/ppc/configs/mpc834x_sys_defconfig b/arch/ppc/configs/mpc834x_sys_defconfig index 673dc64ebcb1..b96a6d6dad0e 100644 --- a/arch/ppc/configs/mpc834x_sys_defconfig +++ b/arch/ppc/configs/mpc834x_sys_defconfig | |||
| @@ -402,6 +402,7 @@ CONFIG_E100=y | |||
| 402 | # CONFIG_DL2K is not set | 402 | # CONFIG_DL2K is not set |
| 403 | CONFIG_E1000=y | 403 | CONFIG_E1000=y |
| 404 | # CONFIG_E1000_NAPI is not set | 404 | # CONFIG_E1000_NAPI is not set |
| 405 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 405 | # CONFIG_NS83820 is not set | 406 | # CONFIG_NS83820 is not set |
| 406 | # CONFIG_HAMACHI is not set | 407 | # CONFIG_HAMACHI is not set |
| 407 | # CONFIG_YELLOWFIN is not set | 408 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/ppc/configs/power3_defconfig b/arch/ppc/configs/power3_defconfig index 93da595a4738..a1ef929bca59 100644 --- a/arch/ppc/configs/power3_defconfig +++ b/arch/ppc/configs/power3_defconfig | |||
| @@ -442,6 +442,7 @@ CONFIG_E100=y | |||
| 442 | # CONFIG_DL2K is not set | 442 | # CONFIG_DL2K is not set |
| 443 | CONFIG_E1000=y | 443 | CONFIG_E1000=y |
| 444 | # CONFIG_E1000_NAPI is not set | 444 | # CONFIG_E1000_NAPI is not set |
| 445 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 445 | # CONFIG_NS83820 is not set | 446 | # CONFIG_NS83820 is not set |
| 446 | # CONFIG_HAMACHI is not set | 447 | # CONFIG_HAMACHI is not set |
| 447 | # CONFIG_YELLOWFIN is not set | 448 | # CONFIG_YELLOWFIN is not set |