diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-02-21 16:32:50 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-02-21 16:32:50 +0000 |
commit | 2ebed2b570aada1c320f2f912efe60c19f2ad130 (patch) | |
tree | 430fc25b1682159f99b74e6e8a68caa7ee549b9c /target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch | |
parent | b665885f4ddbd40a7610344b9f0251eb2595c928 (diff) |
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/130-netfilter_ipset.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch b/target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch index 8c785620b..3ea2a6dd0 100644 --- a/target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch +++ b/target/linux/generic-2.6/patches-2.6.27/130-netfilter_ipset.patch @@ -7534,7 +7534,7 @@ +module_exit(ipt_SET_fini); --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig -@@ -412,5 +412,122 @@ config IP_NF_ARP_MANGLE +@@ -406,5 +406,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 - -@@ -63,6 +64,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i + # targets + obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o +@@ -61,6 +62,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 |