diff options
| author | Florian Fainelli <florian@openwrt.org> | 2013-03-14 14:45:56 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2013-03-14 14:45:56 +0000 |
| commit | b2e63b8ea81fae72aef69649631cf491bac5306f (patch) | |
| tree | 9a4bc7d83c339b4b842999287e3ae5e5d5d6734a /target/linux/generic/patches-3.9/602-netfilter_layer7_match.patch | |
| parent | 32f3b1e3582701ef6c8c248b9ad0a761c42bbc1b (diff) | |
| download | mtk-20170518-b2e63b8ea81fae72aef69649631cf491bac5306f.zip mtk-20170518-b2e63b8ea81fae72aef69649631cf491bac5306f.tar.gz mtk-20170518-b2e63b8ea81fae72aef69649631cf491bac5306f.tar.bz2 | |
kernel: add support for 3.9-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 36008
Diffstat (limited to 'target/linux/generic/patches-3.9/602-netfilter_layer7_match.patch')
| -rw-r--r-- | target/linux/generic/patches-3.9/602-netfilter_layer7_match.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.9/602-netfilter_layer7_match.patch b/target/linux/generic/patches-3.9/602-netfilter_layer7_match.patch new file mode 100644 index 0000000..b2e48c8 --- /dev/null +++ b/target/linux/generic/patches-3.9/602-netfilter_layer7_match.patch @@ -0,0 +1,51 @@ +--- 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, +@@ -597,14 +599,19 @@ match(const struct sk_buff *skbin, + } + + // load nf_conntrack_ipv4 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) ++static int ++#else ++static bool ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) +-static bool check(const struct xt_mtchk_param *par) ++check(const struct xt_mtchk_param *par) + { + if (nf_ct_l3proto_try_module_get(par->match->family) < 0) { + printk(KERN_WARNING "can't load conntrack support for " + "proto=%d\n", par->match->family); + #else +-static bool check(const char *tablename, const void *inf, ++check(const char *tablename, const void *inf, + const struct xt_match *match, void *matchinfo, + unsigned int hook_mask) + { +@@ -612,9 +619,15 @@ static bool check(const char *tablename, + printk(KERN_WARNING "can't load conntrack support for " + "proto=%d\n", match->family); + #endif ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) ++ return -EINVAL; ++ } ++ return 0; ++#else + return 0; + } + return 1; ++#endif + } + + |