From 937629f197a55bb01b1bcf74e52c5cf38bd3f65d Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Sep 2007 18:37:24 +0000
Subject: add missing 2.6 conntrack/nat helpers, add 2.6 conntrack/nat helper
 for RTSP (closes: #2297, thanks to aorlinsk), sync 2.4 / 2.6 kconfigs.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8955 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/generic-2.6/config-2.6.22 | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'target/linux/generic-2.6/config-2.6.22')

diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22
index 2c8e41e37..d9fd908e6 100644
--- a/target/linux/generic-2.6/config-2.6.22
+++ b/target/linux/generic-2.6/config-2.6.22
@@ -534,7 +534,6 @@ CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_CONNTRACK=y
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
 CONFIG_IP_NF_CONNTRACK_MARK=y
-# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
 CONFIG_IP_NF_CT_ACCT=y
 CONFIG_IP_NF_CT_PROTO_SCTP=m
 CONFIG_IP_NF_FILTER=y
@@ -588,12 +587,11 @@ CONFIG_IP_NF_TARGET_IMQ=m
 CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=y
+CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IP_NF_TARGET_ROUTE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_SET=m
-CONFIG_IP_NF_TARGET_TCPMSS=y
 CONFIG_IP_NF_TARGET_TOS=m
 CONFIG_IP_NF_TARGET_TTL=m
 CONFIG_IP_NF_TARGET_ULOG=m
@@ -715,7 +713,7 @@ CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
@@ -736,7 +734,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=y
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_CHAOS=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -826,7 +824,7 @@ CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
 CONFIG_NF_CONNTRACK=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
+CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_ENABLED=y
 # CONFIG_NF_CONNTRACK_EVENTS is not set
 CONFIG_NF_CONNTRACK_FTP=m
@@ -836,24 +834,25 @@ CONFIG_NF_CONNTRACK_IPV4=y
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_MARK=y
 # CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_PPTP is not set
+CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_NF_CONNTRACK_RTSP=m
 # CONFIG_NF_CONNTRACK_SANE is not set
 CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_SUPPORT=y
-# CONFIG_NF_CONNTRACK_TFTP is not set
+CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_ACCT=y
 # CONFIG_NF_CT_PROTO_SCTP is not set
 CONFIG_NF_NAT=y
-# CONFIG_NF_NAT_AMANDA is not set
+CONFIG_NF_NAT_AMANDA=m
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_H323=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_RTSP=m
 CONFIG_NF_NAT_SIP=m
-# CONFIG_NF_NAT_SNMP_BASIC is not set
-# CONFIG_NF_NAT_TFTP is not set
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_TFTP=m
 CONFIG_NLS=m
 # CONFIG_NLS_ASCII is not set
 CONFIG_NLS_CODEPAGE_1250=m
-- 
cgit v1.2.3