|
@@ -594,11 +594,10 @@ static enum mlxsw_reg_sfd_op mlxsw_sp_sfd_op(bool adding)
|
|
MLXSW_REG_SFD_OP_WRITE_REMOVE;
|
|
MLXSW_REG_SFD_OP_WRITE_REMOVE;
|
|
}
|
|
}
|
|
|
|
|
|
-static int mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp_port *mlxsw_sp_port,
|
|
|
|
|
|
+static int mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp *mlxsw_sp, u8 local_port,
|
|
const char *mac, u16 fid, bool adding,
|
|
const char *mac, u16 fid, bool adding,
|
|
bool dynamic)
|
|
bool dynamic)
|
|
{
|
|
{
|
|
- struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
|
|
|
|
char *sfd_pl;
|
|
char *sfd_pl;
|
|
int err;
|
|
int err;
|
|
|
|
|
|
@@ -609,7 +608,7 @@ static int mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp_port *mlxsw_sp_port,
|
|
mlxsw_reg_sfd_pack(sfd_pl, mlxsw_sp_sfd_op(adding), 0);
|
|
mlxsw_reg_sfd_pack(sfd_pl, mlxsw_sp_sfd_op(adding), 0);
|
|
mlxsw_reg_sfd_uc_pack(sfd_pl, 0, mlxsw_sp_sfd_rec_policy(dynamic),
|
|
mlxsw_reg_sfd_uc_pack(sfd_pl, 0, mlxsw_sp_sfd_rec_policy(dynamic),
|
|
mac, fid, MLXSW_REG_SFD_REC_ACTION_NOP,
|
|
mac, fid, MLXSW_REG_SFD_REC_ACTION_NOP,
|
|
- mlxsw_sp_port->local_port);
|
|
|
|
|
|
+ local_port);
|
|
err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfd), sfd_pl);
|
|
err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sfd), sfd_pl);
|
|
kfree(sfd_pl);
|
|
kfree(sfd_pl);
|
|
|
|
|
|
@@ -659,7 +658,8 @@ mlxsw_sp_port_fdb_static_add(struct mlxsw_sp_port *mlxsw_sp_port,
|
|
fid = mlxsw_sp_port->pvid;
|
|
fid = mlxsw_sp_port->pvid;
|
|
|
|
|
|
if (!mlxsw_sp_port->lagged)
|
|
if (!mlxsw_sp_port->lagged)
|
|
- return mlxsw_sp_port_fdb_uc_op(mlxsw_sp_port,
|
|
|
|
|
|
+ return mlxsw_sp_port_fdb_uc_op(mlxsw_sp_port->mlxsw_sp,
|
|
|
|
+ mlxsw_sp_port->local_port,
|
|
fdb->addr, fid, true, false);
|
|
fdb->addr, fid, true, false);
|
|
else
|
|
else
|
|
return mlxsw_sp_port_fdb_uc_lag_op(mlxsw_sp_port->mlxsw_sp,
|
|
return mlxsw_sp_port_fdb_uc_lag_op(mlxsw_sp_port->mlxsw_sp,
|
|
@@ -798,7 +798,8 @@ mlxsw_sp_port_fdb_static_del(struct mlxsw_sp_port *mlxsw_sp_port,
|
|
}
|
|
}
|
|
|
|
|
|
if (!mlxsw_sp_port->lagged)
|
|
if (!mlxsw_sp_port->lagged)
|
|
- return mlxsw_sp_port_fdb_uc_op(mlxsw_sp_port,
|
|
|
|
|
|
+ return mlxsw_sp_port_fdb_uc_op(mlxsw_sp_port->mlxsw_sp,
|
|
|
|
+ mlxsw_sp_port->local_port,
|
|
fdb->addr, fid,
|
|
fdb->addr, fid,
|
|
false, false);
|
|
false, false);
|
|
else
|
|
else
|
|
@@ -1056,7 +1057,7 @@ static void mlxsw_sp_fdb_notify_mac_process(struct mlxsw_sp *mlxsw_sp,
|
|
vid = fid;
|
|
vid = fid;
|
|
}
|
|
}
|
|
|
|
|
|
- err = mlxsw_sp_port_fdb_uc_op(mlxsw_sp_port, mac, fid,
|
|
|
|
|
|
+ err = mlxsw_sp_port_fdb_uc_op(mlxsw_sp, local_port, mac, fid,
|
|
adding && mlxsw_sp_port->learning, true);
|
|
adding && mlxsw_sp_port->learning, true);
|
|
if (err) {
|
|
if (err) {
|
|
if (net_ratelimit())
|
|
if (net_ratelimit())
|