summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.0/602-netfilter_layer7_match.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-14 15:48:34 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-05-14 15:48:34 +0000
commit674c61407cc959f13d163ae109a777d4b7998d0e (patch)
tree2de8c7464d61932b23db5a18769b0b5901b9272f /target/linux/generic/patches-3.0/602-netfilter_layer7_match.patch
parentc7b0f82f365d1c58bc7e26758c4fd36f7a519541 (diff)
linux/3.0: R.I.P.
It is used by the broken omap35xx/gumstix target only. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31717 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/602-netfilter_layer7_match.patch')
-rw-r--r--target/linux/generic/patches-3.0/602-netfilter_layer7_match.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/target/linux/generic/patches-3.0/602-netfilter_layer7_match.patch b/target/linux/generic/patches-3.0/602-netfilter_layer7_match.patch
deleted file mode 100644
index b2e48c824..000000000
--- a/target/linux/generic/patches-3.0/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
- }
-
-