aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-02-21 16:32:50 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-02-21 16:32:50 +0000
commit2fc5d9bb16e2c15a0c454533e26b019b48ec6d58 (patch)
tree430fc25b1682159f99b74e6e8a68caa7ee549b9c /target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
parent9be401e65ec93b1408212c75ba3835ddcade43e7 (diff)
downloadmaster-187ad058-2fc5d9bb16e2c15a0c454533e26b019b48ec6d58.tar.gz
master-187ad058-2fc5d9bb16e2c15a0c454533e26b019b48ec6d58.tar.bz2
master-187ad058-2fc5d9bb16e2c15a0c454533e26b019b48ec6d58.zip
merge netfilter changes to 2.6.27
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14598 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
index 54928d9054..d8c1e31d63 100644
--- a/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
@@ -774,7 +774,7 @@
+MODULE_LICENSE("GPL");
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
-@@ -145,6 +145,17 @@ config IP_NF_FILTER
+@@ -123,6 +123,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_IPP2P) += ipt_i
+@@ -56,6 +56,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