diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-06-09 17:56:42 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-06-09 17:56:42 +0000 |
| commit | 8c6a9eccb772112dee7bd3e4612dfe7afa24aded (patch) | |
| tree | 1d3330e92d3cf9e33e8959658f9ad6c735449652 | |
| parent | c9f459572e401218e825166fcc304b8b4f0ed554 (diff) | |
| download | upstream-8c6a9eccb772112dee7bd3e4612dfe7afa24aded.tar.gz upstream-8c6a9eccb772112dee7bd3e4612dfe7afa24aded.tar.bz2 upstream-8c6a9eccb772112dee7bd3e4612dfe7afa24aded.zip | |
generic: update xt_layer7 module fix for 2.6.35
SVN-Revision: 21741
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch b/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch index a6b71ceecf..15fc5fadd2 100644 --- a/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch +++ b/target/linux/generic-2.6/patches-2.6.35/102-netfilter_layer7_match.patch @@ -1,11 +1,25 @@ --- a/net/netfilter/xt_layer7.c +++ b/net/netfilter/xt_layer7.c -@@ -416,7 +416,7 @@ static int layer7_write_proc(struct file +@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file + } static bool - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) --match(const struct sk_buff *skbin, const struct xt_match_param *par) +-#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, - const struct net_device *in, +@@ -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 " |