Skip to contentSkip to conversation

network configs: disconnect network options from drivers

RFC/PATCH In review Randy.Dunlap 8 participants 18 messages Mar 31, 2005 – Apr 5, 2005

Subsystems (11)
lore
Share & tools
lore
#0 lore raw

RFC: This is a work-in-progress (WIP), not yet completed.

A few people dislike that the Networking Options menu is inside the Device Drivers/Networking menu. This patch moves the Networking Options menu to immediately before the Device Drivers menu, renames it to "Networking options and protocols", & moves most protocols to more logical places (IMHOOC).

The reasons that it is still WIP are:
- I'd like to see all of the sub-menus done in the same style;
- IrDA & Bluetooth subsystems include protocols & drivers, yet they are displayed under Networking protocols. I don't see much good reason to split them up. (See, this is an example of why the Networking Options and Network Drivers were close together....)
- some Networking options need to be qualified with CONFIG_NET

Any comments?

 drivers/Kconfig     |    4
 drivers/net/Kconfig |    5
 net/Kconfig         |  396 ++++++++++++++++++++++++++--------------------------
 3 files changed, 208 insertions(+), 197 deletions(-)
drivers/Kconfig +3 -1
diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-2612-rc1-pv/drivers/Kconfig linux-2612-rc1-netconfig/drivers/Kconfig
@@ -1,5 +1,7 @@
 # drivers/Kconfig
 
+source "net/Kconfig"
+
 menu "Device Drivers"
 
 source "drivers/base/Kconfig"
@@ -28,7 +30,7 @@ source "drivers/message/i2o/Kconfig"
 
 source "drivers/macintosh/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 
drivers/net/Kconfig +4 -1
diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-2612-rc1-pv/drivers/net/Kconfig linux-2612-rc1-netconfig/drivers/net/Kconfig
@@ -1,8 +1,9 @@
-
 #
 # Network device configuration
 #
 
+menu "Network device support"
+
 config NETDEVICES
 	depends on NET
 	bool "Network device support"
@@ -2556,3 +2557,5 @@ config NETCONSOLE
 	If you want to log kernel messages over the network, enable this.
 	See <file:Documentation/networking/netconsole.txt> for details.
 
+endmenu
+
net/Kconfig +201 -195

457 lines not on this page · raw message

---
~Randy

#1 lore raw
Quoted 8 lines · Randy.Dunlap

RFC: This is a work-in-progress (WIP), not yet completed.

A few people dislike that the Networking Options menu is inside the Device Drivers/Networking menu. This patch moves the Networking Options menu to immediately before the Device Drivers menu, renames it to "Networking options and protocols", & moves most protocols to more logical places (IMHOOC).

About time someone brave did this.

cheers,
jamal

#2 lore raw
In reply to Randy.Dunlap
Quoted 5 lines · Randy.Dunlap

A few people dislike that the Networking Options menu is inside the Device Drivers/Networking menu. This patch moves the Networking Options menu to immediately before the Device Drivers menu, renames it to "Networking options and protocols", & moves most protocols to more logical places (IMHOOC).

<snip>

Quoted 1 line

Any comments?

Makes sense to me...

Chris

maintainer
#3 lore raw
Quoted 3 lines · On Thu, 31 Mar 2005 10:46:45 -0600 Chris Friesen <[email protected]> wrote:
Quoted 1 line

Any comments?

Makes sense to me...

Me too.

#4 lore raw
In reply to Randy.Dunlap

* Randy.Dunlap <[email protected]> 2005-03-30 23:47

Quoted 8 lines

RFC: This is a work-in-progress (WIP), not yet completed.

A few people dislike that the Networking Options menu is inside the Device Drivers/Networking menu. This patch moves the Networking Options menu to immediately before the Device Drivers menu, renames it to "Networking options and protocols", & moves most protocols to more logical places (IMHOOC).

Definitely a good idea.

Quoted 2 lines

The reasons that it is still WIP are:
- I'd like to see all of the sub-menus done in the same style;

Further suggestions:

- Introduce sub menus on separate pages for TCP/IP, DECNet, ATM, ... i.e. like it is done for SCTP.

- Separate things into top categories
Socket Families (maybe separate page)
- PF_PACKET
- PF_UNIX
- PF_KEY
Protocols (separate page)
- TCP/IP networking (separate page)
- IPv6 (affecting choices below)
- Privary extensions
- multicasting
- routing
- advanced router
- policy routing
- use nfmark with chaching support
- multipath routing
- cached
- rrd
- random
- ...
- multicast routing
- pim v1
- pim v2
- verbose route monitoring
- auto configuration
- dhcp
- boop
- rarp
- tunneling
- IPv4
- IPIP
- GRE
- broadcast
- IPv6
- IPv6oIPv6
- transformations
- IPv4
- AH
- ESP
- IPComp
- IPv6
- AH
- ESP
- IPComp
- ARP daemon
- TCP
- Diagnostics
- Syn Cookies
- SCTP
- ATM
- 802.1d
- 802.1q
- DECnet
- 802.2 LLC
- IPX
- Appletalk
- X.25
- LAPB
- Econet
<<Good title here>>
- Netfilter
- IPsec
- LVS
- Frame Diverter
- QoS & Fair Queueing
- Network testing
- WAN Router

Thoughts?

#5 lore raw
In reply to Randy.Dunlap
Quoted 2 lines · Randy.Dunlap

- some Networking options need to be qualified with CONFIG_NET

You can something along the lines os:

menu "Networking options and protocols"

config NET
bool "Networking support"
default y

if NET

...

menu "Network device support"
...
endmenu

...

endif
endmenu

Then everything wrapped in between if NET/endif is dependent on NET without stating this explicitly.
You will alos have the menu nice indented.

Sam

#6 lore raw
Quoted 20 lines · Sam Ravnborg
Quoted 1 line · Randy.Dunlap

- some Networking options need to be qualified with CONFIG_NET

You can something along the lines os:

menu "Networking options and protocols"

config NET
bool "Networking support"
default y

if NET

...

menu "Network device support"
...
endmenu

Quoted 8 lines

...

endif
endmenu

Then everything wrapped in between if NET/endif is dependent on NET without stating this explicitly.
You will alos have the menu nice indented.

Yes, sounds good, thanks.

And I'll look into Thomas's suggestions.

Other than "sounds good," are there some comments on:

a. leaving IrDA and Bluetooth subsystem (with drivers) where they
are, which is under "Network options and protocols"
(I really don't want to split their drivers away from their subsystem, just to put them under Network driver support.)

b. leaving SLIP, PPP, and PLIP where they are under Network driver
support, even though they say that they are "protocols" ?

Any others?

Thanks,

Signature · 1 line
~Randy
#7 lore raw
Quoted 7 lines · Randy.Dunlap

Other than "sounds good," are there some comments on:

a. leaving IrDA and Bluetooth subsystem (with drivers) where they
are, which is under "Network options and protocols"
(I really don't want to split their drivers away from their subsystem, just to put them under Network driver support.)

Agreed. All IrDA / Bluetooth stuff belongs together. Leave them where they are for now.

Quoted 3 lines

b. leaving SLIP, PPP, and PLIP where they are under Network driver
support, even though they say that they are "protocols" ?

SLIP and PLIP is no that common. PPP is more common for cable-modem/ADSL I suppose. But still it would make sense to create an Misc protocols menu, like we have a misc filesystems menu.

Sam

#8 lore raw

PATCH 1/1 network configs: disconnect network options from drivers

Quoted 14 lines · Sam Ravnborg
Quoted 6 lines · Randy.Dunlap

Other than "sounds good," are there some comments on:

a. leaving IrDA and Bluetooth subsystem (with drivers) where they
are, which is under "Network options and protocols"
(I really don't want to split their drivers away from their subsystem, just to put them under Network driver support.)

Agreed. All IrDA / Bluetooth stuff belongs together. Leave them where they are for now.

Quoted 6 lines
Quoted 2 lines

b. leaving SLIP, PPP, and PLIP where they are under Network driver
support, even though they say that they are "protocols" ?

SLIP and PLIP is no that common. PPP is more common for cable-modem/ADSL I suppose. But still it would make sense to create an Misc protocols menu, like we have a misc filesystems menu.

While looking into this suggestion, I see that SLIP, PLIP, and PPP depend on NETDEVICES, and they use some netdev interfaces, so they appear to be more like net devices than protocols even though they are called protocols in Kconfig text, so I am leaving them alone for now. Don't hesitate to correct me....

Any comments on this new version?

Thanks,

Signature · 1 line
~Randy

A few people dislike that the Networking Options menu is inside the Device Drivers/Networking menu. This patch moves the Networking Options menu to immediately before the Device Drivers menu, renames it to "Networking options and protocols", & moves most protocols to more logical places.

Notes:
- IrDA & Bluetooth subsystems include protocols & drivers, yet they are displayed under Networking protocols. I don't see much good reason to split them up. (See, this is an example of why the Networking Options and Network Drivers were close together....)
- SLIP, PLIP, and PPP option names say that they are protocols, but they are sort of a hybrid device and protocol, and they use network device interfaces, so they remain listed under Network devices.

 drivers/Kconfig              |    4
 drivers/net/Kconfig          |    5
 net/Kconfig                  |  450 ++++++++++++++++++++++---------------------
 net/bridge/netfilter/Kconfig |    1
 4 files changed, 241 insertions(+), 219 deletions(-)
drivers/Kconfig +3 -1
diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-2612-rc1-bk5-pv/drivers/Kconfig linux-2612-rc1-bk5-netconfigs/drivers/Kconfig
@@ -1,5 +1,7 @@
 # drivers/Kconfig
 
+source "net/Kconfig"
+
 menu "Device Drivers"
 
 source "drivers/base/Kconfig"
@@ -28,7 +30,7 @@ source "drivers/message/i2o/Kconfig"
 
 source "drivers/macintosh/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 
drivers/net/Kconfig +4 -1
diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-2612-rc1-bk5-pv/drivers/net/Kconfig linux-2612-rc1-bk5-netconfigs/drivers/net/Kconfig
@@ -1,8 +1,9 @@
-
 #
 # Network device configuration
 #
 
+menu "Network device support"
+
 config NETDEVICES
 	depends on NET
 	bool "Network device support"
@@ -2536,3 +2537,5 @@ config NETCONSOLE
 	If you want to log kernel messages over the network, enable this.
 	See <file:Documentation/networking/netconsole.txt> for details.
 
+endmenu
+
net/bridge/netfilter/Kconfig +1 -0
diff -Naurp -X /home/rddunlap/doc/dontdiff-osdl linux-2612-rc1-bk5-pv/net/bridge/netfilter/Kconfig linux-2612-rc1-bk5-netconfigs/net/bridge/netfilter/Kconfig
@@ -139,6 +139,7 @@ config BRIDGE_EBT_VLAN
 config BRIDGE_EBT_ARPREPLY
 	tristate "ebt: arp reply target support"
 	depends on BRIDGE_NF_EBTABLES
+	depends on INET
 	help
 	  This option adds the arp reply target, which allows
 	  automatically sending arp replies to arp requests.
net/Kconfig +233 -217

569 lines not on this page · raw message

#9 lore raw
Quoted 1 line · Randy.Dunlap

Any comments on this new version?

The new Networking menu looks unstructured.
And the net/Kconfig file contains a lot of config snippets that does not belong there.
So I took a stamp on it with focus on:
- Move config bits to appropriate places, creating several new Kconfig files
- Made uses of menus more consistent at least on first and second level
- Move submenu to the top
- Rename top menu to "Networking" and located it just before "File systems"

The patch became much larger. The win is that the top-level net/Kconfig contains much less cruft.

Many of the 56 lines added are due to the additional files. I did not (on purpose) change any functionality.

Only bit that I am worried about is the statement in SCTP:

	depends on IPV6 || IPV6=n

That looked like a noop to me. It had the sideeffect that SCTP menu entries where idented an extra level which was not desireable with currect layout.

Comments appreciated.

Patch on top of rc2.

---

Sam

 drivers/Kconfig               |    5 
 drivers/net/Kconfig           |    5 
 drivers/net/appletalk/Kconfig |   28 ++
 net/8021q/Kconfig             |   21 +
 net/Kconfig                   |  541 +++---------------------------------------
 net/atm/Kconfig               |   77 +++++
 net/bridge/Kconfig            |   32 ++
 net/bridge/netfilter/Kconfig  |    1 
 net/core/Kconfig              |   67 +++++
 net/decnet/Kconfig            |   24 +
 net/econet/Kconfig            |   34 ++
 net/ipv4/netfilter/Kconfig    |    5 
 net/ipv6/Kconfig              |   20 +
 net/ipx/Kconfig               |   33 ++
 net/lapb/Kconfig              |   24 +
 net/packet/Kconfig            |   26 ++
 net/sched/Kconfig             |   40 +++
 net/sctp/Kconfig              |    5 
 net/unix/Kconfig              |   22 +
 net/wanrouter/Kconfig         |   31 ++
 net/x25/Kconfig               |   35 ++
 21 files changed, 567 insertions(+), 509 deletions(-)
drivers/Kconfig +4 -1
diff -Nru a/drivers/Kconfig b/drivers/Kconfig
@@ -28,7 +28,7 @@
 
 source "drivers/macintosh/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 
@@ -59,3 +59,6 @@
 source "drivers/infiniband/Kconfig"
 
 endmenu
+
+source "net/Kconfig"
+
drivers/net/Kconfig +4 -1
diff -Nru a/drivers/net/Kconfig b/drivers/net/Kconfig
@@ -1,8 +1,9 @@
-
 #
 # Network device configuration
 #
 
+menu "Network device support"
+
 config NETDEVICES
 	depends on NET
 	bool "Network device support"
@@ -2535,4 +2536,6 @@
 	---help---
 	If you want to log kernel messages over the network, enable this.
 	See <file:Documentation/networking/netconsole.txt> for details.
+
+endmenu
 
drivers/net/appletalk/Kconfig +28 -0
diff -Nru a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
@@ -1,6 +1,34 @@
 #
 # Appletalk driver configuration
 #
+config ATALK
+	tristate "Appletalk protocol support"
+	depends on NET
+	select LLC
+	---help---
+	  AppleTalk is the protocol that Apple computers can use to communicate
+	  on a network.  If your Linux box is connected to such a network and you
+	  wish to connect to it, say Y.  You will need to use the netatalk package
+	  so that your Linux box can act as a print and file server for Macs as
+	  well as access AppleTalk printers.  Check out
+	  <http://www.zettabyte.net/netatalk/> on the WWW for details.
+	  EtherTalk is the name used for AppleTalk over Ethernet and the
+	  cheaper and slower LocalTalk is AppleTalk over a proprietary Apple
+	  network using serial links.  EtherTalk and LocalTalk are fully
+	  supported by Linux.
+
+	  General information about how to connect Linux, Windows machines and
+	  Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.  The
+	  NET-3-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>, contains valuable
+	  information as well.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called appletalk. You almost certainly want to compile it as a
+	  module so you can restart your AppleTalk stack without rebooting
+	  your machine. I hear that the GNU boycott of Apple is over, so
+	  even politically correct people are allowed to say Y here.
+
 config DEV_APPLETALK
 	bool "Appletalk interfaces support"
 	depends on ATALK
net/8021q/Kconfig new file +21 -0
diff -Nru a/net/8021q/Kconfig b/net/8021q/Kconfig
@@ -0,0 +1,21 @@
+#
+# Configuration for 802.1Q VLAN support
+#
+
+config VLAN_8021Q
+	tristate "802.1Q VLAN Support"
+	---help---
+	  Select this and you will be able to create 802.1Q VLAN interfaces
+	  on your ethernet interfaces.  802.1Q VLAN supports almost
+	  everything a regular ethernet interface does, including
+	  firewalling, bridging, and of course IP traffic.  You will need
+	  the 'vconfig' tool from the VLAN project in order to effectively
+	  use VLANs.  See the VLAN web page for more information:
+	  <http://www.candelatech.com/~greear/vlan.html>
+
+	  To compile this code as a module, choose M here: the module
+	  will be called 8021q.
+
+	  If unsure, say N.
+
+
net/Kconfig +44 -497

588 lines not on this page · raw message

net/atm/Kconfig new file +77 -0

77 lines not on this page · raw message

net/bridge/Kconfig new file +32 -0
diff -Nru a/net/bridge/Kconfig b/net/bridge/Kconfig
@@ -0,0 +1,32 @@
+#
+# Configuration for Ethernet bridging
+#
+
+config BRIDGE
+	tristate "802.1d Ethernet Bridging"
+	---help---
+	  If you say Y here, then your Linux box will be able to act as an
+	  Ethernet bridge, which means that the different Ethernet segments it
+	  is connected to will appear as one Ethernet to the participants.
+	  Several such bridges can work together to create even larger
+	  networks of Ethernets using the IEEE 802.1 spanning tree algorithm.
+	  As this is a standard, Linux bridges will cooperate properly with
+	  other third party bridge products.
+
+	  In order to use the Ethernet bridge, you'll need the bridge
+	  configuration tools; see <file:Documentation/networking/bridge.txt>
+	  for location. Please read the Bridge mini-HOWTO for more
+	  information.
+
+	  If you enable iptables support along with the bridge support then you
+	  turn your bridge into a bridging IP firewall.
+	  iptables will then see the IP packets being bridged, so you need to
+	  take this into account when setting up your firewall rules.
+	  Enabling arptables support when bridging will let arptables see
+	  bridged ARP traffic in the arptables FORWARD chain.
+
+	  To compile this code as a module, choose M here: the module
+	  will be called bridge.
+
+	  If unsure, say N.
+
net/bridge/netfilter/Kconfig +1 -0
diff -Nru a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
@@ -139,6 +139,7 @@
 config BRIDGE_EBT_ARPREPLY
 	tristate "ebt: arp reply target support"
 	depends on BRIDGE_NF_EBTABLES
+	depends on INET
 	help
 	  This option adds the arp reply target, which allows
 	  automatically sending arp replies to arp requests.
net/core/Kconfig new file +67 -0

67 lines not on this page · raw message

net/decnet/Kconfig +24 -0
diff -Nru a/net/decnet/Kconfig b/net/decnet/Kconfig
@@ -1,6 +1,30 @@
 #
 # DECnet configuration
 #
+
+config DECNET
+	tristate "DECnet Support"
+	---help---
+	  The DECnet networking protocol was used in many products made by
+	  Digital (now Compaq).  It provides reliable stream and sequenced
+	  packet communications over which run a variety of services similar
+	  to those which run over TCP/IP.
+
+	  To find some tools to use with the kernel layer support, please
+	  look at Patrick Caulfield's web site:
+	  <http://linux-decnet.sourceforge.net/>.
+
+	  More detailed documentation is available in
+	  <file:Documentation/networking/decnet.txt>.
+
+	  Be sure to say Y to "/proc file system support" and "Sysctl support"
+	  below when using DECnet, since you will need sysctl support to aid
+	  in configuration at run time.
+
+	  The DECnet code is also available as a module ( = code which can be
+	  inserted in and removed from the running kernel whenever you want).
+	  The module is called decnet.
+
 config DECNET_ROUTER
 	bool "DECnet: router support (EXPERIMENTAL)"
 	depends on DECNET && EXPERIMENTAL
net/econet/Kconfig new file +34 -0
diff -Nru a/net/econet/Kconfig b/net/econet/Kconfig
@@ -0,0 +1,34 @@
+
+config ECONET
+	tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
+	depends on EXPERIMENTAL && INET
+	---help---
+	  Econet is a fairly old and slow networking protocol mainly used by
+	  Acorn computers to access file and print servers. It uses native
+	  Econet network cards. AUN is an implementation of the higher level
+	  parts of Econet that runs over ordinary Ethernet connections, on
+	  top of the UDP packet protocol, which in turn runs on top of the
+	  Internet protocol IP.
+
+	  If you say Y here, you can choose with the next two options whether
+	  to send Econet/AUN traffic over a UDP Ethernet connection or over
+	  a native Econet network card.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called econet.
+
+config ECONET_AUNUDP
+	bool "AUN over UDP"
+	depends on ECONET
+	help
+	  Say Y here if you want to send Econet/AUN traffic over a UDP
+	  connection (UDP is a packet based protocol that runs on top of the
+	  Internet protocol IP) using an ordinary Ethernet network card.
+
+config ECONET_NATIVE
+	bool "Native Econet"
+	depends on ECONET
+	help
+	  Say Y here if you have a native Econet network card installed in
+	  your computer.
+
net/ipv4/netfilter/Kconfig +0 -5
diff -Nru a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
@@ -2,9 +2,6 @@
 # IP netfilter configuration
 #
 
-menu "IP: Netfilter Configuration"
-	depends on INET && NETFILTER
-
 # connection tracking, helpers and protocols
 config IP_NF_CONNTRACK
 	tristate "Connection tracking (required for masq/NAT)"
@@ -691,6 +688,4 @@
 	help
 	  Allows altering the ARP packet payload: source and destination
 	  hardware and network addresses.
-
-endmenu
 
net/ipv6/Kconfig +20 -0
diff -Nru a/net/ipv6/Kconfig b/net/ipv6/Kconfig
@@ -1,6 +1,26 @@
 #
 # IPv6 configuration
 # 
+
+#   IPv6 as module will cause a CRASH if you try to unload it
+config IPV6
+	tristate "The IPv6 protocol"
+	default m
+	select CRYPTO if IPV6_PRIVACY
+	select CRYPTO_MD5 if IPV6_PRIVACY
+	---help---
+	  This is complemental support for the IP version 6.
+	  You will still be able to do traditional IPv4 networking as well.
+
+	  For general information about IPv6, see
+	  <http://playground.sun.com/pub/ipng/html/ipng-main.html>.
+	  For Linux IPv6 development information, see <http://www.linux-ipv6.org>.
+	  For specific information about IPv6 under Linux, read the HOWTO at
+	  <http://www.bieringer.de/linux/IPv6/>.
+
+	  To compile this protocol support as a module, choose M here: the 
+	  module will be called ipv6.
+
 config IPV6_PRIVACY
 	bool "IPv6: Privacy Extensions (RFC 3041) support"
 	depends on IPV6
net/ipx/Kconfig +33 -0
diff -Nru a/net/ipx/Kconfig b/net/ipx/Kconfig
@@ -1,6 +1,39 @@
 #
 # IPX configuration
 #
+config IPX
+	tristate "The IPX protocol"
+	select LLC
+	---help---
+	  This is support for the Novell networking protocol, IPX, commonly
+	  used for local networks of Windows machines.  You need it if you
+	  want to access Novell NetWare file or print servers using the Linux
+	  Novell client ncpfs (available from
+	  <ftp://platan.vc.cvut.cz/pub/linux/ncpfs/>) or from
+	  within the Linux DOS emulator DOSEMU (read the DOSEMU-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>).  In order
+	  to do the former, you'll also have to say Y to "NCP file system
+	  support", below.
+
+	  IPX is similar in scope to IP, while SPX, which runs on top of IPX,
+	  is similar to TCP. There is also experimental support for SPX in
+	  Linux (see "SPX networking", below).
+
+	  To turn your Linux box into a fully featured NetWare file server and
+	  IPX router, say Y here and fetch either lwared from
+	  <ftp://ibiblio.org/pub/Linux/system/network/daemons/> or
+	  mars_nwe from <ftp://www.compu-art.de/mars_nwe/>. For more
+	  information, read the IPX-HOWTO available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  General information about how to connect Linux, Windows machines and
+	  Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.
+
+	  The IPX driver would enlarge your kernel by about 16 KB. To compile
+	  this driver as a module, choose M here: the module will be called ipx.
+	  Unless you want to integrate your Linux box with a local Novell
+	  network, say N.
+
 config IPX_INTERN
 	bool "IPX: Full internal IPX network"
 	depends on IPX
net/lapb/Kconfig new file +24 -0
diff -Nru a/net/lapb/Kconfig b/net/lapb/Kconfig
@@ -0,0 +1,24 @@
+#
+# LAPB Configuration
+#
+
+config LAPB
+	tristate "LAPB Data Link Driver (EXPERIMENTAL)"
+	depends on NET && EXPERIMENTAL
+	---help---
+	  Link Access Procedure, Balanced (LAPB) is the data link layer (i.e.
+	  the lower) part of the X.25 protocol. It offers a reliable
+	  connection service to exchange data frames with one other host, and
+	  it is used to transport higher level protocols (mostly X.25 Packet
+	  Layer, the higher part of X.25, but others are possible as well).
+	  Usually, LAPB is used with specialized X.21 network cards, but Linux
+	  currently supports LAPB only over Ethernet connections. If you want
+	  to use LAPB connections over Ethernet, say Y here and to "LAPB over
+	  Ethernet driver" below. Read
+	  <file:Documentation/networking/lapb-module.txt> for technical
+	  details.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called lapb.  If unsure, say N.
+
+
net/packet/Kconfig new file +26 -0
diff -Nru a/net/packet/Kconfig b/net/packet/Kconfig
@@ -0,0 +1,26 @@
+#
+# Packet configuration
+#
+
+config PACKET
+	tristate "Packet socket"
+	---help---
+	  The Packet protocol is used by applications which communicate
+	  directly with network devices without an intermediate network
+	  protocol implemented in the kernel, e.g. tcpdump.  If you want them
+	  to work, choose Y.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called af_packet.
+
+	  If unsure, say Y.
+
+config PACKET_MMAP
+	bool "Packet socket: mmapped IO"
+	depends on PACKET
+	help
+	  If you say Y here, the Packet protocol driver will use an IO
+	  mechanism that results in faster communication.
+
+	  If unsure, say N.
+
net/sched/Kconfig +40 -0
diff -Nru a/net/sched/Kconfig b/net/sched/Kconfig
@@ -1,6 +1,45 @@
 #
 # Traffic control configuration.
 # 
+
+menu "QoS and/or fair quiueing"
+
+config NET_SCHED
+	bool "QoS and/or fair queueing"
+	---help---
+	  When the kernel has several packets to send out over a network
+	  device, it has to decide which ones to send first, which ones to
+	  delay, and which ones to drop. This is the job of the packet
+	  scheduler, and several different algorithms for how to do this
+	  "fairly" have been proposed.
+
+	  If you say N here, you will get the standard packet scheduler, which
+	  is a FIFO (first come, first served). If you say Y here, you will be
+	  able to choose from among several alternative algorithms which can
+	  then be attached to different network devices. This is useful for
+	  example if some of your network devices are real time devices that
+	  need a certain minimum data flow rate, or if you need to limit the
+	  maximum data flow rate for traffic which matches specified criteria.
+	  This code is considered to be experimental.
+
+	  To administer these schedulers, you'll need the user-level utilities
+	  from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>.
+	  That package also contains some documentation; for more, check out
+	  <http://snafu.freedom.org/linux2.2/iproute-notes.html>.
+
+	  This Quality of Service (QoS) support will enable you to use
+	  Differentiated Services (diffserv) and Resource Reservation Protocol
+	  (RSVP) on your Linux router if you also say Y to "QoS support",
+	  "Packet classifier API" and to some classifiers below. Documentation
+	  and software is at <http://diffserv.sourceforge.net/>.
+
+	  If you say Y here and to "/proc file system" below, you will be able
+	  to read status information about packet schedulers from the file
+	  /proc/net/psched.
+
+	  The available schedulers are listed in the following questions; you
+	  can say Y to as many as you like. If unsure, say N now.
+
 choice
 	prompt "Packet scheduler clock source"
 	depends on NET_SCHED
@@ -506,3 +545,4 @@
 	  Say Y to support traffic policing (bandwidth limits).  Needed for
 	  ingress and egress rate limiting.
 
+endmenu
net/sctp/Kconfig +0 -5
diff -Nru a/net/sctp/Kconfig b/net/sctp/Kconfig
@@ -2,12 +2,8 @@
 # SCTP configuration
 #
 
-menu "SCTP Configuration (EXPERIMENTAL)"
-	depends on INET && EXPERIMENTAL
-
 config IP_SCTP
 	tristate "The SCTP Protocol (EXPERIMENTAL)"
-	depends on IPV6 || IPV6=n
 	select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_SHA1 if SCTP_HMAC_SHA1
@@ -86,4 +82,3 @@
 	  advised to use either HMAC-MD5 or HMAC-SHA1.
 
 endchoice
-endmenu
net/unix/Kconfig new file +22 -0
diff -Nru a/net/unix/Kconfig b/net/unix/Kconfig
@@ -0,0 +1,22 @@
+#
+# Configuration for Unix domain sockets
+#
+
+config UNIX
+	tristate "Unix domain sockets"
+	---help---
+	  If you say Y here, you will include support for Unix domain sockets;
+	  sockets are the standard Unix mechanism for establishing and
+	  accessing network connections.  Many commonly used programs such as
+	  the X Window system and syslog use these sockets even if your
+	  machine is not connected to any network.  Unless you are working on
+	  an embedded system or something similar, you therefore definitely
+	  want to say Y here.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called unix.  Note that several important services won't work
+	  correctly if you say M here and then neglect to load the module.
+
+	  Say Y unless you know what you are doing.
+
+
net/wanrouter/Kconfig new file +31 -0
diff -Nru a/net/wanrouter/Kconfig b/net/wanrouter/Kconfig
@@ -0,0 +1,31 @@
+#
+# Configuration for WAN Router
+#
+
+config WAN_ROUTER
+	tristate "WAN router"
+	depends on EXPERIMENTAL
+	---help---
+	  Wide Area Networks (WANs), such as X.25, frame relay and leased
+	  lines, are used to interconnect Local Area Networks (LANs) over vast
+	  distances with data transfer rates significantly higher than those
+	  achievable with commonly used asynchronous modem connections.
+	  Usually, a quite expensive external device called a `WAN router' is
+	  needed to connect to a WAN.
+
+	  As an alternative, WAN routing can be built into the Linux kernel.
+	  With relatively inexpensive WAN interface cards available on the
+	  market, a perfectly usable router can be built for less than half
+	  the price of an external router.  If you have one of those cards and
+	  wish to use your Linux box as a WAN router, say Y here and also to
+	  the WAN driver for your card, below.  You will then need the
+	  wan-tools package which is available from <ftp://ftp.sangoma.com/>.
+	  Read <file:Documentation/networking/wan-router.txt> for more
+	  information.
+
+	  To compile WAN routing support as a module, choose M here: the
+	  module will be called wanrouter.
+
+	  If unsure, say N.
+
+
net/x25/Kconfig new file +35 -0
diff -Nru a/net/x25/Kconfig b/net/x25/Kconfig
@@ -0,0 +1,35 @@
+#
+# X25 Configuration
+#
+
+config X25
+	tristate "CCITT X.25 Packet Layer (EXPERIMENTAL)"
+	depends on NET && EXPERIMENTAL
+	---help---
+	  X.25 is a set of standardized network protocols, similar in scope to
+	  frame relay; the one physical line from your box to the X.25 network
+	  entry point can carry several logical point-to-point connections
+	  (called "virtual circuits") to other computers connected to the X.25
+	  network. Governments, banks, and other organizations tend to use it
+	  to connect to each other or to form Wide Area Networks (WANs). Many
+	  countries have public X.25 networks. X.25 consists of two
+	  protocols: the higher level Packet Layer Protocol (PLP) (say Y here
+	  if you want that) and the lower level data link layer protocol LAPB
+	  (say Y to "LAPB Data Link Driver" below if you want that).
+
+	  You can read more about X.25 at <http://www.sangoma.com/x25.htm> and
+	  <http://www.cisco.com/univercd/cc/td/doc/product/software/ios11/cbook/cx25.htm>.
+	  Information about X.25 for Linux is contained in the files
+	  <file:Documentation/networking/x25.txt> and
+	  <file:Documentation/networking/x25-iface.txt>.
+
+	  One connects to an X.25 network either with a dedicated network card
+	  using the X.21 protocol (not yet supported by Linux) or one can do
+	  X.25 over a standard telephone line using an ordinary modem (say Y
+	  to "X.25 async driver" below) or over Ethernet using an ordinary
+	  Ethernet card and the LAPB over Ethernet (say Y to "LAPB Data Link
+	  Driver" and "LAPB over Ethernet driver" below).
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called x25. If unsure, say N.
+
#10 lore raw

Hi Sam-

Quoted 10 lines · Sam Ravnborg
Quoted 1 line · Randy.Dunlap

Any comments on this new version?

The new Networking menu looks unstructured.
And the net/Kconfig file contains a lot of config snippets that does not belong there.
So I took a stamp on it with focus on:
- Move config bits to appropriate places, creating several new Kconfig files

Very Good.

Quoted 1 line

- Made uses of menus more consistent at least on first and second level

Very Good again.

Quoted 3 lines

- Move submenu to the top
- Rename top menu to "Networking" and located it just before "File systems"

I still prefer Networking to come before Device Drivers FWIW. Just makes some kind of hierarchical sense to me.

Quoted 6 lines

The patch became much larger. The win is that the top-level net/Kconfig contains much less cruft.

Many of the 56 lines added are due to the additional files. I did not (on purpose) change any functionality.

Quoted 6 lines

Only bit that I am worried about is the statement in SCTP:

	depends on IPV6 || IPV6=n

That looked like a noop to me. It had the sideeffect that SCTP menu entries where idented an extra level which was not desireable with currect layout.

Yeah, I was having several identation problems.

Quoted 1 line

Comments appreciated.

Nice job overall. Especially nice to move ATM, bridge, DECNET, ECONET, etc., to their own Kconfig files so that they are more manageable.

I propose that the new file net/atm/Kconfig be sourced somewhere.

I'll look at it more to see if I have any other comments.

Quoted 22 lines

Patch on top of rc2.

---

Sam

 drivers/Kconfig               |    5 
 drivers/net/Kconfig           |    5 
 drivers/net/appletalk/Kconfig |   28 ++
 net/8021q/Kconfig             |   21 +
 net/Kconfig                   |  541 +++---------------------------------------
 net/atm/Kconfig               |   77 +++++
 net/bridge/Kconfig            |   32 ++
 net/bridge/netfilter/Kconfig  |    1 
 net/core/Kconfig              |   67 +++++
 net/decnet/Kconfig            |   24 +
 net/econet/Kconfig            |   34 ++
 net/ipv4/netfilter/Kconfig    |    5 
 net/ipv6/Kconfig              |   20 +
 net/ipx/Kconfig               |   33 ++
Quoted 8 lines
 net/lapb/Kconfig              |   24 +
 net/packet/Kconfig            |   26 ++
 net/sched/Kconfig             |   40 +++
 net/sctp/Kconfig              |    5 
 net/unix/Kconfig              |   22 +
 net/wanrouter/Kconfig         |   31 ++
 net/x25/Kconfig               |   35 ++
 21 files changed, 567 insertions(+), 509 deletions(-)

Thanks!

Signature · 1 line
~Randy
#11 lore raw
Quoted 7 lines
Quoted 4 lines

- Move submenu to the top
- Rename top menu to "Networking" and located it just before "File systems"

I still prefer Networking to come before Device Drivers FWIW. Just makes some kind of hierarchical sense to me.

Moved up as suggested.

Quoted 1 line

I propose that the new file net/atm/Kconfig be sourced somewhere.

Thanks, I have missed that one - added just before wanrouter.

Quoted 1 line

I'll look at it more to see if I have any other comments.

OK. I will await and post an updated patch if you do not beat me.

Sam

#12 lore raw
Quoted 11 lines · Sam Ravnborg
Quoted 7 lines
Quoted 4 lines

- Move submenu to the top
- Rename top menu to "Networking" and located it just before "File systems"

I still prefer Networking to come before Device Drivers FWIW. Just makes some kind of hierarchical sense to me.

Moved up as suggested.

Quoted 8 lines
Quoted 1 line

I propose that the new file net/atm/Kconfig be sourced somewhere.

Thanks, I have missed that one - added just before wanrouter.

Quoted 1 line

I'll look at it more to see if I have any other comments.

OK. I will await and post an updated patch if you do not beat me.

Sam,
Here are a few more suggestions for you to consider.

- in Networking support, move Network testing and Netpoll support to the end of the menu (basically put the devel. tools toward the bottom of the menu)

- I would rather not "hide" Amateur Radio, IrDA, and Bluetooth in the Networking protocols area, but have them near 802.1x and ATM in the top-level Networking support menu. How does that sound to you?

Thanks.

Signature · 1 line
~Randy
#13 lore raw
Quoted 4 lines · Randy.Dunlap

- in Networking support, move Network testing and Netpoll support to the end of the menu (basically put the devel. tools toward the bottom of the menu)

Done

Quoted 4 lines

- I would rather not "hide" Amateur Radio, IrDA, and Bluetooth in the Networking protocols area, but have them near 802.1x and ATM in the top-level Networking support menu. How does that sound to you?

Done

I've made them with separate menu's that you have to enter to enable them.
Also pushed out xfrm stuff to net/xfrm/Kconfig
Several other small adjustments.
In the Networking menu the submenu's are grouped in beginning and in the end now.

I thought of creating a Kconfig.netfilter for the common netfilter stuff. But in the end did not do it - felt there was plenty of new small files being created already.

Comments welcome.

Sam

 drivers/Kconfig              |    4 
 drivers/net/Kconfig          |    5 
 net/Kconfig                  |  541 ++-----------------------------------------
 net/ax25/Kconfig             |    5 
 net/bluetooth/Kconfig        |    6 
 net/bridge/netfilter/Kconfig |    1 
 net/decnet/Kconfig           |   24 +
 net/ipv4/netfilter/Kconfig   |    5 
 net/ipv6/Kconfig             |   20 +
 net/ipx/Kconfig              |   33 ++
 net/irda/Kconfig             |    5 
 net/sched/Kconfig            |   40 +++
 net/sctp/Kconfig             |    5 
 net/xfrm/Kconfig             |   14 +
 v2.6/net/8021q/Kconfig       |   21 +
 v2.6/net/appletalk/Kconfig   |   33 ++
 v2.6/net/atm/Kconfig         |   79 ++++++
 v2.6/net/bridge/Kconfig      |   32 ++
 v2.6/net/core/Kconfig        |   67 +++++
 v2.6/net/econet/Kconfig      |   34 ++
 v2.6/net/lapb/Kconfig        |   24 +
 v2.6/net/packet/Kconfig      |   26 ++
 v2.6/net/unix/Kconfig        |   22 +
 v2.6/net/wanrouter/Kconfig   |   31 ++
 v2.6/net/x25/Kconfig         |   35 ++
 25 files changed, 590 insertions(+), 522 deletions(-)

===== drivers/Kconfig 1.7 vs edited =====

drivers/Kconfig +3 -1
@@ -1,5 +1,7 @@
 # drivers/Kconfig
 
+source "net/Kconfig"
+
 menu "Device Drivers"
 
 source "drivers/base/Kconfig"
@@ -28,7 +30,7 @@
 
 source "drivers/macintosh/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

===== drivers/net/Kconfig 1.113 vs edited =====

drivers/net/Kconfig +4 -1
@@ -1,8 +1,9 @@
-
 #
 # Network device configuration
 #
 
+menu "Network device support"
+
 config NETDEVICES
 	depends on NET
 	bool "Network device support"
@@ -2535,4 +2536,6 @@
 	---help---
 	If you want to log kernel messages over the network, enable this.
 	See <file:Documentation/networking/netconsole.txt> for details.
+
+endmenu
 

===== net/Kconfig 1.43 vs edited =====

net/Kconfig +34 -507

593 lines not on this page · raw message

===== net/ax25/Kconfig 1.5 vs edited =====

net/ax25/Kconfig +4 -1
@@ -6,7 +6,9 @@
 #		Joerg Reuter DL1BKE <[email protected]>
 # 19980129	Moved to net/ax25/Config.in, sourcing device drivers.
 
-menuconfig HAMRADIO
+menu "Amateur Radio support"
+
+config HAMRADIO
 	depends on NET
 	bool "Amateur Radio support"
 	help
@@ -107,4 +109,5 @@
 source "drivers/net/hamradio/Kconfig"
 
 endmenu
+endmenu # "Amateur Radio support"
 

===== net/bluetooth/Kconfig 1.8 vs edited =====

net/bluetooth/Kconfig +5 -1
@@ -2,7 +2,9 @@
 # Bluetooth subsystem configuration
 #
 
-menuconfig BT
+menu "Bluetooth subsystem support"
+
+config BT
 	depends on NET
 	tristate "Bluetooth subsystem support"
 	help
@@ -60,4 +62,6 @@
 source "net/bluetooth/hidp/Kconfig"
 
 source "drivers/bluetooth/Kconfig"
+
+endmenu # "Bluetooth subsystem support"
 

===== net/bridge/netfilter/Kconfig 1.12 vs edited =====

net/bridge/netfilter/Kconfig +1 -0
@@ -139,6 +139,7 @@
 config BRIDGE_EBT_ARPREPLY
 	tristate "ebt: arp reply target support"
 	depends on BRIDGE_NF_EBTABLES
+	depends on INET
 	help
 	  This option adds the arp reply target, which allows
 	  automatically sending arp replies to arp requests.

===== net/decnet/Kconfig 1.5 vs edited =====

net/decnet/Kconfig +24 -0
@@ -1,6 +1,30 @@
 #
 # DECnet configuration
 #
+
+config DECNET
+	tristate "DECnet Support"
+	---help---
+	  The DECnet networking protocol was used in many products made by
+	  Digital (now Compaq).  It provides reliable stream and sequenced
+	  packet communications over which run a variety of services similar
+	  to those which run over TCP/IP.
+
+	  To find some tools to use with the kernel layer support, please
+	  look at Patrick Caulfield's web site:
+	  <http://linux-decnet.sourceforge.net/>.
+
+	  More detailed documentation is available in
+	  <file:Documentation/networking/decnet.txt>.
+
+	  Be sure to say Y to "/proc file system support" and "Sysctl support"
+	  below when using DECnet, since you will need sysctl support to aid
+	  in configuration at run time.
+
+	  The DECnet code is also available as a module ( = code which can be
+	  inserted in and removed from the running kernel whenever you want).
+	  The module is called decnet.
+
 config DECNET_ROUTER
 	bool "DECnet: router support (EXPERIMENTAL)"
 	depends on DECNET && EXPERIMENTAL

===== net/ipv4/netfilter/Kconfig 1.35 vs edited =====

net/ipv4/netfilter/Kconfig +0 -5
@@ -2,9 +2,6 @@
 # IP netfilter configuration
 #
 
-menu "IP: Netfilter Configuration"
-	depends on INET && NETFILTER
-
 # connection tracking, helpers and protocols
 config IP_NF_CONNTRACK
 	tristate "Connection tracking (required for masq/NAT)"
@@ -691,6 +688,4 @@
 	help
 	  Allows altering the ARP packet payload: source and destination
 	  hardware and network addresses.
-
-endmenu
 

===== net/ipv6/Kconfig 1.12 vs edited =====

net/ipv6/Kconfig +20 -0
@@ -1,6 +1,26 @@
 #
 # IPv6 configuration
 # 
+
+#   IPv6 as module will cause a CRASH if you try to unload it
+config IPV6
+	tristate "The IPv6 protocol"
+	default m
+	select CRYPTO if IPV6_PRIVACY
+	select CRYPTO_MD5 if IPV6_PRIVACY
+	---help---
+	  This is complemental support for the IP version 6.
+	  You will still be able to do traditional IPv4 networking as well.
+
+	  For general information about IPv6, see
+	  <http://playground.sun.com/pub/ipng/html/ipng-main.html>.
+	  For Linux IPv6 development information, see <http://www.linux-ipv6.org>.
+	  For specific information about IPv6 under Linux, read the HOWTO at
+	  <http://www.bieringer.de/linux/IPv6/>.
+
+	  To compile this protocol support as a module, choose M here: the 
+	  module will be called ipv6.
+
 config IPV6_PRIVACY
 	bool "IPv6: Privacy Extensions (RFC 3041) support"
 	depends on IPV6

===== net/ipx/Kconfig 1.2 vs edited =====

net/ipx/Kconfig +33 -0
@@ -1,6 +1,39 @@
 #
 # IPX configuration
 #
+config IPX
+	tristate "The IPX protocol"
+	select LLC
+	---help---
+	  This is support for the Novell networking protocol, IPX, commonly
+	  used for local networks of Windows machines.  You need it if you
+	  want to access Novell NetWare file or print servers using the Linux
+	  Novell client ncpfs (available from
+	  <ftp://platan.vc.cvut.cz/pub/linux/ncpfs/>) or from
+	  within the Linux DOS emulator DOSEMU (read the DOSEMU-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>).  In order
+	  to do the former, you'll also have to say Y to "NCP file system
+	  support", below.
+
+	  IPX is similar in scope to IP, while SPX, which runs on top of IPX,
+	  is similar to TCP. There is also experimental support for SPX in
+	  Linux (see "SPX networking", below).
+
+	  To turn your Linux box into a fully featured NetWare file server and
+	  IPX router, say Y here and fetch either lwared from
+	  <ftp://ibiblio.org/pub/Linux/system/network/daemons/> or
+	  mars_nwe from <ftp://www.compu-art.de/mars_nwe/>. For more
+	  information, read the IPX-HOWTO available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  General information about how to connect Linux, Windows machines and
+	  Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.
+
+	  The IPX driver would enlarge your kernel by about 16 KB. To compile
+	  this driver as a module, choose M here: the module will be called ipx.
+	  Unless you want to integrate your Linux box with a local Novell
+	  network, say N.
+
 config IPX_INTERN
 	bool "IPX: Full internal IPX network"
 	depends on IPX

===== net/irda/Kconfig 1.7 vs edited =====

net/irda/Kconfig +4 -1
@@ -1,8 +1,9 @@
 #
 # IrDA protocol configuration
 #
+menu "IrDA (infrared) subsystem support"
 
-menuconfig IRDA
+config IRDA
 	depends on NET
 	tristate "IrDA (infrared) subsystem support"
 	select CRC_CCITT
@@ -93,4 +94,6 @@
 	  If unsure, say Y (since it makes it easier to find the bugs).
 
 source "drivers/net/irda/Kconfig"
+
+endmenu # "IrDA (infrared) subsystem support"
 

===== net/sched/Kconfig 1.33 vs edited =====

net/sched/Kconfig +40 -0
@@ -1,6 +1,45 @@
 #
 # Traffic control configuration.
 # 
+
+menu "QoS and/or fair queueing"
+
+config NET_SCHED
+	bool "QoS and/or fair queueing"
+	---help---
+	  When the kernel has several packets to send out over a network
+	  device, it has to decide which ones to send first, which ones to
+	  delay, and which ones to drop. This is the job of the packet
+	  scheduler, and several different algorithms for how to do this
+	  "fairly" have been proposed.
+
+	  If you say N here, you will get the standard packet scheduler, which
+	  is a FIFO (first come, first served). If you say Y here, you will be
+	  able to choose from among several alternative algorithms which can
+	  then be attached to different network devices. This is useful for
+	  example if some of your network devices are real time devices that
+	  need a certain minimum data flow rate, or if you need to limit the
+	  maximum data flow rate for traffic which matches specified criteria.
+	  This code is considered to be experimental.
+
+	  To administer these schedulers, you'll need the user-level utilities
+	  from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>.
+	  That package also contains some documentation; for more, check out
+	  <http://snafu.freedom.org/linux2.2/iproute-notes.html>.
+
+	  This Quality of Service (QoS) support will enable you to use
+	  Differentiated Services (diffserv) and Resource Reservation Protocol
+	  (RSVP) on your Linux router if you also say Y to "QoS support",
+	  "Packet classifier API" and to some classifiers below. Documentation
+	  and software is at <http://diffserv.sourceforge.net/>.
+
+	  If you say Y here and to "/proc file system" below, you will be able
+	  to read status information about packet schedulers from the file
+	  /proc/net/psched.
+
+	  The available schedulers are listed in the following questions; you
+	  can say Y to as many as you like. If unsure, say N now.
+
 choice
 	prompt "Packet scheduler clock source"
 	depends on NET_SCHED
@@ -506,3 +545,4 @@
 	  Say Y to support traffic policing (bandwidth limits).  Needed for
 	  ingress and egress rate limiting.
 
+endmenu

===== net/sctp/Kconfig 1.13 vs edited =====

net/sctp/Kconfig +0 -5
@@ -2,12 +2,8 @@
 # SCTP configuration
 #
 
-menu "SCTP Configuration (EXPERIMENTAL)"
-	depends on INET && EXPERIMENTAL
-
 config IP_SCTP
 	tristate "The SCTP Protocol (EXPERIMENTAL)"
-	depends on IPV6 || IPV6=n
 	select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_SHA1 if SCTP_HMAC_SHA1
@@ -86,4 +82,3 @@
 	  advised to use either HMAC-MD5 or HMAC-SHA1.
 
 endchoice
-endmenu

===== net/xfrm/Kconfig 1.3 vs edited =====

net/xfrm/Kconfig +14 -0
@@ -1,6 +1,10 @@
 #
 # XFRM configuration
 #
+
+config XFRM
+       bool
+
 config XFRM_USER
 	tristate "IPsec user configuration interface"
 	depends on INET && XFRM
@@ -9,4 +13,14 @@
 	  by native Linux tools.
 
 	  If unsure, say Y.
+
+config NET_KEY
+	tristate "PF_KEY sockets"
+	select XFRM
+	---help---
+	  PF_KEYv2 socket family, compatible to KAME ones.
+	  They are required if you are going to use IPsec tools ported
+	  from KAME.
+
+	  Say Y unless you know what you are doing.
 
net/8021q/Kconfig new file +21 -0
@@ -0,0 +1,21 @@
+#
+# Configuration for 802.1Q VLAN support
+#
+
+config VLAN_8021Q
+	tristate "802.1Q VLAN Support"
+	---help---
+	  Select this and you will be able to create 802.1Q VLAN interfaces
+	  on your ethernet interfaces.  802.1Q VLAN supports almost
+	  everything a regular ethernet interface does, including
+	  firewalling, bridging, and of course IP traffic.  You will need
+	  the 'vconfig' tool from the VLAN project in order to effectively
+	  use VLANs.  See the VLAN web page for more information:
+	  <http://www.candelatech.com/~greear/vlan.html>
+
+	  To compile this code as a module, choose M here: the module
+	  will be called 8021q.
+
+	  If unsure, say N.
+
+
net/appletalk/Kconfig new file +33 -0
@@ -0,0 +1,33 @@
+#
+# Appletalk configuration
+#
+
+config ATALK
+	tristate "Appletalk protocol support"
+	depends on NET
+	select LLC
+	---help---
+	  AppleTalk is the protocol that Apple computers can use to communicate
+	  on a network.  If your Linux box is connected to such a network and you
+	  wish to connect to it, say Y.  You will need to use the netatalk package
+	  so that your Linux box can act as a print and file server for Macs as
+	  well as access AppleTalk printers.  Check out
+	  <http://www.zettabyte.net/netatalk/> on the WWW for details.
+	  EtherTalk is the name used for AppleTalk over Ethernet and the
+	  cheaper and slower LocalTalk is AppleTalk over a proprietary Apple
+	  network using serial links.  EtherTalk and LocalTalk are fully
+	  supported by Linux.
+
+	  General information about how to connect Linux, Windows machines and
+	  Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.  The
+	  NET-3-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>, contains valuable
+	  information as well.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called appletalk. You almost certainly want to compile it as a
+	  module so you can restart your AppleTalk stack without rebooting
+	  your machine. I hear that the GNU boycott of Apple is over, so
+	  even politically correct people are allowed to say Y here.
+
+source "drivers/net/appletalk/Kconfig"
net/atm/Kconfig new file +79 -0

79 lines not on this page · raw message

net/bridge/Kconfig new file +32 -0
@@ -0,0 +1,32 @@
+#
+# Configuration for Ethernet bridging
+#
+
+config BRIDGE
+	tristate "802.1d Ethernet Bridging"
+	---help---
+	  If you say Y here, then your Linux box will be able to act as an
+	  Ethernet bridge, which means that the different Ethernet segments it
+	  is connected to will appear as one Ethernet to the participants.
+	  Several such bridges can work together to create even larger
+	  networks of Ethernets using the IEEE 802.1 spanning tree algorithm.
+	  As this is a standard, Linux bridges will cooperate properly with
+	  other third party bridge products.
+
+	  In order to use the Ethernet bridge, you'll need the bridge
+	  configuration tools; see <file:Documentation/networking/bridge.txt>
+	  for location. Please read the Bridge mini-HOWTO for more
+	  information.
+
+	  If you enable iptables support along with the bridge support then you
+	  turn your bridge into a bridging IP firewall.
+	  iptables will then see the IP packets being bridged, so you need to
+	  take this into account when setting up your firewall rules.
+	  Enabling arptables support when bridging will let arptables see
+	  bridged ARP traffic in the arptables FORWARD chain.
+
+	  To compile this code as a module, choose M here: the module
+	  will be called bridge.
+
+	  If unsure, say N.
+
net/core/Kconfig new file +67 -0

67 lines not on this page · raw message

net/econet/Kconfig new file +34 -0
@@ -0,0 +1,34 @@
+
+config ECONET
+	tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
+	depends on EXPERIMENTAL && INET
+	---help---
+	  Econet is a fairly old and slow networking protocol mainly used by
+	  Acorn computers to access file and print servers. It uses native
+	  Econet network cards. AUN is an implementation of the higher level
+	  parts of Econet that runs over ordinary Ethernet connections, on
+	  top of the UDP packet protocol, which in turn runs on top of the
+	  Internet protocol IP.
+
+	  If you say Y here, you can choose with the next two options whether
+	  to send Econet/AUN traffic over a UDP Ethernet connection or over
+	  a native Econet network card.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called econet.
+
+config ECONET_AUNUDP
+	bool "AUN over UDP"
+	depends on ECONET
+	help
+	  Say Y here if you want to send Econet/AUN traffic over a UDP
+	  connection (UDP is a packet based protocol that runs on top of the
+	  Internet protocol IP) using an ordinary Ethernet network card.
+
+config ECONET_NATIVE
+	bool "Native Econet"
+	depends on ECONET
+	help
+	  Say Y here if you have a native Econet network card installed in
+	  your computer.
+
net/lapb/Kconfig new file +24 -0
@@ -0,0 +1,24 @@
+#
+# LAPB Configuration
+#
+
+config LAPB
+	tristate "LAPB Data Link Driver (EXPERIMENTAL)"
+	depends on NET && EXPERIMENTAL
+	---help---
+	  Link Access Procedure, Balanced (LAPB) is the data link layer (i.e.
+	  the lower) part of the X.25 protocol. It offers a reliable
+	  connection service to exchange data frames with one other host, and
+	  it is used to transport higher level protocols (mostly X.25 Packet
+	  Layer, the higher part of X.25, but others are possible as well).
+	  Usually, LAPB is used with specialized X.21 network cards, but Linux
+	  currently supports LAPB only over Ethernet connections. If you want
+	  to use LAPB connections over Ethernet, say Y here and to "LAPB over
+	  Ethernet driver" below. Read
+	  <file:Documentation/networking/lapb-module.txt> for technical
+	  details.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called lapb.  If unsure, say N.
+
+
net/packet/Kconfig new file +26 -0
@@ -0,0 +1,26 @@
+#
+# Packet configuration
+#
+
+config PACKET
+	tristate "Packet socket"
+	---help---
+	  The Packet protocol is used by applications which communicate
+	  directly with network devices without an intermediate network
+	  protocol implemented in the kernel, e.g. tcpdump.  If you want them
+	  to work, choose Y.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called af_packet.
+
+	  If unsure, say Y.
+
+config PACKET_MMAP
+	bool "Packet socket: mmapped IO"
+	depends on PACKET
+	help
+	  If you say Y here, the Packet protocol driver will use an IO
+	  mechanism that results in faster communication.
+
+	  If unsure, say N.
+
net/unix/Kconfig new file +22 -0
@@ -0,0 +1,22 @@
+#
+# Configuration for Unix domain sockets
+#
+
+config UNIX
+	tristate "Unix domain sockets"
+	---help---
+	  If you say Y here, you will include support for Unix domain sockets;
+	  sockets are the standard Unix mechanism for establishing and
+	  accessing network connections.  Many commonly used programs such as
+	  the X Window system and syslog use these sockets even if your
+	  machine is not connected to any network.  Unless you are working on
+	  an embedded system or something similar, you therefore definitely
+	  want to say Y here.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called unix.  Note that several important services won't work
+	  correctly if you say M here and then neglect to load the module.
+
+	  Say Y unless you know what you are doing.
+
+
net/wanrouter/Kconfig new file +31 -0
@@ -0,0 +1,31 @@
+#
+# Configuration for WAN Router
+#
+
+config WAN_ROUTER
+	tristate "WAN router"
+	depends on EXPERIMENTAL
+	---help---
+	  Wide Area Networks (WANs), such as X.25, frame relay and leased
+	  lines, are used to interconnect Local Area Networks (LANs) over vast
+	  distances with data transfer rates significantly higher than those
+	  achievable with commonly used asynchronous modem connections.
+	  Usually, a quite expensive external device called a `WAN router' is
+	  needed to connect to a WAN.
+
+	  As an alternative, WAN routing can be built into the Linux kernel.
+	  With relatively inexpensive WAN interface cards available on the
+	  market, a perfectly usable router can be built for less than half
+	  the price of an external router.  If you have one of those cards and
+	  wish to use your Linux box as a WAN router, say Y here and also to
+	  the WAN driver for your card, below.  You will then need the
+	  wan-tools package which is available from <ftp://ftp.sangoma.com/>.
+	  Read <file:Documentation/networking/wan-router.txt> for more
+	  information.
+
+	  To compile WAN routing support as a module, choose M here: the
+	  module will be called wanrouter.
+
+	  If unsure, say N.
+
+
net/x25/Kconfig new file +35 -0
@@ -0,0 +1,35 @@
+#
+# X25 Configuration
+#
+
+config X25
+	tristate "CCITT X.25 Packet Layer (EXPERIMENTAL)"
+	depends on NET && EXPERIMENTAL
+	---help---
+	  X.25 is a set of standardized network protocols, similar in scope to
+	  frame relay; the one physical line from your box to the X.25 network
+	  entry point can carry several logical point-to-point connections
+	  (called "virtual circuits") to other computers connected to the X.25
+	  network. Governments, banks, and other organizations tend to use it
+	  to connect to each other or to form Wide Area Networks (WANs). Many
+	  countries have public X.25 networks. X.25 consists of two
+	  protocols: the higher level Packet Layer Protocol (PLP) (say Y here
+	  if you want that) and the lower level data link layer protocol LAPB
+	  (say Y to "LAPB Data Link Driver" below if you want that).
+
+	  You can read more about X.25 at <http://www.sangoma.com/x25.htm> and
+	  <http://www.cisco.com/univercd/cc/td/doc/product/software/ios11/cbook/cx25.htm>.
+	  Information about X.25 for Linux is contained in the files
+	  <file:Documentation/networking/x25.txt> and
+	  <file:Documentation/networking/x25-iface.txt>.
+
+	  One connects to an X.25 network either with a dedicated network card
+	  using the X.21 protocol (not yet supported by Linux) or one can do
+	  X.25 over a standard telephone line using an ordinary modem (say Y
+	  to "X.25 async driver" below) or over Ethernet using an ordinary
+	  Ethernet card and the LAPB over Ethernet (say Y to "LAPB Data Link
+	  Driver" and "LAPB over Ethernet driver" below).
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called x25. If unsure, say N.
+
#14 lore raw
Quoted 23 lines · Sam Ravnborg
Quoted 3 lines · Randy.Dunlap

- in Networking support, move Network testing and Netpoll support to the end of the menu (basically put the devel. tools toward the bottom of the menu)

Done

Quoted 4 lines

- I would rather not "hide" Amateur Radio, IrDA, and Bluetooth in the Networking protocols area, but have them near 802.1x and ATM in the top-level Networking support menu. How does that sound to you?

Done

I've made them with separate menu's that you have to enter to enable them.
Also pushed out xfrm stuff to net/xfrm/Kconfig
Several other small adjustments.
In the Networking menu the submenu's are grouped in beginning and in the end now.

Quoted 3 lines

I thought of creating a Kconfig.netfilter for the common netfilter stuff. But in the end did not do it - felt there was plenty of new small files being created already.

It would make sense to isolate the netfilter options, but that can be done later.
But you are right about "plenty of new small files."

I would move Frame Diverter (NET_DIVERT) from the end of the net/core/Kconfig file to the top of the same file.... and then ship it. :)

Quoted 1 line

Comments welcome.

Thanks for doing this.

Signature · 1 line
~Randy
#15 lore raw

PATCH 1/1 networking: restructuring of net/ kconfig

Hi Rany et all.

I have committed the following patch and it will be present in next -mm.

It is present (as the only additional cset) in
bk://linux-sam.bkbits.net/kconfig

davem - any suggestion for next step.
Preferably this goes to Linus via you - or?

Sam

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2005/04/05 22:59:54+02:00 [email protected]
# networking: restructure kconfig for net/
#
# Based on patch and several rounds of comments from:
# "Randy.Dunlap" <[email protected]>
#

#   Restructure Networking menu structure creating a separate menu
#   just before Device Drivers.
#   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.
#   
#   The patch does the following:
#   o Create a new "Networking" menu just before "Device Drivers"
#   o push all config bits to relevant Kconfig files in net/ hirachy
#   o create new Kconfig files for some subsystem to further push config

# bits out of net/Kconfig
# o Make more consistent use of menu's avoiding the menuconfig statement
# o Fix all menu indention for net/
#
# No intentional functional changes introduced.
#
# Signed-off-by: Sam Ravnborg <[email protected]>
#
# net/x25/Kconfig
# 2005/04/05 22:59:31+02:00 [email protected] +35 -0
#
# net/x25/Kconfig
# 2005/04/05 22:59:31+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/x25/Kconfig
#
# net/wanrouter/Kconfig
# 2005/04/05 22:59:30+02:00 [email protected] +31 -0
#
# net/wanrouter/Kconfig
# 2005/04/05 22:59:30+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/wanrouter/Kconfig
#
# net/unix/Kconfig
# 2005/04/05 22:59:28+02:00 [email protected] +22 -0
#
# net/unix/Kconfig
# 2005/04/05 22:59:28+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/unix/Kconfig
#
# net/packet/Kconfig
# 2005/04/05 22:59:26+02:00 [email protected] +26 -0
#
# net/packet/Kconfig
# 2005/04/05 22:59:26+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/packet/Kconfig
#
# net/lapb/Kconfig
# 2005/04/05 22:59:24+02:00 [email protected] +24 -0
#
# net/lapb/Kconfig
# 2005/04/05 22:59:24+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/lapb/Kconfig
#
# net/econet/Kconfig
# 2005/04/05 22:59:22+02:00 [email protected] +34 -0
#
# net/econet/Kconfig
# 2005/04/05 22:59:22+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/econet/Kconfig
#
# net/core/Kconfig
# 2005/04/05 22:59:21+02:00 [email protected] +67 -0
#
# net/core/Kconfig
# 2005/04/05 22:59:21+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/core/Kconfig
#
# net/bridge/Kconfig
# 2005/04/05 22:59:19+02:00 [email protected] +32 -0
#
# net/bridge/Kconfig
# 2005/04/05 22:59:19+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/bridge/Kconfig
#
# net/atm/Kconfig
# 2005/04/05 22:59:17+02:00 [email protected] +79 -0
#
# net/atm/Kconfig
# 2005/04/05 22:59:17+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/atm/Kconfig
#
# net/appletalk/Kconfig
# 2005/04/05 22:59:16+02:00 [email protected] +33 -0
#
# net/appletalk/Kconfig
# 2005/04/05 22:59:16+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/appletalk/Kconfig
#
# net/8021q/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +21 -0
#
# net/xfrm/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +14 -0
# Move top-level config options from net/Kconfig
#
# net/sctp/Kconfig

#   2005/04/05 22:59:14+02:00 [email protected] +6 -3
#   Skip menu - no longer relevant
#   Added config option to fix indention in menuconfig
# 
# net/sched/Kconfig
#   2005/04/05 22:59:14+02:00 [email protected] +40 -0
#   Move top-level config option from net/Kconfig
#   Wrap it in a menu

#
# net/irda/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +4 -1
# Use a real menu for IrDA"
#
# net/ipx/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +33 -0
# Move top-level config option from net/Kconfig
#
# net/ipv6/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +20 -0
# Move top-level config option from net/Kconfig
#
# net/ipv4/netfilter/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +0 -5
# Skip menu - no longer relevant
#
# net/decnet/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +24 -0
# Include high level config option from net/Kconfig
#
# net/bridge/netfilter/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +1 -0
# BRIDGE depends on INET
#
# net/bluetooth/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +5 -1
# Use a real menu for "Bluetooth"
#
# net/ax25/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +4 -1
# Use a real menu for "Amateur Radio Support"
#
# net/Kconfig

#   2005/04/05 22:59:14+02:00 [email protected] +34 -507
#   Push out all config bits to relevant Kconfig files.
#   Use if XXX / endif to make all depencies correct.
#   source a lot of new Kconfig files

#
# net/8021q/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +0 -0
# BitKeeper file /home/sam/bk/v2.6/net/8021q/Kconfig
#
# drivers/net/Kconfig
# 2005/04/05 22:59:14+02:00 [email protected] +4 -1
# Add all net drivers in a new menu "Network device support"
#
# drivers/Kconfig

#   2005/04/05 22:59:14+02:00 [email protected] +3 -1
#   Move "Networking" menu up before "Device Drivers"
#   Explicit include net drivers

#

drivers/Kconfig +3 -1
diff -Nru a/drivers/Kconfig b/drivers/Kconfig
@@ -1,5 +1,7 @@
 # drivers/Kconfig
 
+source "net/Kconfig"
+
 menu "Device Drivers"
 
 source "drivers/base/Kconfig"
@@ -28,7 +30,7 @@
 
 source "drivers/macintosh/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 
drivers/net/Kconfig +4 -1
diff -Nru a/drivers/net/Kconfig b/drivers/net/Kconfig
@@ -1,8 +1,9 @@
-
 #
 # Network device configuration
 #
 
+menu "Network device support"
+
 config NETDEVICES
 	depends on NET
 	bool "Network device support"
@@ -2535,4 +2536,6 @@
 	---help---
 	If you want to log kernel messages over the network, enable this.
 	See <file:Documentation/networking/netconsole.txt> for details.
+
+endmenu
 
net/8021q/Kconfig new file +21 -0
diff -Nru a/net/8021q/Kconfig b/net/8021q/Kconfig
@@ -0,0 +1,21 @@
+#
+# Configuration for 802.1Q VLAN support
+#
+
+config VLAN_8021Q
+	tristate "802.1Q VLAN Support"
+	---help---
+	  Select this and you will be able to create 802.1Q VLAN interfaces
+	  on your ethernet interfaces.  802.1Q VLAN supports almost
+	  everything a regular ethernet interface does, including
+	  firewalling, bridging, and of course IP traffic.  You will need
+	  the 'vconfig' tool from the VLAN project in order to effectively
+	  use VLANs.  See the VLAN web page for more information:
+	  <http://www.candelatech.com/~greear/vlan.html>
+
+	  To compile this code as a module, choose M here: the module
+	  will be called 8021q.
+
+	  If unsure, say N.
+
+
net/Kconfig +34 -507

593 lines not on this page · raw message

net/appletalk/Kconfig new file +33 -0
diff -Nru a/net/appletalk/Kconfig b/net/appletalk/Kconfig
@@ -0,0 +1,33 @@
+#
+# Appletalk configuration
+#
+
+config ATALK
+	tristate "Appletalk protocol support"
+	depends on NET
+	select LLC
+	---help---
+	  AppleTalk is the protocol that Apple computers can use to communicate
+	  on a network.  If your Linux box is connected to such a network and you
+	  wish to connect to it, say Y.  You will need to use the netatalk package
+	  so that your Linux box can act as a print and file server for Macs as
+	  well as access AppleTalk printers.  Check out
+	  <http://www.zettabyte.net/netatalk/> on the WWW for details.
+	  EtherTalk is the name used for AppleTalk over Ethernet and the
+	  cheaper and slower LocalTalk is AppleTalk over a proprietary Apple
+	  network using serial links.  EtherTalk and LocalTalk are fully
+	  supported by Linux.
+
+	  General information about how to connect Linux, Windows machines and
+	  Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.  The
+	  NET-3-HOWTO, available from
+	  <http://www.tldp.org/docs.html#howto>, contains valuable
+	  information as well.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called appletalk. You almost certainly want to compile it as a
+	  module so you can restart your AppleTalk stack without rebooting
+	  your machine. I hear that the GNU boycott of Apple is over, so
+	  even politically correct people are allowed to say Y here.
+
+source "drivers/net/appletalk/Kconfig"
net/atm/Kconfig new file +79 -0

79 lines not on this page · raw message

net/ax25/Kconfig +4 -1
diff -Nru a/net/ax25/Kconfig b/net/ax25/Kconfig
@@ -6,7 +6,9 @@
 #		Joerg Reuter DL1BKE <[email protected]>
 # 19980129	Moved to net/ax25/Config.in, sourcing device drivers.
 
-menuconfig HAMRADIO
+menu "Amateur Radio support"
+
+config HAMRADIO
 	depends on NET
 	bool "Amateur Radio support"
 	help
@@ -107,4 +109,5 @@
 source "drivers/net/hamradio/Kconfig"
 
 endmenu
+endmenu # "Amateur Radio support"
 
net/bluetooth/Kconfig +5 -1
diff -Nru a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
@@ -2,7 +2,9 @@
 # Bluetooth subsystem configuration
 #
 
-menuconfig BT
+menu "Bluetooth subsystem support"
+
+config BT
 	depends on NET
 	tristate "Bluetooth subsystem support"
 	help
@@ -60,4 +62,6 @@
 source "net/bluetooth/hidp/Kconfig"
 
 source "drivers/bluetooth/Kconfig"
+
+endmenu # "Bluetooth subsystem support"
 
net/bridge/Kconfig new file +32 -0
diff -Nru a/net/bridge/Kconfig b/net/bridge/Kconfig
@@ -0,0 +1,32 @@
+#
+# Configuration for Ethernet bridging
+#
+
+config BRIDGE
+	tristate "802.1d Ethernet Bridging"
+	---help---
+	  If you say Y here, then your Linux box will be able to act as an
+	  Ethernet bridge, which means that the different Ethernet segments it
+	  is connected to will appear as one Ethernet to the participants.
+	  Several such bridges can work together to create even larger
+	  networks of Ethernets using the IEEE 802.1 spanning tree algorithm.
+	  As this is a standard, Linux bridges will cooperate properly with
+	  other third party bridge products.
+
+	  In order to use the Ethernet bridge, you'll need the bridge
+	  configuration tools; see <file:Documentation/networking/bridge.txt>
+	  for location. Please read the Bridge mini-HOWTO for more
+	  information.
+
+	  If you enable iptables support along with the bridge support then you
+	  turn your bridge into a bridging IP firewall.
+	  iptables will then see the IP packets being bridged, so you need to
+	  take this into account when setting up your firewall rules.
+	  Enabling arptables support when bridging will let arptables see
+	  bridged ARP traffic in the arptables FORWARD chain.
+
+	  To compile this code as a module, choose M here: the module
+	  will be called bridge.
+
+	  If unsure, say N.
+
net/bridge/netfilter/Kconfig +1 -0
diff -Nru a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
@@ -139,6 +139,7 @@
 config BRIDGE_EBT_ARPREPLY
 	tristate "ebt: arp reply target support"
 	depends on BRIDGE_NF_EBTABLES
+	depends on INET
 	help
 	  This option adds the arp reply target, which allows
 	  automatically sending arp replies to arp requests.
net/core/Kconfig new file +67 -0

67 lines not on this page · raw message

net/decnet/Kconfig +24 -0
diff -Nru a/net/decnet/Kconfig b/net/decnet/Kconfig
@@ -1,6 +1,30 @@
 #
 # DECnet configuration
 #
+
+config DECNET
+	tristate "DECnet Support"
+	---help---
+	  The DECnet networking protocol was used in many products made by
+	  Digital (now Compaq).  It provides reliable stream and sequenced
+	  packet communications over which run a variety of services similar
+	  to those which run over TCP/IP.
+
+	  To find some tools to use with the kernel layer support, please
+	  look at Patrick Caulfield's web site:
+	  <http://linux-decnet.sourceforge.net/>.
+
+	  More detailed documentation is available in
+	  <file:Documentation/networking/decnet.txt>.
+
+	  Be sure to say Y to "/proc file system support" and "Sysctl support"
+	  below when using DECnet, since you will need sysctl support to aid
+	  in configuration at run time.
+
+	  The DECnet code is also available as a module ( = code which can be
+	  inserted in and removed from the running kernel whenever you want).
+	  The module is called decnet.
+
 config DECNET_ROUTER
 	bool "DECnet: router support (EXPERIMENTAL)"
 	depends on DECNET && EXPERIMENTAL
net/econet/Kconfig new file +34 -0
diff -Nru a/net/econet/Kconfig b/net/econet/Kconfig
@@ -0,0 +1,34 @@
+
+config ECONET
+	tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
+	depends on EXPERIMENTAL && INET
+	---help---
+	  Econet is a fairly old and slow networking protocol mainly used by
+	  Acorn computers to access file and print servers. It uses native
+	  Econet network cards. AUN is an implementation of the higher level
+	  parts of Econet that runs over ordinary Ethernet connections, on
+	  top of the UDP packet protocol, which in turn runs on top of the
+	  Internet protocol IP.
+
+	  If you say Y here, you can choose with the next two options whether
+	  to send Econet/AUN traffic over a UDP Ethernet connection or over
+	  a native Econet network card.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called econet.
+
+config ECONET_AUNUDP
+	bool "AUN over UDP"
+	depends on ECONET
+	help
+	  Say Y here if you want to send Econet/AUN traffic over a UDP
+	  connection (UDP is a packet based protocol that runs on top of the
+	  Internet protocol IP) using an ordinary Ethernet network card.
+
+config ECONET_NATIVE
+	bool "Native Econet"
+	depends on ECONET
+	help
+	  Say Y here if you have a native Econet network card installed in
+	  your computer.
+
net/ipv4/netfilter/Kconfig +0 -5
diff -Nru a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
@@ -2,9 +2,6 @@
 # IP netfilter configuration
 #
 
-menu "IP: Netfilter Configuration"
-	depends on INET && NETFILTER
-
 # connection tracking, helpers and protocols
 config IP_NF_CONNTRACK
 	tristate "Connection tracking (required for masq/NAT)"
@@ -691,6 +688,4 @@
 	help
 	  Allows altering the ARP packet payload: source and destination
 	  hardware and network addresses.
-
-endmenu
 
net/ipv6/Kconfig +20 -0
diff -Nru a/net/ipv6/Kconfig b/net/ipv6/Kconfig
@@ -1,6 +1,26 @@
 #
 # IPv6 configuration
 # 
+
+#   IPv6 as module will cause a CRASH if you try to unload it
+config IPV6
+	tristate "The IPv6 protocol"
+	default m
+	select CRYPTO if IPV6_PRIVACY
+	select CRYPTO_MD5 if IPV6_PRIVACY
+	---help---
+	  This is complemental support for the IP version 6.
+	  You will still be able to do traditional IPv4 networking as well.
+
+	  For general information about IPv6, see
+	  <http://playground.sun.com/pub/ipng/html/ipng-main.html>.
+	  For Linux IPv6 development information, see <http://www.linux-ipv6.org>.
+	  For specific information about IPv6 under Linux, read the HOWTO at
+	  <http://www.bieringer.de/linux/IPv6/>.
+
+	  To compile this protocol support as a module, choose M here: the 
+	  module will be called ipv6.
+
 config IPV6_PRIVACY
 	bool "IPv6: Privacy Extensions (RFC 3041) support"
 	depends on IPV6
net/ipx/Kconfig +33 -0
diff -Nru a/net/ipx/Kconfig b/net/ipx/Kconfig
@@ -1,6 +1,39 @@
 #
 # IPX configuration
 #
+config IPX
+	tristate "The IPX protocol"
+	select LLC
+	---help---
+	  This is support for the Novell networking protocol, IPX, commonly
+	  used for local networks of Windows machines.  You need it if you
+	  want to access Novell NetWare file or print servers using the Linux
+	  Novell client ncpfs (available from
+	  <ftp://platan.vc.cvut.cz/pub/linux/ncpfs/>) or from
+	  within the Linux DOS emulator DOSEMU (read the DOSEMU-HOWTO,
+	  available from <http://www.tldp.org/docs.html#howto>).  In order
+	  to do the former, you'll also have to say Y to "NCP file system
+	  support", below.
+
+	  IPX is similar in scope to IP, while SPX, which runs on top of IPX,
+	  is similar to TCP. There is also experimental support for SPX in
+	  Linux (see "SPX networking", below).
+
+	  To turn your Linux box into a fully featured NetWare file server and
+	  IPX router, say Y here and fetch either lwared from
+	  <ftp://ibiblio.org/pub/Linux/system/network/daemons/> or
+	  mars_nwe from <ftp://www.compu-art.de/mars_nwe/>. For more
+	  information, read the IPX-HOWTO available from
+	  <http://www.tldp.org/docs.html#howto>.
+
+	  General information about how to connect Linux, Windows machines and
+	  Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.
+
+	  The IPX driver would enlarge your kernel by about 16 KB. To compile
+	  this driver as a module, choose M here: the module will be called ipx.
+	  Unless you want to integrate your Linux box with a local Novell
+	  network, say N.
+
 config IPX_INTERN
 	bool "IPX: Full internal IPX network"
 	depends on IPX
net/irda/Kconfig +4 -1
diff -Nru a/net/irda/Kconfig b/net/irda/Kconfig
@@ -1,8 +1,9 @@
 #
 # IrDA protocol configuration
 #
+menu "IrDA (infrared) subsystem support"
 
-menuconfig IRDA
+config IRDA
 	depends on NET
 	tristate "IrDA (infrared) subsystem support"
 	select CRC_CCITT
@@ -93,4 +94,6 @@
 	  If unsure, say Y (since it makes it easier to find the bugs).
 
 source "drivers/net/irda/Kconfig"
+
+endmenu # "IrDA (infrared) subsystem support"
 
net/lapb/Kconfig new file +24 -0
diff -Nru a/net/lapb/Kconfig b/net/lapb/Kconfig
@@ -0,0 +1,24 @@
+#
+# LAPB Configuration
+#
+
+config LAPB
+	tristate "LAPB Data Link Driver (EXPERIMENTAL)"
+	depends on NET && EXPERIMENTAL
+	---help---
+	  Link Access Procedure, Balanced (LAPB) is the data link layer (i.e.
+	  the lower) part of the X.25 protocol. It offers a reliable
+	  connection service to exchange data frames with one other host, and
+	  it is used to transport higher level protocols (mostly X.25 Packet
+	  Layer, the higher part of X.25, but others are possible as well).
+	  Usually, LAPB is used with specialized X.21 network cards, but Linux
+	  currently supports LAPB only over Ethernet connections. If you want
+	  to use LAPB connections over Ethernet, say Y here and to "LAPB over
+	  Ethernet driver" below. Read
+	  <file:Documentation/networking/lapb-module.txt> for technical
+	  details.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called lapb.  If unsure, say N.
+
+
net/packet/Kconfig new file +26 -0
diff -Nru a/net/packet/Kconfig b/net/packet/Kconfig
@@ -0,0 +1,26 @@
+#
+# Packet configuration
+#
+
+config PACKET
+	tristate "Packet socket"
+	---help---
+	  The Packet protocol is used by applications which communicate
+	  directly with network devices without an intermediate network
+	  protocol implemented in the kernel, e.g. tcpdump.  If you want them
+	  to work, choose Y.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called af_packet.
+
+	  If unsure, say Y.
+
+config PACKET_MMAP
+	bool "Packet socket: mmapped IO"
+	depends on PACKET
+	help
+	  If you say Y here, the Packet protocol driver will use an IO
+	  mechanism that results in faster communication.
+
+	  If unsure, say N.
+
net/sched/Kconfig +40 -0
diff -Nru a/net/sched/Kconfig b/net/sched/Kconfig
@@ -1,6 +1,45 @@
 #
 # Traffic control configuration.
 # 
+
+menu "QoS and/or fair queueing"
+
+config NET_SCHED
+	bool "QoS and/or fair queueing"
+	---help---
+	  When the kernel has several packets to send out over a network
+	  device, it has to decide which ones to send first, which ones to
+	  delay, and which ones to drop. This is the job of the packet
+	  scheduler, and several different algorithms for how to do this
+	  "fairly" have been proposed.
+
+	  If you say N here, you will get the standard packet scheduler, which
+	  is a FIFO (first come, first served). If you say Y here, you will be
+	  able to choose from among several alternative algorithms which can
+	  then be attached to different network devices. This is useful for
+	  example if some of your network devices are real time devices that
+	  need a certain minimum data flow rate, or if you need to limit the
+	  maximum data flow rate for traffic which matches specified criteria.
+	  This code is considered to be experimental.
+
+	  To administer these schedulers, you'll need the user-level utilities
+	  from the package iproute2+tc at <ftp://ftp.tux.org/pub/net/ip-routing/>.
+	  That package also contains some documentation; for more, check out
+	  <http://snafu.freedom.org/linux2.2/iproute-notes.html>.
+
+	  This Quality of Service (QoS) support will enable you to use
+	  Differentiated Services (diffserv) and Resource Reservation Protocol
+	  (RSVP) on your Linux router if you also say Y to "QoS support",
+	  "Packet classifier API" and to some classifiers below. Documentation
+	  and software is at <http://diffserv.sourceforge.net/>.
+
+	  If you say Y here and to "/proc file system" below, you will be able
+	  to read status information about packet schedulers from the file
+	  /proc/net/psched.
+
+	  The available schedulers are listed in the following questions; you
+	  can say Y to as many as you like. If unsure, say N now.
+
 choice
 	prompt "Packet scheduler clock source"
 	depends on NET_SCHED
@@ -506,3 +545,4 @@
 	  Say Y to support traffic policing (bandwidth limits).  Needed for
 	  ingress and egress rate limiting.
 
+endmenu
net/sctp/Kconfig +6 -3
diff -Nru a/net/sctp/Kconfig b/net/sctp/Kconfig
@@ -2,11 +2,15 @@
 # SCTP configuration
 #
 
-menu "SCTP Configuration (EXPERIMENTAL)"
-	depends on INET && EXPERIMENTAL
+# Dummy added to make idention correct in menuconfig
+# The depends on IPV6 || IPV6=n causes SCTP to be indented an extra level
+# if following line is omitted
+config IP_SCTP
 
 config IP_SCTP
 	tristate "The SCTP Protocol (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	# Avoid SCTP as built-in if IPV6 is a module
 	depends on IPV6 || IPV6=n
 	select CRYPTO if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
 	select CRYPTO_HMAC if SCTP_HMAC_SHA1 || SCTP_HMAC_MD5
@@ -86,4 +90,3 @@
 	  advised to use either HMAC-MD5 or HMAC-SHA1.
 
 endchoice
-endmenu
net/unix/Kconfig new file +22 -0
diff -Nru a/net/unix/Kconfig b/net/unix/Kconfig
@@ -0,0 +1,22 @@
+#
+# Configuration for Unix domain sockets
+#
+
+config UNIX
+	tristate "Unix domain sockets"
+	---help---
+	  If you say Y here, you will include support for Unix domain sockets;
+	  sockets are the standard Unix mechanism for establishing and
+	  accessing network connections.  Many commonly used programs such as
+	  the X Window system and syslog use these sockets even if your
+	  machine is not connected to any network.  Unless you are working on
+	  an embedded system or something similar, you therefore definitely
+	  want to say Y here.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called unix.  Note that several important services won't work
+	  correctly if you say M here and then neglect to load the module.
+
+	  Say Y unless you know what you are doing.
+
+
net/wanrouter/Kconfig new file +31 -0
diff -Nru a/net/wanrouter/Kconfig b/net/wanrouter/Kconfig
@@ -0,0 +1,31 @@
+#
+# Configuration for WAN Router
+#
+
+config WAN_ROUTER
+	tristate "WAN router"
+	depends on EXPERIMENTAL
+	---help---
+	  Wide Area Networks (WANs), such as X.25, frame relay and leased
+	  lines, are used to interconnect Local Area Networks (LANs) over vast
+	  distances with data transfer rates significantly higher than those
+	  achievable with commonly used asynchronous modem connections.
+	  Usually, a quite expensive external device called a `WAN router' is
+	  needed to connect to a WAN.
+
+	  As an alternative, WAN routing can be built into the Linux kernel.
+	  With relatively inexpensive WAN interface cards available on the
+	  market, a perfectly usable router can be built for less than half
+	  the price of an external router.  If you have one of those cards and
+	  wish to use your Linux box as a WAN router, say Y here and also to
+	  the WAN driver for your card, below.  You will then need the
+	  wan-tools package which is available from <ftp://ftp.sangoma.com/>.
+	  Read <file:Documentation/networking/wan-router.txt> for more
+	  information.
+
+	  To compile WAN routing support as a module, choose M here: the
+	  module will be called wanrouter.
+
+	  If unsure, say N.
+
+
net/x25/Kconfig new file +35 -0
diff -Nru a/net/x25/Kconfig b/net/x25/Kconfig
@@ -0,0 +1,35 @@
+#
+# X25 Configuration
+#
+
+config X25
+	tristate "CCITT X.25 Packet Layer (EXPERIMENTAL)"
+	depends on NET && EXPERIMENTAL
+	---help---
+	  X.25 is a set of standardized network protocols, similar in scope to
+	  frame relay; the one physical line from your box to the X.25 network
+	  entry point can carry several logical point-to-point connections
+	  (called "virtual circuits") to other computers connected to the X.25
+	  network. Governments, banks, and other organizations tend to use it
+	  to connect to each other or to form Wide Area Networks (WANs). Many
+	  countries have public X.25 networks. X.25 consists of two
+	  protocols: the higher level Packet Layer Protocol (PLP) (say Y here
+	  if you want that) and the lower level data link layer protocol LAPB
+	  (say Y to "LAPB Data Link Driver" below if you want that).
+
+	  You can read more about X.25 at <http://www.sangoma.com/x25.htm> and
+	  <http://www.cisco.com/univercd/cc/td/doc/product/software/ios11/cbook/cx25.htm>.
+	  Information about X.25 for Linux is contained in the files
+	  <file:Documentation/networking/x25.txt> and
+	  <file:Documentation/networking/x25-iface.txt>.
+
+	  One connects to an X.25 network either with a dedicated network card
+	  using the X.21 protocol (not yet supported by Linux) or one can do
+	  X.25 over a standard telephone line using an ordinary modem (say Y
+	  to "X.25 async driver" below) or over Ethernet using an ordinary
+	  Ethernet card and the LAPB over Ethernet (say Y to "LAPB Data Link
+	  Driver" and "LAPB over Ethernet driver" below).
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called x25. If unsure, say N.
+
net/xfrm/Kconfig +14 -0
diff -Nru a/net/xfrm/Kconfig b/net/xfrm/Kconfig
@@ -1,6 +1,10 @@
 #
 # XFRM configuration
 #
+
+config XFRM
+       bool
+
 config XFRM_USER
 	tristate "IPsec user configuration interface"
 	depends on INET && XFRM
@@ -9,4 +13,14 @@
 	  by native Linux tools.
 
 	  If unsure, say Y.
+
+config NET_KEY
+	tristate "PF_KEY sockets"
+	select XFRM
+	---help---
+	  PF_KEYv2 socket family, compatible to KAME ones.
+	  They are required if you are going to use IPsec tools ported
+	  from KAME.
+
+	  Say Y unless you know what you are doing.
 
#16 lore raw
In reply to Sam Ravnborg
Quoted 8 lines · Sam Ravnborg

Only bit that I am worried about is the statement in SCTP:

	depends on IPV6 || IPV6=n

That looked like a noop to me. It had the sideeffect that SCTP menu entries where idented an extra level which was not desireable with currect layout.

No. This is not a noop. This is required to restrict SCTP configured as static when IPV6 is configured as module.

Thanks
Sridhar

#17 lore raw
Quoted 6 lines · Sridhar Samudrala
Quoted 4 lines · Sam Ravnborg

Only bit that I am worried about is the statement in SCTP:

	depends on IPV6 || IPV6=n
Quoted 7 lines
Quoted 4 lines

That looked like a noop to me. It had the sideeffect that SCTP menu entries where idented an extra level which was not desireable with currect layout.

No. This is not a noop. This is required to restrict SCTP configured as static when IPV6 is configured as module.

I see now - thanks.

Sam