Clean up some networking configuration menus

6 files changed, 29 insertions, 18 deletions

diff --git a/nuttx/net/Kconfig b/nuttx/net/Kconfig
index f5a141922..05feed11f 100644
--- a/nuttx/net/Kconfig
+++ b/nuttx/net/Kconfig
@@ -102,6 +102,17 @@ config NET_BUFSIZE
 		IPv6 hosts are required to be able to handle an MSS of 1220 octets,
 		resulting in a minimum buffer size of of 1220+20+40+14 = 1294
 
+config NET_RECEIVE_WINDOW
+	int "Receive window size"
+	default 1220 if !NET_SLIP && NET_IPv6
+	default 536 if !NET_SLIP && !NET_IPv6
+	default 256 if NET_SLIP && !NET_IPv6
+	---help---
+		The size of the advertised receiver's window.   Should be set low
+		(i.e., to the size of the MSS) if the application is slow to process
+		incoming data, or high (32768 bytes) if the application processes
+		data quickly.
+
 config NET_GUARDSIZE
 	int "Driver I/O guard size"
 	default 2
@@ -118,6 +129,8 @@ source "net/tcp/Kconfig"
 source "net/udp/Kconfig"
 source "net/icmp/Kconfig"
 source "net/igmp/Kconfig"
+source "net/arp/Kconfig"
+source "net/iob/Kconfig"
 
 config NET_STATISTICS
 	bool "Collect network statistics"
@@ -125,20 +138,6 @@ config NET_STATISTICS
 	---help---
 		uIP statistics on or off
 
-config NET_RECEIVE_WINDOW
-	int "Receive window size"
-	default 1220 if !NET_SLIP && NET_IPv6
-	default 536 if !NET_SLIP && !NET_IPv6
-	default 256 if NET_SLIP && !NET_IPv6
-	---help---
-		The size of the advertised receiver's window.   Should be set low
-		(i.e., to the size of the MSS) if the application is slow to process
-		incoming data, or high (32768 bytes) if the application processes
-		data quickly.
-
-source "net/arp/Kconfig"
-source "net/iob/Kconfig"
-
 config NET_ROUTE
 	bool "Routing table suport"
 	default n
diff --git a/nuttx/net/arp/Kconfig b/nuttx/net/arp/Kconfig
index 6b5464775..9e9a5339f 100644
--- a/nuttx/net/arp/Kconfig
+++ b/nuttx/net/arp/Kconfig
@@ -3,6 +3,8 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+menu "ARP Configuration"
+
 config NET_ARP
 	bool
 	default y if !NET_SLIP
@@ -26,3 +28,4 @@ config NET_ARP_IPIN
 		from incoming IP packets.
 
 endif # NET_ARP
+endmenu # ARP Configuration
diff --git a/nuttx/net/icmp/Kconfig b/nuttx/net/icmp/Kconfig
index 6e7a2d325..254d5135e 100644
--- a/nuttx/net/icmp/Kconfig
+++ b/nuttx/net/icmp/Kconfig
@@ -3,8 +3,10 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+menu "ICMP Networking Support"
+
 config NET_ICMP
-	bool "ICMP networking support"
+	bool "Enable ICMP networking"
 	default n
 	depends on NET
 	---help---
@@ -27,3 +29,4 @@ config NET_PINGADDRCONF
 		Use "ping" packet for setting IP address
 
 endif # NET_ICMP
+endmenu # ICMP Networking Support
diff --git a/nuttx/net/igmp/Kconfig b/nuttx/net/igmp/Kconfig
index 618f50f89..2b24980b7 100644
--- a/nuttx/net/igmp/Kconfig
+++ b/nuttx/net/igmp/Kconfig
@@ -3,8 +3,10 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+menu "IGMPv2 Client Support"
+
 config NET_IGMP
-	bool "IGMPv2 clientsupport"
+	bool "IGMPv2 client support"
 	default n
 	depends on NET
 	---help---
@@ -20,3 +22,4 @@ config PREALLOC_IGMPGROUPS
 		level group created (by the IGMP server). Default: 4.
 
 endif # NET_IGMP
+endmenu # IGMPv2 Client Support
diff --git a/nuttx/net/iob/Kconfig b/nuttx/net/iob/Kconfig
index 5bb6e4c6b..4d817205c 100644
--- a/nuttx/net/iob/Kconfig
+++ b/nuttx/net/iob/Kconfig
@@ -3,8 +3,10 @@
 # see misc/tools/kconfig-language.txt.
 #
 
+menu "Network I/O Buffer Support"
+
 config NET_IOB
-	bool "Network I/O buffer support"
+	bool "Enable generic network I/O buffer support"
 	default n
 	---help---
 		This setting will build the networking I/O buffer (IOB) support
@@ -70,3 +72,4 @@ config IOB_DEBUG
 		network-related debug output.
 
 endif # NET_IOB
+endmenu # Network I/O buffer support
diff --git a/nuttx/net/pkt/Kconfig b/nuttx/net/pkt/Kconfig
index a0299ad17..c20273a45 100644
--- a/nuttx/net/pkt/Kconfig
+++ b/nuttx/net/pkt/Kconfig
@@ -24,4 +24,4 @@ config NET_PKT_CONNS
 	default 1
 
 endif # NET_PKT
-endmenu # PRaw Socket Support
+endmenu # Raw Socket Support