Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 18865
b: refs/heads/master
c: 3da3856
h: refs/heads/master
i:
  18863: 6866824
v: v3
  • Loading branch information
Linus Torvalds committed Jan 18, 2006
1 parent 514f11a commit b529422
Show file tree
Hide file tree
Showing 32 changed files with 710 additions and 519 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 959a85ada599fd5bab7fab8251795c3a58af28d4
refs/heads/master: 3da38566dfd4b2402b280cb52ffc7c56f1a95b9c
1 change: 1 addition & 0 deletions trunk/arch/arm/configs/ep80219_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ CONFIG_E100=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/configs/iq31244_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,7 @@ CONFIG_NETDEVICES=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/configs/iq80321_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ CONFIG_NETDEVICES=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/configs/iq80331_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ CONFIG_NETDEVICES=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/arm/configs/iq80332_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ CONFIG_NETDEVICES=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
2 changes: 2 additions & 0 deletions trunk/arch/i386/defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,8 @@ CONFIG_8139TOO_PIO=y
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
# CONFIG_E1000 is not set
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/ia64/configs/gensparse_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ CONFIG_E100=m
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/ia64/configs/tiger_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ CONFIG_E100=m
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/ia64/configs/zx1_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,7 @@ CONFIG_E100=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/ia64/defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ CONFIG_E100=m
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/parisc/configs/a500_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
# CONFIG_DL2K is not set
CONFIG_E1000=m
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/parisc/configs/c3000_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@ CONFIG_ACENIC=m
# CONFIG_DL2K is not set
CONFIG_E1000=m
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/powerpc/configs/cell_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ CONFIG_MII=y
# CONFIG_DL2K is not set
CONFIG_E1000=m
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/powerpc/configs/g5_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/powerpc/configs/iseries_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ CONFIG_ACENIC=m
# CONFIG_DL2K is not set
CONFIG_E1000=m
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/powerpc/configs/maple_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,7 @@ CONFIG_AMD8111_ETH=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/powerpc/configs/ppc64_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/powerpc/configs/pseries_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/ppc/configs/bamboo_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ CONFIG_NATSEMI=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/ppc/configs/katana_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,7 @@ CONFIG_E100=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/ppc/configs/mpc834x_sys_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ CONFIG_E100=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/ppc/configs/power3_defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,7 @@ CONFIG_E100=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/sparc64/defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -533,6 +533,7 @@ CONFIG_NET_PCI=y
# CONFIG_DL2K is not set
CONFIG_E1000=m
CONFIG_E1000_NAPI=y
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_MYRI_SBUS is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
Expand Down
1 change: 1 addition & 0 deletions trunk/arch/x86_64/defconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,7 @@ CONFIG_8139TOO=y
# CONFIG_DL2K is not set
CONFIG_E1000=y
# CONFIG_E1000_NAPI is not set
# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
# CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set
# CONFIG_YELLOWFIN is not set
Expand Down
9 changes: 9 additions & 0 deletions trunk/drivers/net/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit b529422

Please sign in to comment.