Commit a8dfa243 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Ma Wupeng
Browse files

Revert "net: rtnetlink: Enslave device before bringing it up" 

stable inclusion
from stable-v6.6.14
commit 68325c8c1aeb7304eb1db6b39d586875c072734e
bugzilla: https://gitee.com/openeuler/kernel/issues/I99TJK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=68325c8c1aeb7304eb1db6b39d586875c072734e



--------------------------------

commit ec4ffd100ffb396eca13ebe7d18938ea80f399c3 upstream.

This reverts commit a4abfa62.

The patch broke:
> ip link set dummy0 up
> ip link set dummy0 master bond0 down

This last command is useful to be able to enslave an interface with only
one netlink message.

After discussion, there is no good reason to support:
> ip link set dummy0 down
> ip link set dummy0 master bond0 up
because the bond interface already set the slave up when it is up.

Cc: stable@vger.kernel.org
Fixes: a4abfa62 ("net: rtnetlink: Enslave device before bringing it up")
Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Link: https://lore.kernel.org/r/20240108094103.2001224-2-nicolas.dichtel@6wind.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent 20ab3416

net/core/rtnetlink.c

+7 −7
Original line number Diff line number Diff line
@@ -2869,13 +2869,6 @@ static int do_setlink(const struct sk_buff *skb, 
		call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);

	}



	if (tb[IFLA_MASTER]) {

		err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]), extack);

		if (err)

			goto errout;

		status |= DO_SETLINK_MODIFIED;

	}



	if (ifm->ifi_flags || ifm->ifi_change) {

		err = dev_change_flags(dev, rtnl_dev_combine_flags(dev, ifm),

				       extack);
@@ -2883,6 +2876,13 @@ static int do_setlink(const struct sk_buff *skb, 
			goto errout;

	}



	if (tb[IFLA_MASTER]) {

		err = do_set_master(dev, nla_get_u32(tb[IFLA_MASTER]), extack);

		if (err)

			goto errout;

		status |= DO_SETLINK_MODIFIED;

	}



	if (tb[IFLA_CARRIER]) {

		err = dev_change_carrier(dev, nla_get_u8(tb[IFLA_CARRIER]));

		if (err)