diff options
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ndisc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index b3b5730b48c5..24c03396e008 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
| @@ -479,7 +479,7 @@ static void ndisc_send_na(struct net_device *dev, struct neighbour *neigh, | |||
| 479 | if (ifp) { | 479 | if (ifp) { |
| 480 | src_addr = solicited_addr; | 480 | src_addr = solicited_addr; |
| 481 | if (ifp->flags & IFA_F_OPTIMISTIC) | 481 | if (ifp->flags & IFA_F_OPTIMISTIC) |
| 482 | override = 0; | 482 | override = false; |
| 483 | inc_opt |= ifp->idev->cnf.force_tllao; | 483 | inc_opt |= ifp->idev->cnf.force_tllao; |
| 484 | in6_ifa_put(ifp); | 484 | in6_ifa_put(ifp); |
| 485 | } else { | 485 | } else { |
| @@ -557,7 +557,7 @@ void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh, | |||
| 557 | } | 557 | } |
| 558 | 558 | ||
| 559 | if (ipv6_addr_any(saddr)) | 559 | if (ipv6_addr_any(saddr)) |
| 560 | inc_opt = 0; | 560 | inc_opt = false; |
| 561 | if (inc_opt) | 561 | if (inc_opt) |
| 562 | optlen += ndisc_opt_addr_space(dev); | 562 | optlen += ndisc_opt_addr_space(dev); |
| 563 | 563 | ||
| @@ -790,7 +790,7 @@ static void ndisc_recv_ns(struct sk_buff *skb) | |||
| 790 | (is_router = pndisc_is_router(&msg->target, dev)) >= 0)) { | 790 | (is_router = pndisc_is_router(&msg->target, dev)) >= 0)) { |
| 791 | if (!(NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED) && | 791 | if (!(NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED) && |
| 792 | skb->pkt_type != PACKET_HOST && | 792 | skb->pkt_type != PACKET_HOST && |
| 793 | inc != 0 && | 793 | inc && |
| 794 | idev->nd_parms->proxy_delay != 0) { | 794 | idev->nd_parms->proxy_delay != 0) { |
| 795 | /* | 795 | /* |
| 796 | * for anycast or proxy, | 796 | * for anycast or proxy, |
