Эх сурвалжийг харах

[NET]: add a top-level Networking menu to *config

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>
Sam Ravnborg 20 жил өмнө
parent
commit
d5950b4355

+ 2 - 0
arch/alpha/Kconfig

@@ -596,6 +596,8 @@ source "fs/Kconfig.binfmt"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 3 - 1
arch/arm/Kconfig

@@ -700,6 +700,8 @@ config APM
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 menu "Device Drivers"
 menu "Device Drivers"
 
 
 source "drivers/base/Kconfig"
 source "drivers/base/Kconfig"
@@ -732,7 +734,7 @@ source "drivers/ieee1394/Kconfig"
 
 
 source "drivers/message/i2o/Kconfig"
 source "drivers/message/i2o/Kconfig"
 
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 
 source "drivers/isdn/Kconfig"
 source "drivers/isdn/Kconfig"
 
 

+ 3 - 1
arch/arm26/Kconfig

@@ -183,6 +183,8 @@ source "mm/Kconfig"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/base/Kconfig"
 source "drivers/base/Kconfig"
 
 
 source "drivers/parport/Kconfig"
 source "drivers/parport/Kconfig"
@@ -193,7 +195,7 @@ source "drivers/block/Kconfig"
 
 
 source "drivers/md/Kconfig"
 source "drivers/md/Kconfig"
 
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 
 source "drivers/ide/Kconfig"
 source "drivers/ide/Kconfig"
 
 

+ 3 - 1
arch/cris/Kconfig

@@ -122,6 +122,8 @@ source arch/cris/arch-v10/Kconfig
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 # bring in ETRAX built-in drivers
 # bring in ETRAX built-in drivers
 menu "Drivers for built-in interfaces"
 menu "Drivers for built-in interfaces"
 source arch/cris/arch-v10/drivers/Kconfig
 source arch/cris/arch-v10/drivers/Kconfig
@@ -149,7 +151,7 @@ source "drivers/ieee1394/Kconfig"
 
 
 source "drivers/message/i2o/Kconfig"
 source "drivers/message/i2o/Kconfig"
 
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 
 source "drivers/isdn/Kconfig"
 source "drivers/isdn/Kconfig"
 
 

+ 2 - 0
arch/frv/Kconfig

@@ -346,6 +346,8 @@ source "fs/Kconfig.binfmt"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 3 - 1
arch/h8300/Kconfig

@@ -55,6 +55,8 @@ source "fs/Kconfig.binfmt"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/base/Kconfig"
 source "drivers/base/Kconfig"
 
 
 source "drivers/mtd/Kconfig"
 source "drivers/mtd/Kconfig"
@@ -65,7 +67,7 @@ source "drivers/ide/Kconfig"
 
 
 source "arch/h8300/Kconfig.ide"
 source "arch/h8300/Kconfig.ide"
 
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 
 #
 #
 # input - input/joystick depends on it. As does USB.
 # input - input/joystick depends on it. As does USB.

+ 2 - 0
arch/i386/Kconfig

@@ -1285,6 +1285,8 @@ source "fs/Kconfig.binfmt"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 2 - 0
arch/ia64/Kconfig

@@ -423,6 +423,8 @@ endmenu
 
 
 endif
 endif
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 2 - 0
arch/m32r/Kconfig

@@ -359,6 +359,8 @@ source "fs/Kconfig.binfmt"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 2 - 0
arch/m68k/Kconfig

@@ -450,6 +450,8 @@ source "drivers/zorro/Kconfig"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 menu "Character devices"
 menu "Character devices"

+ 2 - 0
arch/m68knommu/Kconfig

@@ -575,6 +575,8 @@ config PM
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 2 - 0
arch/mips/Kconfig

@@ -1640,6 +1640,8 @@ config PM
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 2 - 0
arch/parisc/Kconfig

@@ -190,6 +190,8 @@ source "fs/Kconfig.binfmt"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 2 - 0
arch/ppc/Kconfig

@@ -1355,6 +1355,8 @@ config PIN_TLB
 	depends on ADVANCED_OPTIONS && 8xx
 	depends on ADVANCED_OPTIONS && 8xx
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 2 - 0
arch/ppc64/Kconfig

@@ -429,6 +429,8 @@ config CMDLINE
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 3 - 1
arch/s390/Kconfig

@@ -465,6 +465,8 @@ config KEXEC
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 config PCMCIA
 config PCMCIA
 	bool
 	bool
 	default n
 	default n
@@ -475,7 +477,7 @@ source "drivers/scsi/Kconfig"
 
 
 source "drivers/s390/Kconfig"
 source "drivers/s390/Kconfig"
 
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"
 
 

+ 2 - 0
arch/sh/Kconfig

@@ -784,6 +784,8 @@ config EMBEDDED_RAMDISK_IMAGE
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 2 - 0
arch/sh64/Kconfig

@@ -268,6 +268,8 @@ source "fs/Kconfig.binfmt"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 2 - 0
arch/sparc/Kconfig

@@ -268,6 +268,8 @@ source "mm/Kconfig"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 if !SUN4
 if !SUN4

+ 3 - 1
arch/sparc64/Kconfig

@@ -525,6 +525,8 @@ source "mm/Kconfig"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/base/Kconfig"
 source "drivers/base/Kconfig"
 
 
 source "drivers/video/Kconfig"
 source "drivers/video/Kconfig"
@@ -551,7 +553,7 @@ endif
 
 
 source "drivers/ieee1394/Kconfig"
 source "drivers/ieee1394/Kconfig"
 
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 
 source "drivers/isdn/Kconfig"
 source "drivers/isdn/Kconfig"
 
 

+ 3 - 1
arch/um/Kconfig

@@ -275,6 +275,8 @@ endmenu
 
 
 source "init/Kconfig"
 source "init/Kconfig"
 
 
+source "net/Kconfig"
+
 source "drivers/base/Kconfig"
 source "drivers/base/Kconfig"
 
 
 source "arch/um/Kconfig_char"
 source "arch/um/Kconfig_char"
@@ -287,7 +289,7 @@ config NETDEVICES
 
 
 source "arch/um/Kconfig_net"
 source "arch/um/Kconfig_net"
 
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"
 
 

+ 3 - 1
arch/v850/Kconfig

@@ -250,6 +250,8 @@ source "fs/Kconfig.binfmt"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 #############################################################################
 #############################################################################
 
 
 source "drivers/base/Kconfig"
 source "drivers/base/Kconfig"
@@ -283,7 +285,7 @@ source "drivers/ieee1394/Kconfig"
 
 
 source "drivers/message/i2o/Kconfig"
 source "drivers/message/i2o/Kconfig"
 
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 
 source "drivers/isdn/Kconfig"
 source "drivers/isdn/Kconfig"
 
 

+ 2 - 0
arch/x86_64/Kconfig

@@ -515,6 +515,8 @@ config UID16
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source drivers/Kconfig
 source drivers/Kconfig
 
 
 source "drivers/firmware/Kconfig"
 source "drivers/firmware/Kconfig"

+ 2 - 0
arch/xtensa/Kconfig

@@ -228,6 +228,8 @@ source "fs/Kconfig.binfmt"
 
 
 endmenu
 endmenu
 
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 source "drivers/Kconfig"
 
 
 source "fs/Kconfig"
 source "fs/Kconfig"

+ 1 - 1
drivers/Kconfig

@@ -28,7 +28,7 @@ source "drivers/message/i2o/Kconfig"
 
 
 source "drivers/macintosh/Kconfig"
 source "drivers/macintosh/Kconfig"
 
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 
 source "drivers/isdn/Kconfig"
 source "drivers/isdn/Kconfig"
 
 

+ 3 - 0
drivers/net/Kconfig

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

+ 5 - 5
net/Kconfig

@@ -2,7 +2,7 @@
 # Network configuration
 # Network configuration
 #
 #
 
 
-menu "Networking support"
+menu "Networking"
 
 
 config NET
 config NET
 	bool "Networking support"
 	bool "Networking support"
@@ -10,7 +10,9 @@ config NET
 	  Unless you really know what you are doing, you should say Y here.
 	  Unless you really know what you are doing, you should say Y here.
 	  The reason is that some programs need kernel networking support even
 	  The reason is that some programs need kernel networking support even
 	  when running on a stand-alone machine that isn't connected to any
 	  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
 	  should consider updating your networking tools too because changes
 	  in the kernel and the tools often go hand in hand. The tools are
 	  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
 	  contained in the package net-tools, the location and version number
@@ -640,7 +642,5 @@ source "net/irda/Kconfig"
 
 
 source "net/bluetooth/Kconfig"
 source "net/bluetooth/Kconfig"
 
 
-source "drivers/net/Kconfig"
-
-endmenu
+endmenu # Networking