aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openwrt.org>2005-09-20 14:23:59 +0000
committerWaldemar Brodkorb <wbx@openwrt.org>2005-09-20 14:23:59 +0000
commitf3cb0d7fcbdc37e604fdf0cc72117129d2769533 (patch)
tree3550930acd0f4f336d922ea43c6cef17381c65d4
parent42f1f0c65edfaecbd0a6c13fc0525f19b4f918e9 (diff)
downloadupstream-f3cb0d7fcbdc37e604fdf0cc72117129d2769533.tar.gz
upstream-f3cb0d7fcbdc37e604fdf0cc72117129d2769533.tar.bz2
upstream-f3cb0d7fcbdc37e604fdf0cc72117129d2769533.zip
add ipset and nat-t config options
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1964 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/linux-2.6/config/brcm14
1 files changed, 13 insertions, 1 deletions
diff --git a/target/linux/linux-2.6/config/brcm b/target/linux/linux-2.6/config/brcm
index 2597b336d7..553a7eff56 100644
--- a/target/linux/linux-2.6/config/brcm
+++ b/target/linux/linux-2.6/config/brcm
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12.5
-# Fri Sep 16 22:34:43 2005
+# Tue Sep 20 16:18:50 2005
#
CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
@@ -396,6 +396,7 @@ CONFIG_INET=y
# CONFIG_INET_ESP is not set
# CONFIG_INET_IPCOMP is not set
# CONFIG_INET_TUNNEL is not set
+CONFIG_IPSEC_NAT_TRAVERSAL=y
# CONFIG_IP_TCPDIAG is not set
# CONFIG_IP_TCPDIAG_IPV6 is not set
@@ -477,6 +478,17 @@ CONFIG_IP_NF_TARGET_MARK=y
# CONFIG_IP_NF_TARGET_CLASSIFY is not set
# CONFIG_IP_NF_RAW is not set
# CONFIG_IP_NF_ARPTABLES is not set
+CONFIG_IP_NF_SET=m
+CONFIG_IP_NF_SET_MAX=256
+CONFIG_IP_NF_SET_HASHSIZE=1024
+CONFIG_IP_NF_SET_IPMAP=m
+CONFIG_IP_NF_SET_MACIPMAP=m
+CONFIG_IP_NF_SET_PORTMAP=m
+CONFIG_IP_NF_SET_IPHASH=m
+CONFIG_IP_NF_SET_NETHASH=m
+CONFIG_IP_NF_SET_IPTREE=m
+CONFIG_IP_NF_MATCH_SET=m
+CONFIG_IP_NF_TARGET_SET=m
#
# IPv6: Netfilter Configuration (EXPERIMENTAL)