From owner-svn-src-head@freebsd.org  Wed Jan 25 22:20:08 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 8963FCC1E26;
 Wed, 25 Jan 2017 22:20:08 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (glebi.us [96.95.210.25])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 71ED3123E;
 Wed, 25 Jan 2017 22:20:08 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebi.us (localhost [127.0.0.1])
 by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id v0PMK7Rh022235
 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
 Wed, 25 Jan 2017 14:20:07 -0800 (PST)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebi.us (8.15.2/8.15.2/Submit) id v0PMK67A022234;
 Wed, 25 Jan 2017 14:20:06 -0800 (PST)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebi.us: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Wed, 25 Jan 2017 14:20:06 -0800
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Luiz Otavio O Souza <loos@FreeBSD.org>
Cc: 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: <20170125222006.GH2611@FreeBSD.org>
References: <201701251904.v0PJ48YF061428@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201701251904.v0PJ48YF061428@repo.freebsd.org>
User-Agent: Mutt/1.7.2 (2016-11-26)
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jan 2017 22:20:08 -0000

  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);

I think that would be more straightforward. Do you agree? Sorry for not
noticing that before.

-- 
Totus tuus, Glebius.