mlxsw: spectrum: Change bridge port attributes only when bridged
authorIdo Schimmel <idosch@mellanox.com>
Mon, 4 Jan 2016 09:42:26 +0000 (10:42 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Jan 2016 03:07:58 +0000 (22:07 -0500)
Bridge port attributes are offloaded to hardware when invoked with SELF
flag set, but it really makes no sense to reflect them when port is not
bridged.

Allow a user to change these attribute only when port is bridged and
initialize them correctly when joining or leaving a bridge.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum.c
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

index ed2eb7b..74ff011 100644 (file)
@@ -1364,9 +1364,6 @@ static int mlxsw_sp_port_create(struct mlxsw_sp *mlxsw_sp, u8 local_port)
        mlxsw_sp_port->dev = dev;
        mlxsw_sp_port->mlxsw_sp = mlxsw_sp;
        mlxsw_sp_port->local_port = local_port;
-       mlxsw_sp_port->learning = 1;
-       mlxsw_sp_port->learning_sync = 1;
-       mlxsw_sp_port->uc_flood = 1;
        bytes = DIV_ROUND_UP(VLAN_N_VID, BITS_PER_BYTE);
        mlxsw_sp_port->active_vlans = kzalloc(bytes, GFP_KERNEL);
        if (!mlxsw_sp_port->active_vlans) {
@@ -1989,16 +1986,24 @@ static int mlxsw_sp_port_bridge_join(struct mlxsw_sp_port *mlxsw_sp_port)
         * own VLANs.
         */
        err = mlxsw_sp_port_kill_vid(dev, 0, 1);
-       if (!err)
-               mlxsw_sp_port->bridged = 1;
+       if (err)
+               return err;
 
-       return err;
+       mlxsw_sp_port->learning = 1;
+       mlxsw_sp_port->learning_sync = 1;
+       mlxsw_sp_port->uc_flood = 1;
+       mlxsw_sp_port->bridged = 1;
+
+       return 0;
 }
 
 static int mlxsw_sp_port_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_port)
 {
        struct net_device *dev = mlxsw_sp_port->dev;
 
+       mlxsw_sp_port->learning = 0;
+       mlxsw_sp_port->learning_sync = 0;
+       mlxsw_sp_port->uc_flood = 0;
        mlxsw_sp_port->bridged = 0;
 
        /* Add implicit VLAN interface in the device, so that untagged
index 9476ff9..6215954 100644 (file)
@@ -252,6 +252,9 @@ static int mlxsw_sp_port_attr_br_flags_set(struct mlxsw_sp_port *mlxsw_sp_port,
        bool set;
        int err;
 
+       if (!mlxsw_sp_port->bridged)
+               return -EINVAL;
+
        if (switchdev_trans_ph_prepare(trans))
                return 0;