aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.4
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2007-09-22 18:37:24 +0000
committerNicolas Thill <nico@openwrt.org>2007-09-22 18:37:24 +0000
commitfec4d9ee3c383cc0deaeeeaabcf5f8ebc40600ba (patch)
tree85d7feae1a5950c0174285ecdb29c7a845f0d740 /target/linux/generic-2.4
parent1e758b6e0551a3ba099215fdd801e9c92b5de72b (diff)
downloadupstream-fec4d9ee3c383cc0deaeeeaabcf5f8ebc40600ba.tar.gz
upstream-fec4d9ee3c383cc0deaeeeaabcf5f8ebc40600ba.tar.bz2
upstream-fec4d9ee3c383cc0deaeeeaabcf5f8ebc40600ba.zip
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.
SVN-Revision: 8955
Diffstat (limited to 'target/linux/generic-2.4')
-rw-r--r--target/linux/generic-2.4/config-default4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.4/config-default b/target/linux/generic-2.4/config-default
index 02bb0f2e2a..6ae4185908 100644
--- a/target/linux/generic-2.4/config-default
+++ b/target/linux/generic-2.4/config-default
@@ -238,7 +238,7 @@ CONFIG_IP_NF_MATCH_LAYER7=m
CONFIG_IP_NF_MATCH_LENGTH=m
CONFIG_IP_NF_MATCH_LIMIT=y
CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_MARK=y
+CONFIG_IP_NF_MATCH_MARK=m
CONFIG_IP_NF_MATCH_MULTIPORT=y
CONFIG_IP_NF_MATCH_OWNER=m
CONFIG_IP_NF_MATCH_PKTTYPE=m
@@ -284,7 +284,7 @@ CONFIG_IP_NF_TARGET_ECN=m
CONFIG_IP_NF_TARGET_CLASSIFY=m
CONFIG_IP_NF_TARGET_IMQ=m
CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_MARK=y
+CONFIG_IP_NF_TARGET_MARK=m
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_MIRROR=m
CONFIG_IP_NF_TARGET_NETMAP=m