summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-02 19:49:28 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-06-02 19:49:28 +0000
commite1ee35b052206f8880a3cc843d17a22f68fb5ff2 (patch)
treee877487b5efa53027cc6e8017713fa14f02c6b29 /target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
parent77ac43966f73d8a58ffd9c368ea1b27f35fd5c18 (diff)
[kernel] refresh generic 2.6.26 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11336 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
index ead8cb2be..c87218932 100644
--- a/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/190-netfilter_rtsp.patch
@@ -304,7 +304,7 @@
obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -258,6 +258,16 @@
+@@ -270,6 +270,16 @@
To compile it as a module, choose M here. If unsure, say N.
@@ -323,7 +323,7 @@
depends on NF_CONNTRACK
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
@@ -333,7 +333,7 @@
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -277,6 +277,11 @@
+@@ -304,6 +304,11 @@
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
default NF_NAT && NF_CONNTRACK_IRC