Skip to content

Commit 1cdc14e

Browse files
erezamellanoxSaeed Mahameed
authored andcommitted
net/mlx5: LAG, Use affinity type enumerators
Instead of using explicit indexes, simply use affinity type enumerators to make the code more readable. Fixes: 544fe7c ("net/mlx5e: Activate HW multipath and handle port affinity based on FIB events") Signed-off-by: Erez Alfasi <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent 84d2dbb commit 1cdc14e

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,28 @@ bool mlx5_lag_is_multipath(struct mlx5_core_dev *dev)
4444
* 2 - set affinity to port 2.
4545
*
4646
**/
47-
static void mlx5_lag_set_port_affinity(struct mlx5_lag *ldev, int port)
47+
static void mlx5_lag_set_port_affinity(struct mlx5_lag *ldev,
48+
enum mlx5_lag_port_affinity port)
4849
{
4950
struct lag_tracker tracker;
5051

5152
if (!__mlx5_lag_is_multipath(ldev))
5253
return;
5354

5455
switch (port) {
55-
case 0:
56+
case MLX5_LAG_NORMAL_AFFINITY:
5657
tracker.netdev_state[MLX5_LAG_P1].tx_enabled = true;
5758
tracker.netdev_state[MLX5_LAG_P2].tx_enabled = true;
5859
tracker.netdev_state[MLX5_LAG_P1].link_up = true;
5960
tracker.netdev_state[MLX5_LAG_P2].link_up = true;
6061
break;
61-
case 1:
62+
case MLX5_LAG_P1_AFFINITY:
6263
tracker.netdev_state[MLX5_LAG_P1].tx_enabled = true;
6364
tracker.netdev_state[MLX5_LAG_P1].link_up = true;
6465
tracker.netdev_state[MLX5_LAG_P2].tx_enabled = false;
6566
tracker.netdev_state[MLX5_LAG_P2].link_up = false;
6667
break;
67-
case 2:
68+
case MLX5_LAG_P2_AFFINITY:
6869
tracker.netdev_state[MLX5_LAG_P1].tx_enabled = false;
6970
tracker.netdev_state[MLX5_LAG_P1].link_up = false;
7071
tracker.netdev_state[MLX5_LAG_P2].tx_enabled = true;
@@ -159,7 +160,7 @@ static void mlx5_lag_fib_route_event(struct mlx5_lag *ldev,
159160
mlx5_activate_lag(ldev, &tracker, MLX5_LAG_FLAG_MULTIPATH);
160161
}
161162

162-
mlx5_lag_set_port_affinity(ldev, 0);
163+
mlx5_lag_set_port_affinity(ldev, MLX5_LAG_NORMAL_AFFINITY);
163164
mp->mfi = fi;
164165
}
165166

@@ -184,7 +185,7 @@ static void mlx5_lag_fib_nexthop_event(struct mlx5_lag *ldev,
184185
}
185186
} else if (event == FIB_EVENT_NH_ADD &&
186187
fib_info_num_path(fi) == 2) {
187-
mlx5_lag_set_port_affinity(ldev, 0);
188+
mlx5_lag_set_port_affinity(ldev, MLX5_LAG_NORMAL_AFFINITY);
188189
}
189190
}
190191

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
#include "lag.h"
88
#include "mlx5_core.h"
99

10+
enum mlx5_lag_port_affinity {
11+
MLX5_LAG_NORMAL_AFFINITY,
12+
MLX5_LAG_P1_AFFINITY,
13+
MLX5_LAG_P2_AFFINITY,
14+
};
15+
1016
struct lag_mp {
1117
struct notifier_block fib_nb;
1218
struct fib_info *mfi; /* used in tracking fib events */

0 commit comments

Comments
 (0)