Skip to content

Commit cb54d39

Browse files
lxinkuba-moo
authored andcommitted
net: failover: use IFF_NO_ADDRCONF flag to prevent ipv6 addrconf
Similar to Bonding and Team, to prevent ipv6 addrconf with IFF_NO_ADDRCONF in slave_dev->priv_flags for slave ports is also needed in net failover. Note that dev_open(slave_dev) is called in .slave_register, which is called after the IFF_NO_ADDRCONF flag is set in failover_slave_register(). Signed-off-by: Xin Long <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 0aa64df commit cb54d39

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

net/core/failover.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ static int failover_slave_register(struct net_device *slave_dev)
8080
goto err_upper_link;
8181
}
8282

83-
slave_dev->priv_flags |= IFF_FAILOVER_SLAVE;
83+
slave_dev->priv_flags |= (IFF_FAILOVER_SLAVE | IFF_NO_ADDRCONF);
8484

8585
if (fops && fops->slave_register &&
8686
!fops->slave_register(slave_dev, failover_dev))
8787
return NOTIFY_OK;
8888

8989
netdev_upper_dev_unlink(slave_dev, failover_dev);
90-
slave_dev->priv_flags &= ~IFF_FAILOVER_SLAVE;
90+
slave_dev->priv_flags &= ~(IFF_FAILOVER_SLAVE | IFF_NO_ADDRCONF);
9191
err_upper_link:
9292
netdev_rx_handler_unregister(slave_dev);
9393
done:
@@ -121,7 +121,7 @@ int failover_slave_unregister(struct net_device *slave_dev)
121121

122122
netdev_rx_handler_unregister(slave_dev);
123123
netdev_upper_dev_unlink(slave_dev, failover_dev);
124-
slave_dev->priv_flags &= ~IFF_FAILOVER_SLAVE;
124+
slave_dev->priv_flags &= ~(IFF_FAILOVER_SLAVE | IFF_NO_ADDRCONF);
125125

126126
if (fops && fops->slave_unregister &&
127127
!fops->slave_unregister(slave_dev, failover_dev))

0 commit comments

Comments
 (0)