From owner-svn-src-head@freebsd.org Wed Jan 25 22:27:39 2017 Return-Path: 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 45E3CCC10AA; Wed, 25 Jan 2017 22:27:39 +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 292771A27; Wed, 25 Jan 2017 22:27:38 +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 v0PMRcP0022292 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 25 Jan 2017 14:27:38 -0800 (PST) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebi.us (8.15.2/8.15.2/Submit) id v0PMRciB022291; Wed, 25 Jan 2017 14:27:38 -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:27:38 -0800 From: Gleb Smirnoff To: Konstantin Belousov 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: <20170125222738.GI2611@FreeBSD.org> References: <201701251904.v0PJ48YF061428@repo.freebsd.org> <20170125222006.GH2611@FreeBSD.org> <20170125222632.GQ2349@kib.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170125222632.GQ2349@kib.kiev.ua> 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2017 22:27:39 -0000 On Thu, Jan 26, 2017 at 12:26:32AM +0200, Konstantin Belousov wrote: K> On Wed, Jan 25, 2017 at 02:20:06PM -0800, Gleb Smirnoff wrote: K> > Thanks, Luiz! K> > K> > One stylistic nit that I missed in review: K> > K> > L> static int K> > L> -in_difaddr_ioctl(caddr_t data, struct ifnet *ifp, struct thread *td) K> > L> +in_difaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td) K> > L> { K> > L> const struct ifreq *ifr = (struct ifreq *)data; K> > L> const struct sockaddr_in *addr = (const struct sockaddr_in *) K> > L> @@ -618,7 +618,8 @@ in_difaddr_ioctl(caddr_t data, struct if K> > L> in_ifadown(&ia->ia_ifa, 1); K> > L> K> > L> if (ia->ia_ifa.ifa_carp) K> > L> - (*carp_detach_p)(&ia->ia_ifa); K> > L> + (*carp_detach_p)(&ia->ia_ifa, K> > L> + (cmd == SIOCDIFADDR) ? false : true); K> > K> > Can we change the very last line to: K> > K> > (cmd == SIOCAIFADDR) ? true : false); K> This is just 'cmd == SIOCAIFADDR'. Right. Would be even better :) -- Totus tuus, Glebius.