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

Commit 0d9b970c authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum: move "bridged" bool to u8 flags 



It is a flag anyway, so move it to existing u8 flag and don't waste mem.
Fix the flags to be in single u8 on the way.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -1899,12 +1899,12 @@ static int mlxsw_sp_netdevice_event(struct notifier_block *unused, 
				if (err)

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

				mlxsw_sp_master_bridge_inc(mlxsw_sp, upper_dev);

				mlxsw_sp_port->bridged = true;

				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 = false;

				mlxsw_sp_port->bridged = 0;

				mlxsw_sp_master_bridge_dec(mlxsw_sp, upper_dev);

			}

		}

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

+3 −3
Original line number Diff line number Diff line
@@ -84,10 +84,10 @@ struct mlxsw_sp_port { 
	struct mlxsw_sp *mlxsw_sp;

	u8 local_port;

	u8 stp_state;

	u8 learning:1;

	u8 learning_sync:1;

	u8 learning:1,

	   learning_sync:1,

	   bridged:1;

	u16 pvid;

	bool bridged;

	/* 802.1Q bridge VLANs */

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	/* VLAN interfaces */