netfilter: fix compiler warnings in xt_layer7

SVN-Revision: 10326
v19.07.3_mercusys_ac12_duma
Gabor Juhos 17 years ago
parent 36d6e448f2
commit 11c02a7e60

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

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

Loading…
Cancel
Save