Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56202ca4 authored by Nogah Frankel's avatar Nogah Frankel Committed by David S. Miller
Browse files

mlxsw: spectrum: qdiscs: Remove qdisc before setting a new one 



If a qdisc is being replaced by another qdisc of the same type, it can
simply override over its configuration.
However, if it replaces a qdisc of another type, it needs to be removed
before setting the new qdisc.

Signed-off-by: default avatarNogah Frankel <nogahf@mellanox.com>
Reviewed-by: default avatarYuval Mintz <yuvalm@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cf6c9c7

drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c

+7 −0
Original line number Diff line number Diff line
@@ -115,6 +115,13 @@ mlxsw_sp_qdisc_replace(struct mlxsw_sp_port *mlxsw_sp_port, u32 handle, 
{

	int err;



	if (mlxsw_sp_qdisc->ops && mlxsw_sp_qdisc->ops->type != ops->type)

		/* In case this location contained a different qdisc of the

		 * same type we can override the old qdisc configuration.

		 * Otherwise, we need to remove the old qdisc before setting the

		 * new one.

		 */

		mlxsw_sp_qdisc_destroy(mlxsw_sp_port, mlxsw_sp_qdisc);

	err = ops->check_params(mlxsw_sp_port, mlxsw_sp_qdisc, params);

	if (err)

		goto err_bad_param;