diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2013-11-12 11:00:49 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-11-12 11:00:49 +0000 |
commit | 3a19342a087d753af49b97d80cf88c7ed04c15a9 (patch) | |
tree | ccc9a3c1fdd352000987defe4a41cb1b4f9c73af /package/network/utils/ipset/patches/001-fix-kernel-3.9.patch | |
parent | 253f71b224cb9e01735a7c1b948e916fd15d918d (diff) | |
download | master-187ad058-3a19342a087d753af49b97d80cf88c7ed04c15a9.tar.gz master-187ad058-3a19342a087d753af49b97d80cf88c7ed04c15a9.tar.bz2 master-187ad058-3a19342a087d753af49b97d80cf88c7ed04c15a9.zip |
Update ipset to version 6.20.1
Signed-off-by: Nikolay Martynov <mar.kolya@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38778 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/utils/ipset/patches/001-fix-kernel-3.9.patch')
-rw-r--r-- | package/network/utils/ipset/patches/001-fix-kernel-3.9.patch | 16 |
1 files changed, 0 insertions, 16 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 deleted file mode 100644 index d57ab0287e..0000000000 --- a/package/network/utils/ipset/patches/001-fix-kernel-3.9.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 */ |