mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 07:03:21 +02:00
generic: update xt_layer7 module fix for 2.6.35
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21741 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
4593e3555f
commit
e8c7c67e98
@ -1,11 +1,25 @@
|
|||||||
--- a/net/netfilter/xt_layer7.c
|
--- a/net/netfilter/xt_layer7.c
|
||||||
+++ b/net/netfilter/xt_layer7.c
|
+++ b/net/netfilter/xt_layer7.c
|
||||||
@@ -416,7 +416,7 @@ static int layer7_write_proc(struct file
|
@@ -415,7 +415,9 @@ static int layer7_write_proc(struct file
|
||||||
|
}
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
|
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
|
||||||
-match(const struct sk_buff *skbin, const struct xt_match_param *par)
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
|
||||||
+match(const struct sk_buff *skbin, struct xt_action_param *par)
|
+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
|
#else
|
||||||
match(const struct sk_buff *skbin,
|
match(const struct sk_buff *skbin,
|
||||||
const struct net_device *in,
|
@@ -598,7 +600,11 @@ match(const struct sk_buff *skbin,
|
||||||
|
|
||||||
|
// load nf_conntrack_ipv4
|
||||||
|
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
|
||||||
|
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
|
||||||
|
+static int check(const struct xt_mtchk_param *par)
|
||||||
|
+# else
|
||||||
|
static bool check(const struct xt_mtchk_param *par)
|
||||||
|
+# endif
|
||||||
|
{
|
||||||
|
if (nf_ct_l3proto_try_module_get(par->match->family) < 0) {
|
||||||
|
printk(KERN_WARNING "can't load conntrack support for "
|
||||||
|
Loading…
Reference in New Issue
Block a user