Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6677449 authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

bridge: netlink: call br_changelink() during br_dev_newlink() 



Any bridge options specified during link creation (e.g. ip link add)
are ignored as br_dev_newlink() does not process them.
Use br_changelink() to do it.

Fixes: 13323516 ("bridge: implement rtnl_link_ops->changelink")
Signed-off-by: default avatarIvan Vecera <cera@cera.cz>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90c311b0

net/bridge/br_netlink.c

+19 −14
Original line number Diff line number Diff line
@@ -781,20 +781,6 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[]) 
	return 0;

}



static int br_dev_newlink(struct net *src_net, struct net_device *dev,

			  struct nlattr *tb[], struct nlattr *data[])

{

	struct net_bridge *br = netdev_priv(dev);



	if (tb[IFLA_ADDRESS]) {

		spin_lock_bh(&br->lock);

		br_stp_change_bridge_id(br, nla_data(tb[IFLA_ADDRESS]));

		spin_unlock_bh(&br->lock);

	}



	return register_netdevice(dev);

}



static int br_port_slave_changelink(struct net_device *brdev,

				    struct net_device *dev,

				    struct nlattr *tb[],
@@ -1115,6 +1101,25 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 
	return 0;

}



static int br_dev_newlink(struct net *src_net, struct net_device *dev,

			  struct nlattr *tb[], struct nlattr *data[])

{

	struct net_bridge *br = netdev_priv(dev);

	int err;



	if (tb[IFLA_ADDRESS]) {

		spin_lock_bh(&br->lock);

		br_stp_change_bridge_id(br, nla_data(tb[IFLA_ADDRESS]));

		spin_unlock_bh(&br->lock);

	}



	err = br_changelink(dev, tb, data);

	if (err)

		return err;



	return register_netdevice(dev);

}



static size_t br_get_size(const struct net_device *brdev)

{

	return nla_total_size(sizeof(u32)) +	/* IFLA_BR_FORWARD_DELAY  */