diff options
author | Eric Dumazet <edumazet@google.com> | 2012-05-18 14:57:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-19 01:08:16 -0400 |
commit | a50feda546ac03415707a9bbcac8d6b20714db21 (patch) | |
tree | 3c1f5d64399e713c97545ca39984d4d2efe6ca5d /net/ipv6/raw.c | |
parent | 32e9072b92a1c556a303d8d0e0d64feb667e601d (diff) |
ipv6: bool/const conversions phase2
Mostly bool conversions, some inline removals and const additions.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r-- | net/ipv6/raw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 5bddea778840..93d69836fded 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -72,7 +72,7 @@ static struct sock *__raw_v6_lookup(struct net *net, struct sock *sk, | |||
72 | const struct in6_addr *rmt_addr, int dif) | 72 | const struct in6_addr *rmt_addr, int dif) |
73 | { | 73 | { |
74 | struct hlist_node *node; | 74 | struct hlist_node *node; |
75 | int is_multicast = ipv6_addr_is_multicast(loc_addr); | 75 | bool is_multicast = ipv6_addr_is_multicast(loc_addr); |
76 | 76 | ||
77 | sk_for_each_from(sk, node) | 77 | sk_for_each_from(sk, node) |
78 | if (inet_sk(sk)->inet_num == num) { | 78 | if (inet_sk(sk)->inet_num == num) { |
@@ -153,12 +153,12 @@ EXPORT_SYMBOL(rawv6_mh_filter_unregister); | |||
153 | * | 153 | * |
154 | * Caller owns SKB so we must make clones. | 154 | * Caller owns SKB so we must make clones. |
155 | */ | 155 | */ |
156 | static int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr) | 156 | static bool ipv6_raw_deliver(struct sk_buff *skb, int nexthdr) |
157 | { | 157 | { |
158 | const struct in6_addr *saddr; | 158 | const struct in6_addr *saddr; |
159 | const struct in6_addr *daddr; | 159 | const struct in6_addr *daddr; |
160 | struct sock *sk; | 160 | struct sock *sk; |
161 | int delivered = 0; | 161 | bool delivered = false; |
162 | __u8 hash; | 162 | __u8 hash; |
163 | struct net *net; | 163 | struct net *net; |
164 | 164 | ||
@@ -179,7 +179,7 @@ static int ipv6_raw_deliver(struct sk_buff *skb, int nexthdr) | |||
179 | while (sk) { | 179 | while (sk) { |
180 | int filtered; | 180 | int filtered; |
181 | 181 | ||
182 | delivered = 1; | 182 | delivered = true; |
183 | switch (nexthdr) { | 183 | switch (nexthdr) { |
184 | case IPPROTO_ICMPV6: | 184 | case IPPROTO_ICMPV6: |
185 | filtered = icmpv6_filter(sk, skb); | 185 | filtered = icmpv6_filter(sk, skb); |
@@ -225,7 +225,7 @@ out: | |||
225 | return delivered; | 225 | return delivered; |
226 | } | 226 | } |
227 | 227 | ||
228 | int raw6_local_deliver(struct sk_buff *skb, int nexthdr) | 228 | bool raw6_local_deliver(struct sk_buff *skb, int nexthdr) |
229 | { | 229 | { |
230 | struct sock *raw_sk; | 230 | struct sock *raw_sk; |
231 | 231 | ||