diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-03-20 21:59:24 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-03-20 21:59:24 +0000 |
| commit | c9544f4af05baf5b60127ad29872488315245fb8 (patch) | |
| tree | 7c5f960d67ce75a014debab8c6ab6286adffe748 /package/network/utils | |
| parent | 99638c528890863b8212a4c140d9ae3cde6ecb4f (diff) | |
| download | upstream-c9544f4af05baf5b60127ad29872488315245fb8.tar.gz upstream-c9544f4af05baf5b60127ad29872488315245fb8.tar.bz2 upstream-c9544f4af05baf5b60127ad29872488315245fb8.zip | |
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.
SVN-Revision: 36098
Diffstat (limited to 'package/network/utils')
4 files changed, 34 insertions, 4 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 0000000000..d57ab0287e --- /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 */ diff --git a/package/network/utils/xtables-addons/patches/003-fix-kernel-3.9.patch b/package/network/utils/xtables-addons/patches/003-fix-kernel-3.9.patch new file mode 100644 index 0000000000..e77e14d2e8 --- /dev/null +++ b/package/network/utils/xtables-addons/patches/003-fix-kernel-3.9.patch @@ -0,0 +1,14 @@ +--- a/extensions/compat_xtables.h ++++ b/extensions/compat_xtables.h +@@ -57,4 +57,11 @@ + + #define xt_request_find_match xtnu_request_find_match + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) ++static inline void proc_net_remove(struct net *net, const char *name) ++{ ++ remove_proc_entry(name, net->proc_net); ++} ++#endif ++ + #endif /* _XTABLES_COMPAT_H */ diff --git a/package/network/utils/xtables-addons/patches/102-rtsp-linux-3.7-compat.patch b/package/network/utils/xtables-addons/patches/102-rtsp-linux-3.7-compat.patch index 0fe7917cff..216d7cb784 100644 --- a/package/network/utils/xtables-addons/patches/102-rtsp-linux-3.7-compat.patch +++ b/package/network/utils/xtables-addons/patches/102-rtsp-linux-3.7-compat.patch @@ -72,7 +72,7 @@ { char* ptcp; uint tcplen; -@@ -256,7 +256,7 @@ rtsp_mangle_tran(enum ip_conntrack_info +@@ -256,7 +256,7 @@ rtsp_mangle_tran(enum ip_conntrack_info if (dstact == DSTACT_STRIP || (dstact == DSTACT_AUTO && !is_stun)) { diff = nextfieldoff-off; @@ -81,7 +81,7 @@ off, diff, NULL, 0)) { /* mangle failed, all we can do is bail */ -@@ -326,7 +326,7 @@ rtsp_mangle_tran(enum ip_conntrack_info +@@ -326,7 +326,7 @@ rtsp_mangle_tran(enum ip_conntrack_info * parameter 4 below is offset from start of tcp data. */ diff = origlen-rbuflen; @@ -90,7 +90,7 @@ origoff, origlen, rbuf, rbuflen)) { /* mangle failed, all we can do is bail */ -@@ -351,7 +351,7 @@ rtsp_mangle_tran(enum ip_conntrack_info +@@ -351,7 +351,7 @@ rtsp_mangle_tran(enum ip_conntrack_info } static uint diff --git a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch index 966d29dfab..06a4a1739a 100644 --- a/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch +++ b/package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch @@ -78,7 +78,7 @@ #define UCHAR_MAX 255 #define SHRT_MAX 32767 #define BUFSIZ 8192 -@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l; +@@ -637,6 +641,8 @@ union luai_Cast { double l_d; long l_l; */ #if defined(__KERNEL__) #undef LUA_USE_ULONGJMP |