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/powerpc/configs | |
| 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/powerpc/configs')
| -rw-r--r-- | arch/powerpc/configs/cell_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/g5_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/iseries_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/maple_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index b657f7e44762..063b84f2cbea 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig | |||
| @@ -533,6 +533,7 @@ CONFIG_MII=y | |||
| 533 | # CONFIG_DL2K is not set | 533 | # CONFIG_DL2K is not set |
| 534 | CONFIG_E1000=m | 534 | CONFIG_E1000=m |
| 535 | # CONFIG_E1000_NAPI is not set | 535 | # CONFIG_E1000_NAPI is not set |
| 536 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 536 | # CONFIG_NS83820 is not set | 537 | # CONFIG_NS83820 is not set |
| 537 | # CONFIG_HAMACHI is not set | 538 | # CONFIG_HAMACHI is not set |
| 538 | # CONFIG_YELLOWFIN is not set | 539 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index 3c22ccb18519..d6fed3f56580 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
| @@ -675,6 +675,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y | |||
| 675 | # CONFIG_DL2K is not set | 675 | # CONFIG_DL2K is not set |
| 676 | CONFIG_E1000=y | 676 | CONFIG_E1000=y |
| 677 | # CONFIG_E1000_NAPI is not set | 677 | # CONFIG_E1000_NAPI is not set |
| 678 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 678 | # CONFIG_NS83820 is not set | 679 | # CONFIG_NS83820 is not set |
| 679 | # CONFIG_HAMACHI is not set | 680 | # CONFIG_HAMACHI is not set |
| 680 | # CONFIG_YELLOWFIN is not set | 681 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index 751a622fb7a7..c775027947f9 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_defconfig | |||
| @@ -567,6 +567,7 @@ CONFIG_ACENIC=m | |||
| 567 | # CONFIG_DL2K is not set | 567 | # CONFIG_DL2K is not set |
| 568 | CONFIG_E1000=m | 568 | CONFIG_E1000=m |
| 569 | # CONFIG_E1000_NAPI is not set | 569 | # CONFIG_E1000_NAPI is not set |
| 570 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 570 | # CONFIG_NS83820 is not set | 571 | # CONFIG_NS83820 is not set |
| 571 | # CONFIG_HAMACHI is not set | 572 | # CONFIG_HAMACHI is not set |
| 572 | # CONFIG_YELLOWFIN is not set | 573 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index 07b6d3d23360..68194c03f6d1 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
| @@ -454,6 +454,7 @@ CONFIG_AMD8111_ETH=y | |||
| 454 | # CONFIG_DL2K is not set | 454 | # CONFIG_DL2K is not set |
| 455 | CONFIG_E1000=y | 455 | CONFIG_E1000=y |
| 456 | # CONFIG_E1000_NAPI is not set | 456 | # CONFIG_E1000_NAPI is not set |
| 457 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 457 | # CONFIG_NS83820 is not set | 458 | # CONFIG_NS83820 is not set |
| 458 | # CONFIG_HAMACHI is not set | 459 | # CONFIG_HAMACHI is not set |
| 459 | # CONFIG_YELLOWFIN is not set | 460 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 0b2b55a79c3c..6f6c6bed1aa5 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -724,6 +724,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y | |||
| 724 | # CONFIG_DL2K is not set | 724 | # CONFIG_DL2K is not set |
| 725 | CONFIG_E1000=y | 725 | CONFIG_E1000=y |
| 726 | # CONFIG_E1000_NAPI is not set | 726 | # CONFIG_E1000_NAPI is not set |
| 727 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 727 | # CONFIG_NS83820 is not set | 728 | # CONFIG_NS83820 is not set |
| 728 | # CONFIG_HAMACHI is not set | 729 | # CONFIG_HAMACHI is not set |
| 729 | # CONFIG_YELLOWFIN is not set | 730 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index a50ce0fa9243..aa9893a1f6e8 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
| @@ -671,6 +671,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y | |||
| 671 | # CONFIG_DL2K is not set | 671 | # CONFIG_DL2K is not set |
| 672 | CONFIG_E1000=y | 672 | CONFIG_E1000=y |
| 673 | # CONFIG_E1000_NAPI is not set | 673 | # CONFIG_E1000_NAPI is not set |
| 674 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
| 674 | # CONFIG_NS83820 is not set | 675 | # CONFIG_NS83820 is not set |
| 675 | # CONFIG_HAMACHI is not set | 676 | # CONFIG_HAMACHI is not set |
| 676 | # CONFIG_YELLOWFIN is not set | 677 | # CONFIG_YELLOWFIN is not set |