diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-02-21 16:59:45 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-02-21 16:59:45 +0000 |
| commit | 82187eba6eeef2b644bb5e7bb3ad37af933da39a (patch) | |
| tree | 47c104bb281332230ccbf564c54bce9fb96c58f0 /target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch | |
| parent | 0e461e45dbd71b34ab409034b3c09520aeaea431 (diff) | |
| download | upstream-82187eba6eeef2b644bb5e7bb3ad37af933da39a.tar.gz upstream-82187eba6eeef2b644bb5e7bb3ad37af933da39a.tar.bz2 upstream-82187eba6eeef2b644bb5e7bb3ad37af933da39a.zip | |
merge netfilter kernel changes to 2.6.26 as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14600 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch index c85e811609..d18e0cb5d6 100644 --- a/target/linux/generic-2.6/patches-2.6.26/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.26/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 -@@ -58,6 +58,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i +@@ -55,6 +55,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 |