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

Commit 30313a3d authored by Toshiaki Makita's avatar Toshiaki Makita Committed by David S. Miller
Browse files

bridge: Handle IFLA_ADDRESS correctly when creating bridge device 



When bridge device is created with IFLA_ADDRESS, we are not calling
br_stp_change_bridge_id(), which leads to incorrect local fdb
management and bridge id calculation, and prevents us from receiving
frames on the bridge device.

Reported-by: default avatarTom Gundersen <teg@jklm.no>
Signed-off-by: default avatarToshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 535cdf3c

net/bridge/br_netlink.c

+15 −0
Original line number Diff line number Diff line
@@ -445,6 +445,20 @@ 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 size_t br_get_link_af_size(const struct net_device *dev)

{

	struct net_port_vlans *pv;
@@ -473,6 +487,7 @@ struct rtnl_link_ops br_link_ops __read_mostly = { 
	.priv_size	= sizeof(struct net_bridge),

	.setup		= br_dev_setup,

	.validate	= br_validate,

	.newlink	= br_dev_newlink,

	.dellink	= br_dev_delete,

};