summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-01-30 11:45:42 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-01-30 11:45:42 +0000
commit11c02a7e60b1d43113c6bd8652f42c509a903c59 (patch)
tree884d917eb260a6fb9c58cead370e33d47cb6421e
parent36d6e448f216907dacc897b71831dcf9b2dcfd5e (diff)
downloadmtk-20170518-11c02a7e60b1d43113c6bd8652f42c509a903c59.zip
mtk-20170518-11c02a7e60b1d43113c6bd8652f42c509a903c59.tar.gz
mtk-20170518-11c02a7e60b1d43113c6bd8652f42c509a903c59.tar.bz2
netfilter: fix compiler warnings in xt_layer7
SVN-Revision: 10326
-rw-r--r--target/linux/generic-2.6/patches-2.6.23/100-netfilter_layer7_2.17.patch10
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch10
2 files changed, 10 insertions, 10 deletions
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 c49bd72..fb43810 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 c49bd72..fb43810 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