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

[openwrt/svn-archive/archive.git] / target / linux / generic / config-2.6.34

diff --git a/target/linux/generic/config-2.6.34 b/target/linux/generic/config-2.6.34
index 0aa8723e901ba8d6ab686c4dbf7caa78a4ea4ce5..3b58a1a1848082ec862259112875fd5de22dd494 100644 (file)
--- 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_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
 # 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_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_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_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
 # 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_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
 # 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_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
 # 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_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
 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_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
 # 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_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_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_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
 # 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_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
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_PROTO_GRE is not set
 # CONFIG_NF_NAT_RTSP is not set