Re: [PATCH net-next] ipv6: addrconf: don't evaluate keep_addr_on_down twice

[David Ahern <dsahern@gmail.com>]

On 4/24/18 1:31 AM, Ivan Vecera wrote:
> The addrconf_ifdown() evaluates keep_addr_on_down state twice. There
> is no need to do it.
> 
> Cc: David Ahern <dsahern@gmail.com>
> Signed-off-by: Ivan Vecera <cera@cera.cz>
> ---
>  net/ipv6/addrconf.c | 23 ++++++++++-------------
>  1 file changed, 10 insertions(+), 13 deletions(-)

Looks right to me.

Acked-by: David Ahern <dsahern@gmail.com>

But  ...

> @@ -3697,11 +3699,6 @@ static int addrconf_ifdown(struct net_device *dev, int how)
>  		write_lock_bh(&idev->lock);
>  	}
>  
> -	/* re-combine the user config with event to determine if permanent
> -	 * addresses are to be removed from the interface list
> -	 */
> -	keep_addr = (!how && _keep_addr > 0 && !idev->cnf.disable_ipv6);
> -
>  	list_for_each_entry_safe(ifa, tmp, &idev->addr_list, if_list) {
>  		struct rt6_info *rt = NULL;
>  		bool keep;
> 

you need to rebase to top of tree. That is 'struct fib6_info *rt' now so
the patch does not apply cleanly using git am.