Commit ae8928e2 authored by Cosmin Ratiu's avatar Cosmin Ratiu Committed by Wen Zhiwei
Browse files

net/mlx5: Correct TASR typo into TSAR 

stable inclusion
from stable-v6.6.52
commit 9f806d09595573b2eb2e10028cd483017e9a073d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYXOD

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9f806d09595573b2eb2e10028cd483017e9a073d



--------------------------------

[ Upstream commit e575d3a6dd22123888defb622b1742aa2d45b942 ]

TSAR is the correct spelling (Transmit Scheduling ARbiter).

Signed-off-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Reviewed-by: default avatarGal Pressman <gal@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20240613210036.1125203-2-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Stable-dep-of: 861cd9b9cb62 ("net/mlx5: Verify support for scheduling element and TSAR type")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent f20b5913

drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static bool esw_qos_element_type_supported(struct mlx5_core_dev *dev, int type) 
	switch (type) {

	case SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR:

		return MLX5_CAP_QOS(dev, esw_element_type) &

		       ELEMENT_TYPE_CAP_MASK_TASR;

		       ELEMENT_TYPE_CAP_MASK_TSAR;

	case SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT:

		return MLX5_CAP_QOS(dev, esw_element_type) &

		       ELEMENT_TYPE_CAP_MASK_VPORT;

include/linux/mlx5/mlx5_ifc.h

+1 −1
Original line number Diff line number Diff line
@@ -3844,7 +3844,7 @@ enum { 
};



enum {

	ELEMENT_TYPE_CAP_MASK_TASR		= 1 << 0,

	ELEMENT_TYPE_CAP_MASK_TSAR		= 1 << 0,

	ELEMENT_TYPE_CAP_MASK_VPORT		= 1 << 1,

	ELEMENT_TYPE_CAP_MASK_VPORT_TC		= 1 << 2,

	ELEMENT_TYPE_CAP_MASK_PARA_VPORT_TC	= 1 << 3,