|
@@ -981,10 +981,6 @@ static int mlxsw_sp_port_add_vid(struct net_device *dev,
|
|
|
goto err_port_vp_mode_trans;
|
|
|
}
|
|
|
|
|
|
- err = mlxsw_sp_port_vid_learning_set(mlxsw_sp_vport, vid, false);
|
|
|
- if (err)
|
|
|
- goto err_port_vid_learning_set;
|
|
|
-
|
|
|
err = mlxsw_sp_port_vlan_set(mlxsw_sp_vport, vid, vid, true, untagged);
|
|
|
if (err)
|
|
|
goto err_port_add_vid;
|
|
@@ -992,8 +988,6 @@ static int mlxsw_sp_port_add_vid(struct net_device *dev,
|
|
|
return 0;
|
|
|
|
|
|
err_port_add_vid:
|
|
|
- mlxsw_sp_port_vid_learning_set(mlxsw_sp_vport, vid, true);
|
|
|
-err_port_vid_learning_set:
|
|
|
if (list_is_singular(&mlxsw_sp_port->vports_list))
|
|
|
mlxsw_sp_port_vlan_mode_trans(mlxsw_sp_port);
|
|
|
err_port_vp_mode_trans:
|
|
@@ -1020,8 +1014,6 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev,
|
|
|
|
|
|
mlxsw_sp_port_vlan_set(mlxsw_sp_vport, vid, vid, false, false);
|
|
|
|
|
|
- mlxsw_sp_port_vid_learning_set(mlxsw_sp_vport, vid, true);
|
|
|
-
|
|
|
/* Drop FID reference. If this was the last reference the
|
|
|
* resources will be freed.
|
|
|
*/
|