summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-29 14:35:23 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-29 14:35:23 +0000
commite60c0328f00278865338525f5ad9abeb0785ca5f (patch)
treef0db464d80e07fbb18c9f99ac73f45aadf7e22a6 /target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch
parentb0edeb40eabb575ec6a24fefcfcb61d71e13d3d2 (diff)
linux/generic: add kernel 2.6.36 preliminary support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22832 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch b/target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch
new file mode 100644
index 000000000..15fc5fadd
--- /dev/null
+++ b/target/linux/generic/patches-2.6.36/102-netfilter_layer7_match.patch
@@ -0,0 +1,25 @@
+--- a/net/netfilter/xt_layer7.c
++++ b/net/netfilter/xt_layer7.c
+@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
+ }
+
+ static bool
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++match(const struct sk_buff *skbin, struct xt_action_param *par)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+ match(const struct sk_buff *skbin, const struct xt_match_param *par)
+ #else
+ match(const struct sk_buff *skbin,
+@@ -598,7 +600,11 @@ match(const struct sk_buff *skbin,
+
+ // load nf_conntrack_ipv4
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++static int check(const struct xt_mtchk_param *par)
++# else
+ static bool check(const struct xt_mtchk_param *par)
++# endif
+ {
+ if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
+ printk(KERN_WARNING "can't load conntrack support for "