Skip to content

Commit

Permalink
[NET]: add a top-level Networking menu to *config
Browse files Browse the repository at this point in the history 
Create a new top-level menu named "Networking" thus moving
net related options and protocol selection way from the drivers
menu and up on the top-level where they belong.

To implement this all architectures has to source "net/Kconfig" before
drivers/*/Kconfig in their Kconfig file. This change has been
implemented for all architectures.

Device drivers for ordinary NIC's are still to be found
in the Device Drivers section, but Bluetooth, IrDA and ax25
are located with their corresponding menu entries under the new
networking menu item.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
@sravnborg @davem330
sravnborg authored and davem330 committed Jul 12, 2005
1 parent 0b7f22a commit d5950b4
Show file tree
Hide file tree
Showing 27 changed files with 65 additions and 14 deletions.
2 changes: 2 additions & 0 deletions arch/alpha/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,8 @@ source "fs/Kconfig.binfmt"

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
4 changes: 3 additions & 1 deletion arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,8 @@ config APM

endmenu

source "net/Kconfig"

menu "Device Drivers"

source "drivers/base/Kconfig"
Expand Down Expand Up @@ -732,7 +734,7 @@ source "drivers/ieee1394/Kconfig"

source "drivers/message/i2o/Kconfig"

source "net/Kconfig"
source "drivers/net/Kconfig"

source "drivers/isdn/Kconfig"

Expand Down
4 changes: 3 additions & 1 deletion arch/arm26/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ source "mm/Kconfig"

endmenu

source "net/Kconfig"

source "drivers/base/Kconfig"

source "drivers/parport/Kconfig"
Expand All @@ -193,7 +195,7 @@ source "drivers/block/Kconfig"

source "drivers/md/Kconfig"

source "net/Kconfig"
source "drivers/net/Kconfig"

source "drivers/ide/Kconfig"

Expand Down
4 changes: 3 additions & 1 deletion arch/cris/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ source arch/cris/arch-v10/Kconfig

endmenu

source "net/Kconfig"

# bring in ETRAX built-in drivers
menu "Drivers for built-in interfaces"
source arch/cris/arch-v10/drivers/Kconfig
Expand Down Expand Up @@ -149,7 +151,7 @@ source "drivers/ieee1394/Kconfig"

source "drivers/message/i2o/Kconfig"

source "net/Kconfig"
source "drivers/net/Kconfig"

source "drivers/isdn/Kconfig"

Expand Down
2 changes: 2 additions & 0 deletions arch/frv/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ source "fs/Kconfig.binfmt"

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
4 changes: 3 additions & 1 deletion arch/h8300/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ source "fs/Kconfig.binfmt"

endmenu

source "net/Kconfig"

source "drivers/base/Kconfig"

source "drivers/mtd/Kconfig"
Expand All @@ -65,7 +67,7 @@ source "drivers/ide/Kconfig"

source "arch/h8300/Kconfig.ide"

source "net/Kconfig"
source "drivers/net/Kconfig"

#
# input - input/joystick depends on it. As does USB.
Expand Down
2 changes: 2 additions & 0 deletions arch/i386/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1285,6 +1285,8 @@ source "fs/Kconfig.binfmt"

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/ia64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,8 @@ endmenu

endif

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/m32r/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,8 @@ source "fs/Kconfig.binfmt"

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/m68k/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,8 @@ source "drivers/zorro/Kconfig"

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

menu "Character devices"
Expand Down
2 changes: 2 additions & 0 deletions arch/m68knommu/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,8 @@ config PM

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/mips/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1640,6 +1640,8 @@ config PM

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/parisc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ source "fs/Kconfig.binfmt"

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/ppc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1355,6 +1355,8 @@ config PIN_TLB
depends on ADVANCED_OPTIONS && 8xx
endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/ppc64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,8 @@ config CMDLINE

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
4 changes: 3 additions & 1 deletion arch/s390/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,8 @@ config KEXEC

endmenu

source "net/Kconfig"

config PCMCIA
bool
default n
Expand All @@ -475,7 +477,7 @@ source "drivers/scsi/Kconfig"

source "drivers/s390/Kconfig"

source "net/Kconfig"
source "drivers/net/Kconfig"

source "fs/Kconfig"

Expand Down
2 changes: 2 additions & 0 deletions arch/sh/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,8 @@ config EMBEDDED_RAMDISK_IMAGE

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/sh64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ source "fs/Kconfig.binfmt"

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/sparc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ source "mm/Kconfig"

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

if !SUN4
Expand Down
4 changes: 3 additions & 1 deletion arch/sparc64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,8 @@ source "mm/Kconfig"

endmenu

source "net/Kconfig"

source "drivers/base/Kconfig"

source "drivers/video/Kconfig"
Expand All @@ -551,7 +553,7 @@ endif

source "drivers/ieee1394/Kconfig"

source "net/Kconfig"
source "drivers/net/Kconfig"

source "drivers/isdn/Kconfig"

Expand Down
4 changes: 3 additions & 1 deletion arch/um/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ endmenu

source "init/Kconfig"

source "net/Kconfig"

source "drivers/base/Kconfig"

source "arch/um/Kconfig_char"
Expand All @@ -287,7 +289,7 @@ config NETDEVICES

source "arch/um/Kconfig_net"

source "net/Kconfig"
source "drivers/net/Kconfig"

source "fs/Kconfig"

Expand Down
4 changes: 3 additions & 1 deletion arch/v850/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ source "fs/Kconfig.binfmt"

endmenu

source "net/Kconfig"

#############################################################################

source "drivers/base/Kconfig"
Expand Down Expand Up @@ -283,7 +285,7 @@ source "drivers/ieee1394/Kconfig"

source "drivers/message/i2o/Kconfig"

source "net/Kconfig"
source "drivers/net/Kconfig"

source "drivers/isdn/Kconfig"

Expand Down
2 changes: 2 additions & 0 deletions arch/x86_64/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,8 @@ config UID16

endmenu

source "net/Kconfig"

source drivers/Kconfig

source "drivers/firmware/Kconfig"
Expand Down
2 changes: 2 additions & 0 deletions arch/xtensa/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,8 @@ source "fs/Kconfig.binfmt"

endmenu

source "net/Kconfig"

source "drivers/Kconfig"

source "fs/Kconfig"
Expand Down
2 changes: 1 addition & 1 deletion drivers/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ source "drivers/message/i2o/Kconfig"

source "drivers/macintosh/Kconfig"

source "net/Kconfig"
source "drivers/net/Kconfig"

source "drivers/isdn/Kconfig"

Expand Down
3 changes: 3 additions & 0 deletions drivers/net/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Network device configuration
#

menu "Network device support"

config NETDEVICES
depends on NET
bool "Network device support"
Expand Down Expand Up @@ -2547,3 +2549,4 @@ config NETCONSOLE
If you want to log kernel messages over the network, enable this.
See <file:Documentation/networking/netconsole.txt> for details.

endmenu
10 changes: 5 additions & 5 deletions net/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@
# Network configuration
#

menu "Networking support"
menu "Networking"

config NET
bool "Networking support"
---help---
Unless you really know what you are doing, you should say Y here.
The reason is that some programs need kernel networking support even
when running on a stand-alone machine that isn't connected to any
other computer. If you are upgrading from an older kernel, you
other computer.

If you are upgrading from an older kernel, you
should consider updating your networking tools too because changes
in the kernel and the tools often go hand in hand. The tools are
contained in the package net-tools, the location and version number
Expand Down Expand Up @@ -640,7 +642,5 @@ source "net/irda/Kconfig"

source "net/bluetooth/Kconfig"

source "drivers/net/Kconfig"

endmenu
endmenu # Networking

0 comments on commit d5950b4

Please sign in to comment.