From: Shay Drory <sh...@nvidia.com>
[ Upstream commit 7ab91f2b03367f9d25dd807ebdfb0d67295e0e41 ]
In lag mode, setting roce enabled/disable of lag device have no effect.
e.g.: bond device (roce/vf_lag) roce status remain unchanged.
Therefore disable it and add an error message.
Fixes: cc9defcbb8fa ("net/mlx5: Handle "enable_roce" devlink param")
Signed-off-by: Shay Drory <sh...@nvidia.com>
Reviewed-by: Moshe Shemesh <mo...@nvidia.com>
Signed-off-by: Saeed Mahameed <sae...@nvidia.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index 317ce6b80b23b..c7073193db140 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -273,8 +273,8 @@ static int mlx5_devlink_enable_roce_validate(struct devlink
*devlink, u32 id,
NL_SET_ERR_MSG_MOD(extack, "Device doesn't support RoCE");
return -EOPNOTSUPP;
}
- if (mlx5_core_is_mp_slave(dev)) {
- NL_SET_ERR_MSG_MOD(extack, "Multi port slave device can't
configure RoCE");
+ if (mlx5_core_is_mp_slave(dev) || mlx5_lag_is_active(dev)) {
+ NL_SET_ERR_MSG_MOD(extack, "Multi port slave/Lag device can't
configure RoCE");
return -EOPNOTSUPP;
}
--
2.27.0
