From owner-svn-src-all@freebsd.org Wed Jan 25 22:26:38 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E698CCC1FFB; Wed, 25 Jan 2017 22:26:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 597301712; Wed, 25 Jan 2017 22:26:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id v0PMQXd8023785 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 26 Jan 2017 00:26:33 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua v0PMQXd8023785 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id v0PMQW1V023784; Thu, 26 Jan 2017 00:26:32 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 26 Jan 2017 00:26:32 +0200 From: Konstantin Belousov To: Gleb Smirnoff Cc: Luiz Otavio O Souza , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r312770 - in head/sys: net netinet netinet6 Message-ID: <20170125222632.GQ2349@kib.kiev.ua> References: <201701251904.v0PJ48YF061428@repo.freebsd.org> <20170125222006.GH2611@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170125222006.GH2611@FreeBSD.org> User-Agent: Mutt/1.7.2 (2016-11-26) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2017 22:26:39 -0000 On Wed, Jan 25, 2017 at 02:20:06PM -0800, Gleb Smirnoff wrote: > Thanks, Luiz! > > One stylistic nit that I missed in review: > > L> static int > L> -in_difaddr_ioctl(caddr_t data, struct ifnet *ifp, struct thread *td) > L> +in_difaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td) > L> { > L> const struct ifreq *ifr = (struct ifreq *)data; > L> const struct sockaddr_in *addr = (const struct sockaddr_in *) > L> @@ -618,7 +618,8 @@ in_difaddr_ioctl(caddr_t data, struct if > L> in_ifadown(&ia->ia_ifa, 1); > L> > L> if (ia->ia_ifa.ifa_carp) > L> - (*carp_detach_p)(&ia->ia_ifa); > L> + (*carp_detach_p)(&ia->ia_ifa, > L> + (cmd == SIOCDIFADDR) ? false : true); > > Can we change the very last line to: > > (cmd == SIOCAIFADDR) ? true : false); This is just 'cmd == SIOCAIFADDR'. > > I think that would be more straightforward. Do you agree? Sorry for not > noticing that before. > > -- > Totus tuus, Glebius.