From patchwork Sat Jul 13 08:26:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 258824 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B94792C010E for ; Sat, 13 Jul 2013 18:27:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758126Ab3GMI0q (ORCPT ); Sat, 13 Jul 2013 04:26:46 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:43641 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757848Ab3GMI0n (ORCPT ); Sat, 13 Jul 2013 04:26:43 -0400 Received: by mail-ee0-f46.google.com with SMTP id d41so6598619eek.5 for ; Sat, 13 Jul 2013 01:26:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=FL5Km3NKJbru6VgFq/VMf/DPKWkVgflFDTV6wtRg2Pg=; b=w2z1sdeBxYf93QhsaKxuEQnN04yJ1LqxlcOJne90WJgqiftwC75xQ3BDLAW44fKu2M Y1VG1AxZgKRImuQAZBKmYa2osVphis61C1I8S3RFXkkMTfo0Dugl5C5yIWeF5m+KVovN Z1soCe2Peog+0y+hYtBxrEMRjckHglbPtZxtlGpVS3ija9Xlu6FrcqHh0NbOBA04rDy/ CBEEWCPCkwF25Wn5O149WhbSrUnDIaNvDobBfiGWrK3f/giD9MCePJVyrOPyZuYTPt5T +/2BbdkHx+lMl1IZugJAeVKQ/toVCKdkV6FMDHWyTXfoQBcetWeW28dOM89bxNL5Z6nc Y5ww== X-Received: by 10.14.199.134 with SMTP id x6mr50932235een.114.1373704002247; Sat, 13 Jul 2013 01:26:42 -0700 (PDT) Received: from debian.localhost ([86.126.4.14]) by mx.google.com with ESMTPSA id r54sm26122926eev.8.2013.07.13.01.26.40 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 13 Jul 2013 01:26:41 -0700 (PDT) From: Daniel Baluta To: davem@davemloft.net Cc: kuznet@ms2.inr.ac.ru, jmorris@namei.org, yoshfuji@linux-ipv6.org, kaber@trash.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Baluta Subject: [PATCH] ndisc: bool initializations should use true and false Date: Sat, 13 Jul 2013 11:26:51 +0300 Message-Id: <1373704011-2146-1-git-send-email-dbaluta@ixiacom.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Daniel Baluta --- net/ipv6/ndisc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index b3b5730..24c03396 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, if (ifp) { src_addr = solicited_addr; if (ifp->flags & IFA_F_OPTIMISTIC) - override = 0; + override = false; inc_opt |= ifp->idev->cnf.force_tllao; in6_ifa_put(ifp); } else { @@ -557,7 +557,7 @@ void ndisc_send_ns(struct net_device *dev, struct neighbour *neigh, } if (ipv6_addr_any(saddr)) - inc_opt = 0; + inc_opt = false; if (inc_opt) optlen += ndisc_opt_addr_space(dev); @@ -790,7 +790,7 @@ static void ndisc_recv_ns(struct sk_buff *skb) (is_router = pndisc_is_router(&msg->target, dev)) >= 0)) { if (!(NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED) && skb->pkt_type != PACKET_HOST && - inc != 0 && + inc && idev->nd_parms->proxy_delay != 0) { /* * for anycast or proxy,