summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRabie Loulou <rabiel@mellanox.com>2018-05-23 14:19:07 +0300
committerSaeed Mahameed <saeedm@mellanox.com>2018-12-14 13:28:54 -0800
commit8aaca1976e2757e15edf43866a0549b321a4222f (patch)
treed6f639e67b31e3c467ee75c0067ded5f096153c9
parenteff849b2c669ebf0df88762f082bcb252f8e883c (diff)
downloadlinux-stable-8aaca1976e2757e15edf43866a0549b321a4222f.tar.gz
linux-stable-8aaca1976e2757e15edf43866a0549b321a4222f.tar.bz2
linux-stable-8aaca1976e2757e15edf43866a0549b321a4222f.zip
net/mlx5: Allow co-enablement of uplink LAG and SRIOV
Enable setting uplink LAG if sriov is enabled on both ports in switchdev mode. Once the sriov mode is changed from switchdev for any of the ports, the LAG instance is disabled. Signed-off-by: Rabie Loulou <rabiel@mellanox.com> Signed-off-by: Aviv Heller <avivh@mellanox.com> Signed-off-by: Jianbo Liu <jianbol@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/eswitch.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 70d0d9aa6b5d..ef2bec50423d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -2232,8 +2232,10 @@ EXPORT_SYMBOL_GPL(mlx5_eswitch_mode);
bool mlx5_esw_lag_prereq(struct mlx5_core_dev *dev0, struct mlx5_core_dev *dev1)
{
- if (dev0->priv.eswitch->mode == SRIOV_NONE &&
- dev1->priv.eswitch->mode == SRIOV_NONE)
+ if ((dev0->priv.eswitch->mode == SRIOV_NONE &&
+ dev1->priv.eswitch->mode == SRIOV_NONE) ||
+ (dev0->priv.eswitch->mode == SRIOV_OFFLOADS &&
+ dev1->priv.eswitch->mode == SRIOV_OFFLOADS))
return true;
return false;