aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-11-03 16:13:33 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-11-03 16:13:33 +0000
commita2d17ea8cf06f36d67c0d8850e580ce21a6bb837 (patch)
tree15c9d10a1c3c5b8cc071618dcf5210a9beaeff37 /target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch
parent55081c6a197789823d03f6c16a47312407c611da (diff)
downloadupstream-a2d17ea8cf06f36d67c0d8850e580ce21a6bb837.tar.gz
upstream-a2d17ea8cf06f36d67c0d8850e580ce21a6bb837.tar.bz2
upstream-a2d17ea8cf06f36d67c0d8850e580ce21a6bb837.zip
target/linux: add preliminary 2.6.37 kernel support
SVN-Revision: 23828
Diffstat (limited to 'target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch')
-rw-r--r--target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch b/target/linux/generic/patches-2.6.37/102-netfilter_layer7_match.patch
new file mode 100644
index 0000000000..15fc5fadd2
--- /dev/null
+++ b/target/linux/generic/patches-2.6.37/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 "