generic: move iptables/netfilter kernel options from generic/config to package/kernel/modules/netfilter.mk

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22867 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 60 insertions, 57 deletions

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 84f746f9c..e2361af6a 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -13,7 +13,10 @@ include $(INCLUDE_DIR)/netfilter.mk
 define KernelPackage/ipt-core
   SUBMENU:=$(NF_MENU)
   TITLE:=Netfilter core
-  KCONFIG:=$(KCONFIG_IPT_CORE)
+  KCONFIG:= \
+  	CONFIG_NETFILTER=y \
+	CONFIG_NETFILTER_ADVANCED=y \
+	$(KCONFIG_IPT_CORE)
   FILES:=$(foreach mod,$(IPT_CORE-m),$(LINUX_DIR)/net/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CORE-m)))
 endef
diff --git a/target/linux/generic/config-2.6.33 b/target/linux/generic/config-2.6.33
index 7145be790..15832bbdc 100644
--- a/target/linux/generic/config-2.6.33
+++ b/target/linux/generic/config-2.6.33
@@ -994,9 +994,9 @@ CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_ARP_MANGLE is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
+# CONFIG_IP_NF_CONNTRACK_MARK  is not set
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_CT_ACCT is not set
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
 # CONFIG_IP_NF_FILTER is not set
 # CONFIG_IP_NF_FTP is not set
@@ -1019,18 +1019,18 @@ CONFIG_IP_NF_CT_ACCT=y
 # CONFIG_IP_NF_NAT_FTP is not set
 # CONFIG_IP_NF_NAT_H323 is not set
 # CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
+# CONFIG_IP_NF_NAT_NEEDED is not set
 # CONFIG_IP_NF_NAT_PPTP is not set
 # CONFIG_IP_NF_NAT_SIP is not set
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 # CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
+# CONFIG_IP_NF_NAT is not set
 # CONFIG_IP_NF_NETBIOS_NS is not set
 # CONFIG_IP_NF_PPTP is not set
 # CONFIG_IP_NF_QUEUE is not set
 # CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
+# CONFIG_IP_NF_SET_HASHSIZE is not set
 # CONFIG_IP_NF_SET_IPHASH is not set
 # CONFIG_IP_NF_SET_IPMAP is not set
 # CONFIG_IP_NF_SET_IPPORTHASH is not set
@@ -1038,7 +1038,7 @@ CONFIG_IP_NF_SET_HASHSIZE=1024
 # CONFIG_IP_NF_SET_IPTREEMAP is not set
 # CONFIG_IP_NF_SET is not set
 # CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
+# CONFIG_IP_NF_SET_MAX is not set
 # CONFIG_IP_NF_SET_NETHASH is not set
 # CONFIG_IP_NF_SET_PORTMAP is not set
 # CONFIG_IP_NF_SIP is not set
@@ -1438,7 +1438,7 @@ CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_ESTIMATOR=y
 CONFIG_NET_ETHERNET=y
 # CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
+# CONFIG_NETFILTER_ADVANCED is not set
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NETFILTER_NETLINK_LOG is not set
@@ -1498,7 +1498,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
 # CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
+# CONFIG_NETFILTER is not set
 CONFIG_NET_IPGRE_BROADCAST=y
 # CONFIG_NET_IPGRE is not set
 # CONFIG_NET_IPIP is not set
@@ -1547,7 +1547,7 @@ CONFIG_NET=y
 # CONFIG_NEW_GPIO is not set
 CONFIG_NEW_LEDS=y
 # CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
+# CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CONNTRACK_FTP is not set
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -1555,14 +1555,14 @@ CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_IPV6 is not set
 # CONFIG_NF_CONNTRACK_IRC is not set
 # CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 # CONFIG_NF_CONNTRACK_RTSP is not set
 # CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_NF_CONNTRACK_SUPPORT is not set
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
@@ -1576,7 +1576,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_NAT_H323 is not set
 # CONFIG_NF_NAT_IRC is not set
 # CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_NEEDED is not set
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_PROTO_GRE is not set
 # CONFIG_NF_NAT_RTSP is not set
diff --git a/target/linux/generic/config-2.6.34 b/target/linux/generic/config-2.6.34
index 0aa8723e9..3b58a1a18 100644
--- a/target/linux/generic/config-2.6.34
+++ b/target/linux/generic/config-2.6.34
@@ -1016,9 +1016,9 @@ CONFIG_IP_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_ARP_MANGLE is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_CT_ACCT is not set
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
 # CONFIG_IP_NF_FILTER is not set
 # CONFIG_IP_NF_FTP is not set
@@ -1041,18 +1041,18 @@ CONFIG_IP_NF_CT_ACCT=y
 # CONFIG_IP_NF_NAT_FTP is not set
 # CONFIG_IP_NF_NAT_H323 is not set
 # CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
+# CONFIG_IP_NF_NAT_NEEDED is not set
 # CONFIG_IP_NF_NAT_PPTP is not set
 # CONFIG_IP_NF_NAT_SIP is not set
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 # CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
+# CONFIG_IP_NF_NAT is not set
 # CONFIG_IP_NF_NETBIOS_NS is not set
 # CONFIG_IP_NF_PPTP is not set
 # CONFIG_IP_NF_QUEUE is not set
 # CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
+# CONFIG_IP_NF_SET_HASHSIZE is not set
 # CONFIG_IP_NF_SET_IPHASH is not set
 # CONFIG_IP_NF_SET_IPMAP is not set
 # CONFIG_IP_NF_SET_IPPORTHASH is not set
@@ -1060,7 +1060,7 @@ CONFIG_IP_NF_SET_HASHSIZE=1024
 # CONFIG_IP_NF_SET_IPTREEMAP is not set
 # CONFIG_IP_NF_SET is not set
 # CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
+# CONFIG_IP_NF_SET_MAX is not set
 # CONFIG_IP_NF_SET_NETHASH is not set
 # CONFIG_IP_NF_SET_PORTMAP is not set
 # CONFIG_IP_NF_SIP is not set
@@ -1472,7 +1472,7 @@ CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_ESTIMATOR=y
 CONFIG_NET_ETHERNET=y
 # CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
+# CONFIG_NETFILTER_ADVANCED is not set
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NETFILTER_NETLINK_LOG is not set
@@ -1532,7 +1532,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
 # CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
+# CONFIG_NETFILTER is not set
 CONFIG_NET_IPGRE_BROADCAST=y
 # CONFIG_NET_IPGRE is not set
 # CONFIG_NET_IPIP is not set
@@ -1581,7 +1581,7 @@ CONFIG_NET=y
 # CONFIG_NEW_GPIO is not set
 CONFIG_NEW_LEDS=y
 # CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
+# CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CONNTRACK_FTP is not set
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -1589,14 +1589,14 @@ CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_IPV6 is not set
 # CONFIG_NF_CONNTRACK_IRC is not set
 # CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 # CONFIG_NF_CONNTRACK_RTSP is not set
 # CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_NF_CONNTRACK_SUPPORT is not set
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
@@ -1610,7 +1610,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_NAT_H323 is not set
 # CONFIG_NF_NAT_IRC is not set
 # CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_NEEDED is not set
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_PROTO_GRE is not set
 # CONFIG_NF_NAT_RTSP is not set
diff --git a/target/linux/generic/config-2.6.35 b/target/linux/generic/config-2.6.35
index 52e95d1a0..6b02f4369 100644
--- a/target/linux/generic/config-2.6.35
+++ b/target/linux/generic/config-2.6.35
@@ -1046,9 +1046,9 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_ARP_MANGLE is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_CT_ACCT is not set
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
 # CONFIG_IP_NF_FILTER is not set
 # CONFIG_IP_NF_FTP is not set
@@ -1071,18 +1071,18 @@ CONFIG_IP_NF_CT_ACCT=y
 # CONFIG_IP_NF_NAT_FTP is not set
 # CONFIG_IP_NF_NAT_H323 is not set
 # CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
+# CONFIG_IP_NF_NAT_NEEDED is not set
 # CONFIG_IP_NF_NAT_PPTP is not set
 # CONFIG_IP_NF_NAT_SIP is not set
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 # CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
+# CONFIG_IP_NF_NAT is not set
 # CONFIG_IP_NF_NETBIOS_NS is not set
 # CONFIG_IP_NF_PPTP is not set
 # CONFIG_IP_NF_QUEUE is not set
 # CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
+# CONFIG_IP_NF_SET_HASHSIZE is not set
 # CONFIG_IP_NF_SET_IPHASH is not set
 # CONFIG_IP_NF_SET_IPMAP is not set
 # CONFIG_IP_NF_SET_IPPORTHASH is not set
@@ -1090,7 +1090,7 @@ CONFIG_IP_NF_SET_HASHSIZE=1024
 # CONFIG_IP_NF_SET_IPTREEMAP is not set
 # CONFIG_IP_NF_SET is not set
 # CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
+# CONFIG_IP_NF_SET_MAX is not set
 # CONFIG_IP_NF_SET_NETHASH is not set
 # CONFIG_IP_NF_SET_PORTMAP is not set
 # CONFIG_IP_NF_SIP is not set
@@ -1522,7 +1522,7 @@ CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_ESTIMATOR=y
 CONFIG_NET_ETHERNET=y
 # CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
+# CONFIG_NETFILTER_ADVANCED is not set
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NETFILTER_NETLINK_LOG is not set
@@ -1583,7 +1583,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
 # CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
+# CONFIG_NETFILTER is not set
 CONFIG_NET_IPGRE_BROADCAST=y
 # CONFIG_NET_IPGRE is not set
 # CONFIG_NET_IPIP is not set
@@ -1633,7 +1633,7 @@ CONFIG_NET=y
 # CONFIG_NEW_GPIO is not set
 CONFIG_NEW_LEDS=y
 # CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
+# CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CONNTRACK_FTP is not set
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -1641,14 +1641,14 @@ CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_IPV6 is not set
 # CONFIG_NF_CONNTRACK_IRC is not set
 # CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 # CONFIG_NF_CONNTRACK_RTSP is not set
 # CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_NF_CONNTRACK_SUPPORT is not set
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
@@ -1662,7 +1662,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_NAT_H323 is not set
 # CONFIG_NF_NAT_IRC is not set
 # CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_NEEDED is not set
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_PROTO_GRE is not set
 # CONFIG_NF_NAT_RTSP is not set
diff --git a/target/linux/generic/config-2.6.36 b/target/linux/generic/config-2.6.36
index 73d78e455..199d70b5d 100644
--- a/target/linux/generic/config-2.6.36
+++ b/target/linux/generic/config-2.6.36
@@ -1046,9 +1046,9 @@ CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 # CONFIG_IP_NF_ARP_MANGLE is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CONNTRACK=y
-CONFIG_IP_NF_CT_ACCT=y
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_CT_ACCT is not set
 # CONFIG_IP_NF_CT_PROTO_SCTP is not set
 # CONFIG_IP_NF_FILTER is not set
 # CONFIG_IP_NF_FTP is not set
@@ -1071,18 +1071,18 @@ CONFIG_IP_NF_CT_ACCT=y
 # CONFIG_IP_NF_NAT_FTP is not set
 # CONFIG_IP_NF_NAT_H323 is not set
 # CONFIG_IP_NF_NAT_IRC is not set
-CONFIG_IP_NF_NAT_NEEDED=y
+# CONFIG_IP_NF_NAT_NEEDED is not set
 # CONFIG_IP_NF_NAT_PPTP is not set
 # CONFIG_IP_NF_NAT_SIP is not set
 # CONFIG_IP_NF_NAT_SNMP_BASIC is not set
 # CONFIG_IP_NF_NAT_TFTP is not set
-CONFIG_IP_NF_NAT=y
+# CONFIG_IP_NF_NAT is not set
 # CONFIG_IP_NF_NETBIOS_NS is not set
 # CONFIG_IP_NF_PPTP is not set
 # CONFIG_IP_NF_QUEUE is not set
 # CONFIG_IP_NF_RAW is not set
 # CONFIG_IP_NF_SECURITY is not set
-CONFIG_IP_NF_SET_HASHSIZE=1024
+# CONFIG_IP_NF_SET_HASHSIZE is not set
 # CONFIG_IP_NF_SET_IPHASH is not set
 # CONFIG_IP_NF_SET_IPMAP is not set
 # CONFIG_IP_NF_SET_IPPORTHASH is not set
@@ -1090,7 +1090,7 @@ CONFIG_IP_NF_SET_HASHSIZE=1024
 # CONFIG_IP_NF_SET_IPTREEMAP is not set
 # CONFIG_IP_NF_SET is not set
 # CONFIG_IP_NF_SET_MACIPMAP is not set
-CONFIG_IP_NF_SET_MAX=256
+# CONFIG_IP_NF_SET_MAX is not set
 # CONFIG_IP_NF_SET_NETHASH is not set
 # CONFIG_IP_NF_SET_PORTMAP is not set
 # CONFIG_IP_NF_SIP is not set
@@ -1522,7 +1522,7 @@ CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_ESTIMATOR=y
 CONFIG_NET_ETHERNET=y
 # CONFIG_NET_FC is not set
-CONFIG_NETFILTER_ADVANCED=y
+# CONFIG_NETFILTER_ADVANCED is not set
 # CONFIG_NETFILTER_DEBUG is not set
 # CONFIG_NETFILTER_NETLINK is not set
 # CONFIG_NETFILTER_NETLINK_LOG is not set
@@ -1586,7 +1586,7 @@ CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
 # CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
 # CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-CONFIG_NETFILTER=y
+# CONFIG_NETFILTER is not set
 CONFIG_NET_IPGRE_BROADCAST=y
 # CONFIG_NET_IPGRE is not set
 # CONFIG_NET_IPIP is not set
@@ -1636,7 +1636,7 @@ CONFIG_NET=y
 # CONFIG_NEW_GPIO is not set
 CONFIG_NEW_LEDS=y
 # CONFIG_NF_CONNTRACK_AMANDA is not set
-CONFIG_NF_CONNTRACK_ENABLED=y
+# CONFIG_NF_CONNTRACK_ENABLED is not set
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 # CONFIG_NF_CONNTRACK_FTP is not set
 # CONFIG_NF_CONNTRACK_H323 is not set
@@ -1644,14 +1644,14 @@ CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_IPV6 is not set
 # CONFIG_NF_CONNTRACK_IRC is not set
 # CONFIG_NF_CONNTRACK is not set
-CONFIG_NF_CONNTRACK_MARK=y
+# CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
 # CONFIG_NF_CONNTRACK_PPTP is not set
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
 # CONFIG_NF_CONNTRACK_RTSP is not set
 # CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
-CONFIG_NF_CONNTRACK_SUPPORT=y
+# CONFIG_NF_CONNTRACK_SUPPORT is not set
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
@@ -1665,7 +1665,7 @@ CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_NAT_H323 is not set
 # CONFIG_NF_NAT_IRC is not set
 # CONFIG_NF_NAT is not set
-CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_NEEDED is not set
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_PROTO_GRE is not set
 # CONFIG_NF_NAT_RTSP is not set