bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xtables-addons: fix RTSP conntrack compatibility with Linux 3.6

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@34391 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow
2012-11-27 18:31:44 +00:00
parent fb183b1175
commit 0ee506d356
8 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
net/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch Normal file
View File

@ -0,0 +1,22 @@
--- a/extensions/rtsp/nf_conntrack_rtsp.c
+++ b/extensions/rtsp/nf_conntrack_rtsp.c
@@ -28,6 +28,7 @@
* - Port to new NF API
*/
+#include <linux/version.h>
#include <linux/module.h>
#include <linux/netfilter.h>
#include <linux/ip.h>
@@ -496,7 +497,11 @@ init(void)
} else {
sprintf(tmpname, "rtsp-%d", i);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
+ strncpy(hlpr->name, tmpname, sizeof(hlpr->name));
+#else
hlpr->name = tmpname;
+#endif
pr_debug("port #%d: %d\n", i, ports[i]);