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

Commit 08474cc1 authored by Elad Raz's avatar Elad Raz Committed by David S. Miller
Browse files

bridge: Propagate vlan add failure to user 



Disallow adding interfaces to a bridge when vlan filtering operation
failed. Send the failure code to the user.

Signed-off-by: default avatarElad Raz <eladr@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 00ce3a15

net/bridge/br_if.c

+10 −1
Original line number Diff line number Diff line
@@ -511,8 +511,11 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 
	if (br_fdb_insert(br, p, dev->dev_addr, 0))

		netdev_err(dev, "failed insert local address bridge forwarding table\n");



	if (nbp_vlan_init(p))

	err = nbp_vlan_init(p);

	if (err) {

		netdev_err(dev, "failed to initialize vlan filtering on this port\n");

		goto err6;

	}



	spin_lock_bh(&br->lock);

	changed_addr = br_stp_recalculate_bridge_id(br);
@@ -533,6 +536,12 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 


	return 0;



err6:

	list_del_rcu(&p->list);

	br_fdb_delete_by_port(br, p, 0, 1);

	nbp_update_port_count(br);

	netdev_upper_dev_unlink(dev, br->dev);



err5:

	dev->priv_flags &= ~IFF_BRIDGE_PORT;

	netdev_rx_handler_unregister(dev);