diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-01-30 11:45:42 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-01-30 11:45:42 +0000 |
| commit | 561ea900aaaf6bd99b8e651ffd5c0002982ce27e (patch) | |
| tree | db326dfaa839ea7c1f176a74203f335ea1613cc0 | |
| parent | acc6b3d1da42347812a6475c3189079c795c54a4 (diff) | |
| download | upstream-561ea900aaaf6bd99b8e651ffd5c0002982ce27e.tar.gz upstream-561ea900aaaf6bd99b8e651ffd5c0002982ce27e.tar.bz2 upstream-561ea900aaaf6bd99b8e651ffd5c0002982ce27e.zip | |
[kernel] netfilter: fix compiler warnings in xt_layer7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10326 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.23/100-netfilter_layer7_2.17.patch | 10 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.24/100-netfilter_layer7_2.17.patch | 10 |
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 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 |