svn commit: r312770 - in head/sys: net netinet netinet6

[Gleb Smirnoff]

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.