summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.6/602-netfilter_layer7_match.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-07-26 12:23:56 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-07-26 12:23:56 +0000
commit009e36806b89a29141dbe28b170117f5330b06da (patch)
tree690a5c5296e4999e22f7552b97290717de7405a8 /target/linux/generic/patches-3.6/602-netfilter_layer7_match.patch
parente7ece301fea27f5ff8977d61aa914e31ff299b07 (diff)
downloadmtk-20170518-009e36806b89a29141dbe28b170117f5330b06da.zip
mtk-20170518-009e36806b89a29141dbe28b170117f5330b06da.tar.gz
mtk-20170518-009e36806b89a29141dbe28b170117f5330b06da.tar.bz2
kernel: remove kernel 3.6
kernel 3.6 is not used by any target any more, remove it. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 41834
Diffstat (limited to 'target/linux/generic/patches-3.6/602-netfilter_layer7_match.patch')
-rw-r--r--target/linux/generic/patches-3.6/602-netfilter_layer7_match.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/target/linux/generic/patches-3.6/602-netfilter_layer7_match.patch b/target/linux/generic/patches-3.6/602-netfilter_layer7_match.patch
deleted file mode 100644
index b2e48c8..0000000
--- a/target/linux/generic/patches-3.6/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
- }
-
-