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: Jiri Pirko <[email protected]>
Signed-off-by: Ido Schimmel <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 6e9906d8d1498714f4e67d2964025f331c83118d..e30b2da1f86266e2e1e0a8af57e0674b2ba2f338 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -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);
                        }
                }

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index fc0074902ab553cc664fa3a56b6358a5a2b06ed5..b4d839371ac6ef8021987e5cf066d90d84e6ba2c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -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 */