diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-03-26 09:42:59 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-03-26 09:42:59 +0000 |
commit | b22936646d66f2a36a70ddeb9c66a44f07b8c4ac (patch) | |
tree | 485bf7cec86903e0ab0d5cbf0daa13e36e3ab5f1 /target/linux/generic/patches-3.19/602-netfilter_layer7_match.patch | |
parent | 90cd852f2508f82c8e02c5ee6b97ba7bf1823c55 (diff) | |
download | master-187ad058-b22936646d66f2a36a70ddeb9c66a44f07b8c4ac.tar.gz master-187ad058-b22936646d66f2a36a70ddeb9c66a44f07b8c4ac.tar.bz2 master-187ad058-b22936646d66f2a36a70ddeb9c66a44f07b8c4ac.zip |
drop 3.19 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45002 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.19/602-netfilter_layer7_match.patch')
-rw-r--r-- | target/linux/generic/patches-3.19/602-netfilter_layer7_match.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/target/linux/generic/patches-3.19/602-netfilter_layer7_match.patch b/target/linux/generic/patches-3.19/602-netfilter_layer7_match.patch deleted file mode 100644 index b2e48c824f..0000000000 --- a/target/linux/generic/patches-3.19/602-netfilter_layer7_match.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- 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 - } - - |