summaryrefslogtreecommitdiffstats
path: root/package/network/utils/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-17 12:29:26 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-17 12:29:26 +0000
commita6dcd45cef58f0fc52f903776d59b7c21000ef1e (patch)
tree4d81bdbc60cf0d69b782d3916a9ec059457be31c /package/network/utils/xtables-addons/patches/101-rtsp-linux-3.6-compat.patch
parentc461209c05b9e52ffde69ac4c3169385606f32f1 (diff)
xtables-addons: move to package/, add myself as maintainer
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35193 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 000000000..b8e08b3a3
--- /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]);
+