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

Commit 78124078 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum: Return NOTIFY_BAD on bridge failure 



It is possible for us to fail when joining or leaving a bridge, so let
the user know about that by returning NOTIFY_BAD, as already done for
LAG join/leave and 802.1D bridges.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b31abe7

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+7 −3
Original line number Diff line number Diff line
@@ -2357,16 +2357,20 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *dev, 
		} else if (netif_is_bridge_master(upper_dev)) {

			if (info->linking) {

				err = mlxsw_sp_port_bridge_join(mlxsw_sp_port);

				if (err)

				if (err) {

					netdev_err(dev, "Failed to join bridge\n");

					return NOTIFY_BAD;

				}

				mlxsw_sp_master_bridge_inc(mlxsw_sp, upper_dev);

				mlxsw_sp_port->bridged = 1;

			} else {

				err = mlxsw_sp_port_bridge_leave(mlxsw_sp_port);

				if (err)

					netdev_err(dev, "Failed to leave bridge\n");

				mlxsw_sp_port->bridged = 0;

				mlxsw_sp_master_bridge_dec(mlxsw_sp, upper_dev);

				if (err) {

					netdev_err(dev, "Failed to leave bridge\n");

					return NOTIFY_BAD;

				}

			}

		} else if (netif_is_lag_master(upper_dev)) {

			if (info->linking) {