summaryrefslogtreecommitdiffstats
path: root/package/network/utils/ipset
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-20 21:59:24 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-20 21:59:24 +0000
commit06211d702c555dcfdad210497c96ee71a6b31c2f (patch)
tree9292881f1a034c903f9a74125678c4fea5a192e3 /package/network/utils/ipset
parent59a6cdd1800a305d7f1526de57fe3a1814a2fff2 (diff)
kernel: add some fixes for kernel 3.9
This patch fixes some compile problems with kernel 3.9 and adds some missing linux 3.9 handling into kernel packages. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36098 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/utils/ipset')
-rw-r--r--package/network/utils/ipset/patches/001-fix-kernel-3.9.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/package/network/utils/ipset/patches/001-fix-kernel-3.9.patch b/package/network/utils/ipset/patches/001-fix-kernel-3.9.patch
new file mode 100644
index 000000000..d57ab0287
--- /dev/null
+++ b/package/network/utils/ipset/patches/001-fix-kernel-3.9.patch
@@ -0,0 +1,16 @@
+--- a/kernel/net/netfilter/ipset/ip_set_core.c
++++ b/kernel/net/netfilter/ipset/ip_set_core.c
+@@ -27,6 +27,13 @@
+ #include <linux/netfilter/nfnetlink.h>
+ #include <linux/netfilter/ipset/ip_set.h>
+
++#ifndef IPSET_IN_KERNEL_TREE
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
++#define nfnl_unlock() nfnl_unlock(NFNL_SUBSYS_IPSET)
++#define nfnl_lock() nfnl_lock(NFNL_SUBSYS_IPSET)
++#endif
++#endif
++
+ static LIST_HEAD(ip_set_type_list); /* all registered set types */
+ static DEFINE_MUTEX(ip_set_type_mutex); /* protects ip_set_type_list */
+ static DEFINE_RWLOCK(ip_set_ref_lock); /* protects the set refs */