hak5/wifipineapple-openwrt
1
0
Fork 0
mirror of https://github.com/hak5/wifipineapple-openwrt.git synced 2025-10-29 16:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: add some fixes for kernel 3.9

Browse Source 
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
This commit is contained in:
Hauke Mehrtens
2013-03-20 21:59:24 +00:00
parent af64f497a3
commit 0efdcebf5d
7 changed files with 50 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package/network/utils/ipset/patches/001-fix-kernel-3.9.patch Normal file
View File

@@ -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 */

14
package/network/utils/xtables-addons/patches/003-fix-kernel-3.9.patch Normal file
View File

@@ -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 */

6
package/network/utils/xtables-addons/patches/102-rtsp-linux-3.7-compat.patch
View File

@@ -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

2
package/network/utils/xtables-addons/patches/201-fix-lua-packetscript.patch
View File

@@ -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