aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch
diff options
context:
space:
mode:
authorJames <>2013-03-17 12:16:37 +0000
committerJames <>2013-03-17 12:16:37 +0000
commit27b76ab0671089c47506615a796a261e993896a7 (patch)
tree61213d67e7fa87b20356b23798558e2c4212c42f /package/network/utils/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch
downloadtrunk-36060-master.tar.gz
trunk-36060-master.tar.bz2
trunk-36060-master.zip
Diffstat (limited to 'package/network/utils/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch')
-rw-r--r--package/network/utils/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/package/network/utils/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch b/package/network/utils/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch
new file mode 100644
index 0000000..b8e08b3
--- /dev/null
+++ b/package/network/utils/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch
@@ -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]);
+