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

mlxsw: spectrum: Unify setting of HW VLAN filters

Browse source 
When adding or deleting VLANs from a bridged port, HW VLAN filters must be
set accordingly. Instead of having the same code in both add and delete
functions, just wrap it in a function and call it with the appropriate
parameters.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Elad Raz <eladr@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 2015-11-19 12:27:39 +01:00 • committed by David S. Miller
parent 06c071f68d
commit 3b7ad5ece4
1 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -342,6 +342,27 @@ err_port_add_vid:
return err; return err;
} }
static int __mlxsw_sp_port_vlans_set(struct mlxsw_sp_port *mlxsw_sp_port,
u16 vid_begin, u16 vid_end, bool is_member,
bool untagged)
{
u16 vid, vid_e;
int err;
for (vid = vid_begin; vid <= vid_end;
vid += MLXSW_REG_SPVM_REC_MAX_COUNT) {
vid_e = min((u16) (vid + MLXSW_REG_SPVM_REC_MAX_COUNT - 1),
vid_end);
err = mlxsw_sp_port_vlan_set(mlxsw_sp_port, vid, vid_e,
is_member, untagged);
if (err)
return err;
}
return 0;
}
static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port, static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
u16 vid_begin, u16 vid_end, u16 vid_begin, u16 vid_end,
bool flag_untagged, bool flag_pvid) bool flag_untagged, bool flag_pvid)
@ -396,19 +417,13 @@ static int __mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port,
return err; return err;
} }
for (vid = vid_begin; vid <= vid_end; err = __mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end,
vid += MLXSW_REG_SPVM_REC_MAX_COUNT) { true, flag_untagged);
vid_e = min((u16) (vid + MLXSW_REG_SPVM_REC_MAX_COUNT - 1),
vid_end);
err = mlxsw_sp_port_vlan_set(mlxsw_sp_port, vid, vid_e, true,
flag_untagged);
if (err) { if (err) {
netdev_err(mlxsw_sp_port->dev, "Unable to add VIDs %d-%d\n", netdev_err(dev, "Unable to add VIDs %d-%d\n", vid_begin,
vid, vid_e); vid_end);
return err; return err;
} }
}
vid = vid_begin; vid = vid_begin;
if (flag_pvid && mlxsw_sp_port->pvid != vid) { if (flag_pvid && mlxsw_sp_port->pvid != vid) {
@ -532,7 +547,7 @@ static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port,
u16 vid_begin, u16 vid_end, bool init) u16 vid_begin, u16 vid_end, bool init)
{ {
struct net_device *dev = mlxsw_sp_port->dev; struct net_device *dev = mlxsw_sp_port->dev;
u16 vid, vid_e, pvid; u16 vid, pvid;
int err; int err;
/* In case this is invoked with BRIDGE_FLAGS_SELF and port is /* In case this is invoked with BRIDGE_FLAGS_SELF and port is
@ -542,18 +557,13 @@ static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port,
if (!init && !mlxsw_sp_port->bridged) if (!init && !mlxsw_sp_port->bridged)
return mlxsw_sp_port_kill_vids(dev, vid_begin, vid_end); return mlxsw_sp_port_kill_vids(dev, vid_begin, vid_end);
for (vid = vid_begin; vid <= vid_end; err = __mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end,
vid += MLXSW_REG_SPVM_REC_MAX_COUNT) { false, false);
vid_e = min((u16) (vid + MLXSW_REG_SPVM_REC_MAX_COUNT - 1),
vid_end);
err = mlxsw_sp_port_vlan_set(mlxsw_sp_port, vid, vid_e, false,
false);
if (err) { if (err) {
netdev_err(dev, "Unable to del VIDs %d-%d\n", vid, netdev_err(dev, "Unable to del VIDs %d-%d\n", vid_begin,
vid_e); vid_end);
return err; return err;
} }
}
pvid = mlxsw_sp_port->pvid; pvid = mlxsw_sp_port->pvid;
if (pvid >= vid_begin && pvid <= vid_end && pvid != 1) { if (pvid >= vid_begin && pvid <= vid_end && pvid != 1) {