GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-22 06:32:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mlxsw: spectrum_switchdev: Remove redundant check

Browse source 
Since commit 97c242902c ("switchdev: Execute bridge ndos only for
bridge ports") switchdev code checks that port is bridged, so no need to
perform the same check in the driver.

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>
This commit is contained in:
Ido Schimmel 2017-05-16 19:38:30 +02:00 • committed by David S. Miller
parent 348b8fc3cf
commit d341e2ce6b
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
View file

@ -374,9 +374,6 @@ static int mlxsw_sp_port_attr_br_flags_set(struct mlxsw_sp_port *mlxsw_sp_port,
unsigned long uc_flood = mlxsw_sp_port->uc_flood ? BR_FLOOD : 0; unsigned long uc_flood = mlxsw_sp_port->uc_flood ? BR_FLOOD : 0;
int err; int err;
if (!mlxsw_sp_port->bridged)
return -EINVAL;
if (switchdev_trans_ph_prepare(trans)) if (switchdev_trans_ph_prepare(trans))
return 0; return 0;
@ -796,9 +793,6 @@ static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
u16 vid, old_pvid; u16 vid, old_pvid;
int err; int err;
if (!mlxsw_sp_port->bridged)
return -EINVAL;
err = mlxsw_sp_port_fid_join(mlxsw_sp_port, vid_begin, vid_end); err = mlxsw_sp_port_fid_join(mlxsw_sp_port, vid_begin, vid_end);
if (err) { if (err) {
netdev_err(dev, "Failed to join FIDs\n"); netdev_err(dev, "Failed to join FIDs\n");
@ -1162,9 +1156,6 @@ static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port,
{ {
u16 vid, pvid; u16 vid, pvid;
if (!mlxsw_sp_port->bridged)
return -EINVAL;
mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid_begin, vid_end, mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid_begin, vid_end,
false); false);