mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-18 13:14:01 +00:00
net: rtnetlink: Enslave device before bringing it up
Unlike with bridges, one can't add an interface to a bond and set it up at the same time: | # ip link set dummy0 down | # ip link set dummy0 master bond0 up | Error: Device can not be enslaved while up. Of all drivers with ndo_add_slave callback, bond and team decline if IFF_UP flag is set, vrf cycles the interface (i.e., sets it down and immediately up again) and the others just don't care. Support the common notion of setting the interface up after enslaving it by sorting the operations accordingly. Signed-off-by: Phil Sutter <phil@nwl.cc> Reviewed-by: David Ahern <dsahern@kernel.org> Link: https://lore.kernel.org/r/20220914150623.24152-1-phil@nwl.cc Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
5f4e25641c
commit
a4abfa627c
1 changed files with 7 additions and 7 deletions
|
@ -2777,13 +2777,6 @@ static int do_setlink(const struct sk_buff *skb,
|
|||
call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
|
||||
}
|
||||
|
||||
if (ifm->ifi_flags || ifm->ifi_change) {
|
||||
err = dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm),
|
||||
extack);
|
||||
if (err < 0)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (tb[IFLA_MASTER]) {
|
||||
err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]), extack);
|
||||
if (err)
|
||||
|
@ -2791,6 +2784,13 @@ static int do_setlink(const struct sk_buff *skb,
|
|||
status |= DO_SETLINK_MODIFIED;
|
||||
}
|
||||
|
||||
if (ifm->ifi_flags || ifm->ifi_change) {
|
||||
err = dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm),
|
||||
extack);
|
||||
if (err < 0)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (tb[IFLA_CARRIER]) {
|
||||
err = dev_change_carrier(dev, nla_get_u8(tb[IFLA_CARRIER]));
|
||||
if (err)
|
||||
|
|
Loading…
Add table
Reference in a new issue