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 | |
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')
24 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/configs/ep80219_defconfig b/arch/arm/configs/ep80219_defconfig index fbe312e757cb..3c73b707c2f3 100644 --- a/arch/arm/configs/ep80219_defconfig +++ b/arch/arm/configs/ep80219_defconfig | |||
@@ -522,6 +522,7 @@ CONFIG_E100=y | |||
522 | # CONFIG_DL2K is not set | 522 | # CONFIG_DL2K is not set |
523 | CONFIG_E1000=y | 523 | CONFIG_E1000=y |
524 | CONFIG_E1000_NAPI=y | 524 | CONFIG_E1000_NAPI=y |
525 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
525 | # CONFIG_NS83820 is not set | 526 | # CONFIG_NS83820 is not set |
526 | # CONFIG_HAMACHI is not set | 527 | # CONFIG_HAMACHI is not set |
527 | # CONFIG_YELLOWFIN is not set | 528 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/arm/configs/iq31244_defconfig b/arch/arm/configs/iq31244_defconfig index c07628ceaf0c..32467160a6df 100644 --- a/arch/arm/configs/iq31244_defconfig +++ b/arch/arm/configs/iq31244_defconfig | |||
@@ -493,6 +493,7 @@ CONFIG_NETDEVICES=y | |||
493 | # CONFIG_DL2K is not set | 493 | # CONFIG_DL2K is not set |
494 | CONFIG_E1000=y | 494 | CONFIG_E1000=y |
495 | CONFIG_E1000_NAPI=y | 495 | CONFIG_E1000_NAPI=y |
496 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
496 | # CONFIG_NS83820 is not set | 497 | # CONFIG_NS83820 is not set |
497 | # CONFIG_HAMACHI is not set | 498 | # CONFIG_HAMACHI is not set |
498 | # CONFIG_YELLOWFIN is not set | 499 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/arm/configs/iq80321_defconfig b/arch/arm/configs/iq80321_defconfig index 18fa1615fdfd..b000da753c41 100644 --- a/arch/arm/configs/iq80321_defconfig +++ b/arch/arm/configs/iq80321_defconfig | |||
@@ -415,6 +415,7 @@ CONFIG_NETDEVICES=y | |||
415 | # CONFIG_DL2K is not set | 415 | # CONFIG_DL2K is not set |
416 | CONFIG_E1000=y | 416 | CONFIG_E1000=y |
417 | CONFIG_E1000_NAPI=y | 417 | CONFIG_E1000_NAPI=y |
418 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
418 | # CONFIG_NS83820 is not set | 419 | # CONFIG_NS83820 is not set |
419 | # CONFIG_HAMACHI is not set | 420 | # CONFIG_HAMACHI is not set |
420 | # CONFIG_YELLOWFIN is not set | 421 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/arm/configs/iq80331_defconfig b/arch/arm/configs/iq80331_defconfig index f50035de1fff..46c79e1efe07 100644 --- a/arch/arm/configs/iq80331_defconfig +++ b/arch/arm/configs/iq80331_defconfig | |||
@@ -496,6 +496,7 @@ CONFIG_NETDEVICES=y | |||
496 | # CONFIG_DL2K is not set | 496 | # CONFIG_DL2K is not set |
497 | CONFIG_E1000=y | 497 | CONFIG_E1000=y |
498 | CONFIG_E1000_NAPI=y | 498 | CONFIG_E1000_NAPI=y |
499 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
499 | # CONFIG_NS83820 is not set | 500 | # CONFIG_NS83820 is not set |
500 | # CONFIG_HAMACHI is not set | 501 | # CONFIG_HAMACHI is not set |
501 | # CONFIG_YELLOWFIN is not set | 502 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/arm/configs/iq80332_defconfig b/arch/arm/configs/iq80332_defconfig index 18b3f372ed68..11959b705d82 100644 --- a/arch/arm/configs/iq80332_defconfig +++ b/arch/arm/configs/iq80332_defconfig | |||
@@ -496,6 +496,7 @@ CONFIG_NETDEVICES=y | |||
496 | # CONFIG_DL2K is not set | 496 | # CONFIG_DL2K is not set |
497 | CONFIG_E1000=y | 497 | CONFIG_E1000=y |
498 | CONFIG_E1000_NAPI=y | 498 | CONFIG_E1000_NAPI=y |
499 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
499 | # CONFIG_NS83820 is not set | 500 | # CONFIG_NS83820 is not set |
500 | # CONFIG_HAMACHI is not set | 501 | # CONFIG_HAMACHI is not set |
501 | # CONFIG_YELLOWFIN is not set | 502 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/i386/defconfig b/arch/i386/defconfig index 6a431b926019..3cbe6e9cb9fc 100644 --- a/arch/i386/defconfig +++ b/arch/i386/defconfig | |||
@@ -644,6 +644,8 @@ CONFIG_8139TOO_PIO=y | |||
644 | # CONFIG_ACENIC is not set | 644 | # CONFIG_ACENIC is not set |
645 | # CONFIG_DL2K is not set | 645 | # CONFIG_DL2K is not set |
646 | # CONFIG_E1000 is not set | 646 | # CONFIG_E1000 is not set |
647 | # CONFIG_E1000_NAPI is not set | ||
648 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
647 | # CONFIG_NS83820 is not set | 649 | # CONFIG_NS83820 is not set |
648 | # CONFIG_HAMACHI is not set | 650 | # CONFIG_HAMACHI is not set |
649 | # CONFIG_YELLOWFIN is not set | 651 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig index 1d07d8072ec2..991c07b57c24 100644 --- a/arch/ia64/configs/gensparse_defconfig +++ b/arch/ia64/configs/gensparse_defconfig | |||
@@ -557,6 +557,7 @@ CONFIG_E100=m | |||
557 | # CONFIG_DL2K is not set | 557 | # CONFIG_DL2K is not set |
558 | CONFIG_E1000=y | 558 | CONFIG_E1000=y |
559 | # CONFIG_E1000_NAPI is not set | 559 | # CONFIG_E1000_NAPI is not set |
560 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
560 | # CONFIG_NS83820 is not set | 561 | # CONFIG_NS83820 is not set |
561 | # CONFIG_HAMACHI is not set | 562 | # CONFIG_HAMACHI is not set |
562 | # CONFIG_YELLOWFIN is not set | 563 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index b1e8f09e9fd5..6859119bc9dd 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
@@ -565,6 +565,7 @@ CONFIG_E100=m | |||
565 | # CONFIG_DL2K is not set | 565 | # CONFIG_DL2K is not set |
566 | CONFIG_E1000=y | 566 | CONFIG_E1000=y |
567 | # CONFIG_E1000_NAPI is not set | 567 | # CONFIG_E1000_NAPI is not set |
568 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
568 | # CONFIG_NS83820 is not set | 569 | # CONFIG_NS83820 is not set |
569 | # CONFIG_HAMACHI is not set | 570 | # CONFIG_HAMACHI is not set |
570 | # CONFIG_YELLOWFIN is not set | 571 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 0856ca67dd50..53899dc8eb53 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig | |||
@@ -548,6 +548,7 @@ CONFIG_E100=y | |||
548 | # CONFIG_DL2K is not set | 548 | # CONFIG_DL2K is not set |
549 | CONFIG_E1000=y | 549 | CONFIG_E1000=y |
550 | # CONFIG_E1000_NAPI is not set | 550 | # CONFIG_E1000_NAPI is not set |
551 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
551 | # CONFIG_NS83820 is not set | 552 | # CONFIG_NS83820 is not set |
552 | # CONFIG_HAMACHI is not set | 553 | # CONFIG_HAMACHI is not set |
553 | # CONFIG_YELLOWFIN is not set | 554 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig index 275a26c6e5aa..dcbc78a4cfa4 100644 --- a/arch/ia64/defconfig +++ b/arch/ia64/defconfig | |||
@@ -565,6 +565,7 @@ CONFIG_E100=m | |||
565 | # CONFIG_DL2K is not set | 565 | # CONFIG_DL2K is not set |
566 | CONFIG_E1000=y | 566 | CONFIG_E1000=y |
567 | # CONFIG_E1000_NAPI is not set | 567 | # CONFIG_E1000_NAPI is not set |
568 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
568 | # CONFIG_NS83820 is not set | 569 | # CONFIG_NS83820 is not set |
569 | # CONFIG_HAMACHI is not set | 570 | # CONFIG_HAMACHI is not set |
570 | # CONFIG_YELLOWFIN is not set | 571 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig index 955ef5084f3e..959ad3c4e372 100644 --- a/arch/parisc/configs/a500_defconfig +++ b/arch/parisc/configs/a500_defconfig | |||
@@ -602,6 +602,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y | |||
602 | # CONFIG_DL2K is not set | 602 | # CONFIG_DL2K is not set |
603 | CONFIG_E1000=m | 603 | CONFIG_E1000=m |
604 | CONFIG_E1000_NAPI=y | 604 | CONFIG_E1000_NAPI=y |
605 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
605 | # CONFIG_NS83820 is not set | 606 | # CONFIG_NS83820 is not set |
606 | # CONFIG_HAMACHI is not set | 607 | # CONFIG_HAMACHI is not set |
607 | # CONFIG_YELLOWFIN is not set | 608 | # CONFIG_YELLOWFIN is not set |
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig index 9d86b6b1ebd1..0b1c8c1fa8a3 100644 --- a/arch/parisc/configs/c3000_defconfig +++ b/arch/parisc/configs/c3000_defconfig | |||
@@ -626,6 +626,7 @@ CONFIG_ACENIC=m | |||
626 | # CONFIG_DL2K is not set | 626 | # CONFIG_DL2K is not set |
627 | CONFIG_E1000=m | 627 | CONFIG_E1000=m |
628 | # CONFIG_E1000_NAPI is not set | 628 | # CONFIG_E1000_NAPI is not set |
629 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
629 | # CONFIG_NS83820 is not set | 630 | # CONFIG_NS83820 is not set |
630 | # CONFIG_HAMACHI is not set | 631 | # CONFIG_HAMACHI is not set |
631 | # CONFIG_YELLOWFIN is not set | 632 | # CONFIG_YELLOWFIN is not set |
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 |
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 |
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index a3fb3376ffa0..92b2fb6aaa46 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig | |||
@@ -529,6 +529,7 @@ CONFIG_NET_PCI=y | |||
529 | # CONFIG_DL2K is not set | 529 | # CONFIG_DL2K is not set |
530 | CONFIG_E1000=m | 530 | CONFIG_E1000=m |
531 | CONFIG_E1000_NAPI=y | 531 | CONFIG_E1000_NAPI=y |
532 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
532 | # CONFIG_MYRI_SBUS is not set | 533 | # CONFIG_MYRI_SBUS is not set |
533 | # CONFIG_NS83820 is not set | 534 | # CONFIG_NS83820 is not set |
534 | # CONFIG_HAMACHI is not set | 535 | # CONFIG_HAMACHI is not set |
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig index 5231fe83ea4b..09a3eb743315 100644 --- a/arch/x86_64/defconfig +++ b/arch/x86_64/defconfig | |||
@@ -646,6 +646,7 @@ CONFIG_8139TOO=y | |||
646 | # CONFIG_DL2K is not set | 646 | # CONFIG_DL2K is not set |
647 | CONFIG_E1000=y | 647 | CONFIG_E1000=y |
648 | # CONFIG_E1000_NAPI is not set | 648 | # CONFIG_E1000_NAPI is not set |
649 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
649 | # CONFIG_NS83820 is not set | 650 | # CONFIG_NS83820 is not set |
650 | # CONFIG_HAMACHI is not set | 651 | # CONFIG_HAMACHI is not set |
651 | # CONFIG_YELLOWFIN is not set | 652 | # CONFIG_YELLOWFIN is not set |