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/130-netfilter_ipset.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/130-netfilter_ipset.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch index 0937714134..a2a902c16c 100644 --- a/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch +++ b/target/linux/generic-2.6/patches-2.6.26/130-netfilter_ipset.patch @@ -7534,7 +7534,7 @@ +module_exit(ipt_SET_fini); --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig -@@ -401,5 +401,122 @@ config IP_NF_ARP_MANGLE +@@ -395,5 +395,122 @@ config IP_NF_ARP_MANGLE Allows altering the ARP packet payload: source and destination hardware and network addresses. @@ -7665,9 +7665,9 @@ obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o +obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o - obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o - -@@ -62,6 +63,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i + # targets + obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o +@@ -60,6 +61,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o |