Skip to content

Commit 02ceda6

Browse files
roidayanSaeed Mahameed
authored andcommitted
net/mlx5: Use shared code for checking lag is supported
Move shared function to check lag is supported to lag header file. Signed-off-by: Roi Dayan <roid@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
1 parent 9d0cd5d commit 02ceda6

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

drivers/net/ethernet/mellanox/mlx5/core/dev.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include <linux/mlx5/vport.h>
3737
#include "mlx5_core.h"
3838
#include "devlink.h"
39+
#include "lag/lag.h"
3940

4041
/* intf dev list mutex */
4142
static DEFINE_MUTEX(mlx5_intf_mutex);
@@ -587,10 +588,7 @@ static int next_phys_dev_lag(struct device *dev, const void *data)
587588
if (!mdev)
588589
return 0;
589590

590-
if (!MLX5_CAP_GEN(mdev, vport_group_manager) ||
591-
!MLX5_CAP_GEN(mdev, lag_master) ||
592-
(MLX5_CAP_GEN(mdev, num_lag_ports) > MLX5_MAX_PORTS ||
593-
MLX5_CAP_GEN(mdev, num_lag_ports) <= 1))
591+
if (!mlx5_lag_is_supported(mdev))
594592
return 0;
595593

596594
return _next_phys_dev(mdev, data);

drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,16 +1268,6 @@ void mlx5_lag_remove_mdev(struct mlx5_core_dev *dev)
12681268
mlx5_ldev_put(ldev);
12691269
}
12701270

1271-
bool mlx5_lag_is_supported(struct mlx5_core_dev *dev)
1272-
{
1273-
if (!MLX5_CAP_GEN(dev, vport_group_manager) ||
1274-
!MLX5_CAP_GEN(dev, lag_master) ||
1275-
MLX5_CAP_GEN(dev, num_lag_ports) < 2 ||
1276-
MLX5_CAP_GEN(dev, num_lag_ports) > MLX5_MAX_PORTS)
1277-
return false;
1278-
return true;
1279-
}
1280-
12811271
void mlx5_lag_add_mdev(struct mlx5_core_dev *dev)
12821272
{
12831273
int err;

drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ struct mlx5_lag {
7474
struct lag_mpesw lag_mpesw;
7575
};
7676

77-
bool mlx5_lag_is_supported(struct mlx5_core_dev *dev);
78-
7977
static inline struct mlx5_lag *
8078
mlx5_lag_dev(struct mlx5_core_dev *dev)
8179
{
@@ -115,4 +113,14 @@ void mlx5_lag_remove_devices(struct mlx5_lag *ldev);
115113
int mlx5_deactivate_lag(struct mlx5_lag *ldev);
116114
void mlx5_lag_add_devices(struct mlx5_lag *ldev);
117115

116+
static inline bool mlx5_lag_is_supported(struct mlx5_core_dev *dev)
117+
{
118+
if (!MLX5_CAP_GEN(dev, vport_group_manager) ||
119+
!MLX5_CAP_GEN(dev, lag_master) ||
120+
MLX5_CAP_GEN(dev, num_lag_ports) < 2 ||
121+
MLX5_CAP_GEN(dev, num_lag_ports) > MLX5_MAX_PORTS)
122+
return false;
123+
return true;
124+
}
125+
118126
#endif /* __MLX5_LAG_H__ */

0 commit comments

Comments
 (0)