@@ -163,7 +163,7 @@ static void addrconf_leave_anycast(struct inet6_ifaddr *ifp);
163
163
164
164
static void addrconf_type_change (struct net_device * dev ,
165
165
unsigned long event );
166
- static int addrconf_ifdown (struct net_device * dev , int how );
166
+ static int addrconf_ifdown (struct net_device * dev , bool unregister );
167
167
168
168
static struct fib6_info * addrconf_get_prefix_route (const struct in6_addr * pfx ,
169
169
int plen ,
@@ -3630,7 +3630,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event,
3630
3630
* an L3 master device (e.g., VRF)
3631
3631
*/
3632
3632
if (info -> upper_dev && netif_is_l3_master (info -> upper_dev ))
3633
- addrconf_ifdown (dev , 0 );
3633
+ addrconf_ifdown (dev , false );
3634
3634
}
3635
3635
3636
3636
return NOTIFY_OK ;
@@ -3663,9 +3663,9 @@ static bool addr_is_local(const struct in6_addr *addr)
3663
3663
(IPV6_ADDR_LINKLOCAL | IPV6_ADDR_LOOPBACK );
3664
3664
}
3665
3665
3666
- static int addrconf_ifdown (struct net_device * dev , int how )
3666
+ static int addrconf_ifdown (struct net_device * dev , bool unregister )
3667
3667
{
3668
- unsigned long event = how ? NETDEV_UNREGISTER : NETDEV_DOWN ;
3668
+ unsigned long event = unregister ? NETDEV_UNREGISTER : NETDEV_DOWN ;
3669
3669
struct net * net = dev_net (dev );
3670
3670
struct inet6_dev * idev ;
3671
3671
struct inet6_ifaddr * ifa , * tmp ;
@@ -3684,7 +3684,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
3684
3684
* Step 1: remove reference to ipv6 device from parent device.
3685
3685
* Do not dev_put!
3686
3686
*/
3687
- if (how ) {
3687
+ if (unregister ) {
3688
3688
idev -> dead = 1 ;
3689
3689
3690
3690
/* protected by rtnl_lock */
@@ -3698,7 +3698,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
3698
3698
/* combine the user config with event to determine if permanent
3699
3699
* addresses are to be removed from address hash table
3700
3700
*/
3701
- if (!how && !idev -> cnf .disable_ipv6 ) {
3701
+ if (!unregister && !idev -> cnf .disable_ipv6 ) {
3702
3702
/* aggregate the system setting and interface setting */
3703
3703
int _keep_addr = net -> ipv6 .devconf_all -> keep_addr_on_down ;
3704
3704
@@ -3736,7 +3736,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
3736
3736
addrconf_del_rs_timer (idev );
3737
3737
3738
3738
/* Step 2: clear flags for stateless addrconf */
3739
- if (!how )
3739
+ if (!unregister )
3740
3740
idev -> if_flags &= ~(IF_RS_SENT |IF_RA_RCVD |IF_READY );
3741
3741
3742
3742
/* Step 3: clear tempaddr list */
@@ -3806,7 +3806,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
3806
3806
write_unlock_bh (& idev -> lock );
3807
3807
3808
3808
/* Step 5: Discard anycast and multicast list */
3809
- if (how ) {
3809
+ if (unregister ) {
3810
3810
ipv6_ac_destroy_dev (idev );
3811
3811
ipv6_mc_destroy_dev (idev );
3812
3812
} else {
@@ -3816,7 +3816,7 @@ static int addrconf_ifdown(struct net_device *dev, int how)
3816
3816
idev -> tstamp = jiffies ;
3817
3817
3818
3818
/* Last: Shot the device (if unregistered) */
3819
- if (how ) {
3819
+ if (unregister ) {
3820
3820
addrconf_sysctl_unregister (idev );
3821
3821
neigh_parms_release (& nd_tbl , idev -> nd_parms );
3822
3822
neigh_ifdown (& nd_tbl , dev );
@@ -4038,7 +4038,7 @@ static void addrconf_dad_work(struct work_struct *w)
4038
4038
in6_ifa_hold (ifp );
4039
4039
addrconf_dad_stop (ifp , 1 );
4040
4040
if (disable_ipv6 )
4041
- addrconf_ifdown (idev -> dev , 0 );
4041
+ addrconf_ifdown (idev -> dev , false );
4042
4042
goto out ;
4043
4043
}
4044
4044
@@ -7187,9 +7187,9 @@ void addrconf_cleanup(void)
7187
7187
for_each_netdev (& init_net , dev ) {
7188
7188
if (__in6_dev_get (dev ) == NULL )
7189
7189
continue ;
7190
- addrconf_ifdown (dev , 1 );
7190
+ addrconf_ifdown (dev , true );
7191
7191
}
7192
- addrconf_ifdown (init_net .loopback_dev , 1 );
7192
+ addrconf_ifdown (init_net .loopback_dev , true );
7193
7193
7194
7194
/*
7195
7195
* Check hash table.
0 commit comments