[kernel] refresh 2.6.35 patches
[openwrt/svn-archive/archive.git] / target / linux / generic / patches-2.6.35 / 102-netfilter_layer7_match.patch
1 --- a/net/netfilter/xt_layer7.c
2 +++ b/net/netfilter/xt_layer7.c
3 @@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
4 }
5
6 static bool
7 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
8 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
9 +match(const struct sk_buff *skbin, struct xt_action_param *par)
10 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
11 match(const struct sk_buff *skbin, const struct xt_match_param *par)
12 #else
13 match(const struct sk_buff *skbin,
14 @@ -598,7 +600,11 @@ match(const struct sk_buff *skbin,
15
16 // load nf_conntrack_ipv4
17 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
18 +# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
19 +static int check(const struct xt_mtchk_param *par)
20 +# else
21 static bool check(const struct xt_mtchk_param *par)
22 +# endif
23 {
24 if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
25 printk(KERN_WARNING "can't load conntrack support for "