aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.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/150-netfilter_imq.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/150-netfilter_imq.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
index d1575e716c..d3e65f78b2 100644
--- a/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/150-netfilter_imq.patch
@@ -774,7 +774,7 @@
+MODULE_LICENSE("GPL");
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -127,6 +127,17 @@ config IP_NF_FILTER
+@@ -112,6 +112,17 @@ config IP_NF_FILTER
To compile it as a module, choose M here. If unsure, say N.
@@ -794,7 +794,7 @@
depends on IP_NF_FILTER
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
-@@ -59,6 +59,7 @@ obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_ti
+@@ -58,6 +58,7 @@ obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o