aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-02-21 16:32:20 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-02-21 16:32:20 +0000
commitab0b42246afde276a99fad5dfeab92de77c19950 (patch)
treec4e42a532e9905ff14ade0b378283e9d1079fdcc /target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
parent68d73be80c2ce125eaee57c047443e5c88991ed7 (diff)
downloadupstream-ab0b42246afde276a99fad5dfeab92de77c19950.tar.gz
upstream-ab0b42246afde276a99fad5dfeab92de77c19950.tar.bz2
upstream-ab0b42246afde276a99fad5dfeab92de77c19950.zip
remove the netfilter time patch from 2.6.28 as it duplicates functionality that is already in the kernel
SVN-Revision: 14597
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch b/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
index ef9c569640..62d4cf2e95 100644
--- a/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/190-netfilter_rtsp.patch
@@ -333,7 +333,7 @@
obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -283,6 +283,11 @@ config NF_NAT_IRC
+@@ -268,6 +268,11 @@ config NF_NAT_IRC
depends on NF_CONNTRACK && NF_NAT
default NF_NAT && NF_CONNTRACK_IRC