From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 30 Jan 2008 11:45:42 +0000 (+0000)
Subject: netfilter: fix compiler warnings in xt_layer7
X-Git-Tag: v19.07.0-rc1~37782
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=11c02a7e60b1d43113c6bd8652f42c509a903c59;p=openwrt%2Fstaging%2Fhauke.git

netfilter: fix compiler warnings in xt_layer7

SVN-Revision: 10326
---

diff --git a/target/linux/generic-2.6/patches-2.6.23/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.23/100-netfilter_layer7_2.17.patch
index c49bd727d9..fb438106ae 100644
--- a/target/linux/generic-2.6/patches-2.6.23/100-netfilter_layer7_2.17.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/100-netfilter_layer7_2.17.patch
@@ -438,7 +438,7 @@
 +	return count;
 +}
 +
-+static int
++static bool
 +match(const struct sk_buff *skbin,
 +      const struct net_device *in,
 +      const struct net_device *out,
@@ -446,7 +446,7 @@
 +      const void *matchinfo,
 +      int offset,
 +      unsigned int protoff,
-+      int *hotdrop)
++      bool *hotdrop)
 +{
 +	/* sidestep const without getting a compiler warning... */
 +	struct sk_buff * skb = (struct sk_buff *)skbin; 
@@ -590,7 +590,7 @@
 +	return (pattern_result ^ info->invert);
 +}
 +
-+static int check(const char *tablename,
++static bool check(const char *tablename,
 +		 const void *inf,
 +		 const struct xt_match *match,
 +		 void *matchinfo,
@@ -601,9 +601,9 @@
 +        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
 +                printk(KERN_WARNING "can't load conntrack support for "
 +                                    "proto=%d\n", match->family);
-+                return 0;
++                return false;
 +        }
-+	return 1;
++	return true;
 +}
 +
 +static void
diff --git a/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch b/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch
index c49bd727d9..fb438106ae 100644
--- a/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch
@@ -438,7 +438,7 @@
 +	return count;
 +}
 +
-+static int
++static bool
 +match(const struct sk_buff *skbin,
 +      const struct net_device *in,
 +      const struct net_device *out,
@@ -446,7 +446,7 @@
 +      const void *matchinfo,
 +      int offset,
 +      unsigned int protoff,
-+      int *hotdrop)
++      bool *hotdrop)
 +{
 +	/* sidestep const without getting a compiler warning... */
 +	struct sk_buff * skb = (struct sk_buff *)skbin; 
@@ -590,7 +590,7 @@
 +	return (pattern_result ^ info->invert);
 +}
 +
-+static int check(const char *tablename,
++static bool check(const char *tablename,
 +		 const void *inf,
 +		 const struct xt_match *match,
 +		 void *matchinfo,
@@ -601,9 +601,9 @@
 +        if (nf_ct_l3proto_try_module_get(match->family) < 0) {
 +                printk(KERN_WARNING "can't load conntrack support for "
 +                                    "proto=%d\n", match->family);
-+                return 0;
++                return false;
 +        }
-+	return 1;
++	return true;
 +}
 +
 +static void