diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-09-08 19:55:36 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-09-08 19:55:36 +0000 |
| commit | 54cd991725079fdce550e86f2303ece870203386 (patch) | |
| tree | ef26822511b5dfe4eba238e4a9f0665bc99201e7 /target/linux/generic/patches-3.9/602-netfilter_layer7_match.patch | |
| parent | eea3a89a6a158dda4751802d952ddc07408c1b0a (diff) | |
| download | master-31e0f0ae-54cd991725079fdce550e86f2303ece870203386.tar.gz master-31e0f0ae-54cd991725079fdce550e86f2303ece870203386.tar.bz2 master-31e0f0ae-54cd991725079fdce550e86f2303ece870203386.zip | |
kernel: drop 3.9 support
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 42452
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, 0 insertions, 51 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 deleted file mode 100644 index b2e48c824f..0000000000 --- a/target/linux/generic/patches-3.9/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 - } - - |