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

[Konstantin Belousov]

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.