aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_input.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/ip6_input.c')
-rw-r--r--net/ipv6/ip6_input.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index 1ca5d45a12e8..21a15dfe4a9e 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -170,7 +170,8 @@ static int ip6_input_finish(struct sk_buff *skb)
170{ 170{
171 const struct inet6_protocol *ipprot; 171 const struct inet6_protocol *ipprot;
172 unsigned int nhoff; 172 unsigned int nhoff;
173 int nexthdr, raw; 173 int nexthdr;
174 bool raw;
174 u8 hash; 175 u8 hash;
175 struct inet6_dev *idev; 176 struct inet6_dev *idev;
176 struct net *net = dev_net(skb_dst(skb)->dev); 177 struct net *net = dev_net(skb_dst(skb)->dev);
@@ -251,7 +252,7 @@ int ip6_input(struct sk_buff *skb)
251int ip6_mc_input(struct sk_buff *skb) 252int ip6_mc_input(struct sk_buff *skb)
252{ 253{
253 const struct ipv6hdr *hdr; 254 const struct ipv6hdr *hdr;
254 int deliver; 255 bool deliver;
255 256
256 IP6_UPD_PO_STATS_BH(dev_net(skb_dst(skb)->dev), 257 IP6_UPD_PO_STATS_BH(dev_net(skb_dst(skb)->dev),
257 ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_INMCAST, 258 ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_INMCAST,
@@ -287,7 +288,7 @@ int ip6_mc_input(struct sk_buff *skb)
287 * is for MLD (0x0000). 288 * is for MLD (0x0000).
288 */ 289 */
289 if ((ptr[2] | ptr[3]) == 0) { 290 if ((ptr[2] | ptr[3]) == 0) {
290 deliver = 0; 291 deliver = false;
291 292
292 if (!ipv6_ext_hdr(nexthdr)) { 293 if (!ipv6_ext_hdr(nexthdr)) {
293 /* BUG */ 294 /* BUG */
@@ -312,7 +313,7 @@ int ip6_mc_input(struct sk_buff *skb)
312 case ICMPV6_MGM_REPORT: 313 case ICMPV6_MGM_REPORT:
313 case ICMPV6_MGM_REDUCTION: 314 case ICMPV6_MGM_REDUCTION:
314 case ICMPV6_MLD2_REPORT: 315 case ICMPV6_MLD2_REPORT:
315 deliver = 1; 316 deliver = true;
316 break; 317 break;
317 } 318 }
318 goto out; 319 goto out;