From da4277357c8f11a4859f476b959165b04ab0dd65 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 30 May 2014 14:44:07 -0600
Subject: [PATCH] Move arp, icmp, and igmp configuration values into new
 Kconfig files in those directories

---
 net/Kconfig      | 57 +++---------------------------------------------
 net/arp/Kconfig  | 28 ++++++++++++++++++++++++
 net/icmp/Kconfig | 29 ++++++++++++++++++++++++
 net/igmp/Kconfig | 22 +++++++++++++++++++
 4 files changed, 82 insertions(+), 54 deletions(-)
 create mode 100644 net/arp/Kconfig
 create mode 100644 net/icmp/Kconfig
 create mode 100644 net/igmp/Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index d1ba21d3154..3a9e842fe4c 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -328,48 +328,8 @@ config NET_RXAVAIL
 endif # NET_UDP
 endmenu
 
-config NET_ICMP
-	bool "ICMP networking support"
-	default n
-	depends on NET
-	---help---
-		Enable minimal ICMP support. Includes built-in support
-		for sending replies to received ECHO (ping) requests.
-
-if NET_ICMP
-
-config NET_ICMP_PING
-	bool "ICMP ping interfaces"
-	default n
-	---help---
-		Provide interfaces to support application level support for
-		for sending ECHO (ping) requests and associating ECHO replies.
-
-config NET_PINGADDRCONF
-	bool "Ping address configuration"
-	default n
-	---help---
-		Use "ping" packet for setting IP address
-
-endif # NET_ICMP
-
-config NET_IGMP
-	bool "IGMPv2 clientsupport"
-	default n
-	depends on NET
-	---help---
-		Enable IGMPv2 client support.
-
-if NET_IGMP
-
-config PREALLOC_IGMPGROUPS
-	int "Number of pre-allocated IGMP groups"
-	default 4
-	---help---
-		Pre-allocated IGMP groups are used only if needed from interrupt
-		level group created (by the IGMP server). Default: 4.
-
-endif # NET_IGMP
+source "net/icmp/Kconfig"
+source "net/igmp/Kconfig"
 
 config NET_STATISTICS
 	bool "Collect network statistics"
@@ -388,18 +348,7 @@ config NET_RECEIVE_WINDOW
 		incoming data, or high (32768 bytes) if the application processes
 		data quickly.
 
-config NET_ARPTAB_SIZE
-	int "ARP table size"
-	default 16
-	---help---
-		The size of the ARP table (in entries).
-
-config NET_ARP_IPIN
-	bool "ARP address harvesting"
-	default n
-	---help---
-		Harvest IP/MAC address mappings from the ARP table
-		from incoming IP packets.
+source "net/arp/Kconfig"
 
 config NET_ROUTE
 	bool "Routing table suport"
diff --git a/net/arp/Kconfig b/net/arp/Kconfig
new file mode 100644
index 00000000000..6b5464775df
--- /dev/null
+++ b/net/arp/Kconfig
@@ -0,0 +1,28 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config NET_ARP
+	bool
+	default y if !NET_SLIP
+	default n if NET_SLIP
+	---help---
+		This setting is currently overridden by logic in include/nuttx/net
+
+if NET_ARP
+
+config NET_ARPTAB_SIZE
+	int "ARP table size"
+	default 16
+	---help---
+		The size of the ARP table (in entries).
+
+config NET_ARP_IPIN
+	bool "ARP address harvesting"
+	default n
+	---help---
+		Harvest IP/MAC address mappings from the ARP table
+		from incoming IP packets.
+
+endif # NET_ARP
diff --git a/net/icmp/Kconfig b/net/icmp/Kconfig
new file mode 100644
index 00000000000..6e7a2d32562
--- /dev/null
+++ b/net/icmp/Kconfig
@@ -0,0 +1,29 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config NET_ICMP
+	bool "ICMP networking support"
+	default n
+	depends on NET
+	---help---
+		Enable minimal ICMP support. Includes built-in support
+		for sending replies to received ECHO (ping) requests.
+
+if NET_ICMP
+
+config NET_ICMP_PING
+	bool "ICMP ping interfaces"
+	default n
+	---help---
+		Provide interfaces to support application level support for
+		for sending ECHO (ping) requests and associating ECHO replies.
+
+config NET_PINGADDRCONF
+	bool "Ping address configuration"
+	default n
+	---help---
+		Use "ping" packet for setting IP address
+
+endif # NET_ICMP
diff --git a/net/igmp/Kconfig b/net/igmp/Kconfig
new file mode 100644
index 00000000000..618f50f89b0
--- /dev/null
+++ b/net/igmp/Kconfig
@@ -0,0 +1,22 @@
+#
+# For a description of the syntax of this configuration file,
+# see misc/tools/kconfig-language.txt.
+#
+
+config NET_IGMP
+	bool "IGMPv2 clientsupport"
+	default n
+	depends on NET
+	---help---
+		Enable IGMPv2 client support.
+
+if NET_IGMP
+
+config PREALLOC_IGMPGROUPS
+	int "Number of pre-allocated IGMP groups"
+	default 4
+	---help---
+		Pre-allocated IGMP groups are used only if needed from interrupt
+		level group created (by the IGMP server). Default: 4.
+
+endif # NET_IGMP