diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2021-10-22 08:51:45 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-10-22 09:00:31 -0700 |
| commit | 016c89460d348c405313019bffeb73971e35ed09 (patch) | |
| tree | c1ee4e8a76805a3dc126061dccf56cef839601e9 /drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | |
| parent | ice: Nuild fix. (diff) | |
| download | linux-dev-016c89460d348c405313019bffeb73971e35ed09.tar.xz linux-dev-016c89460d348c405313019bffeb73971e35ed09.zip | |
mlx5: fix build after merge
Silent merge conflict between these two:
3d677735d3b7 ("net/mlx5: Lag, move lag files into directory")
14fe2471c628 ("net/mlx5: Lag, change multipath and bonding to be mutually exclusive")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 57369925a788..3af3da214a5b 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -68,8 +68,8 @@ #include "lib/fs_chains.h" #include "diag/en_tc_tracepoint.h" #include <asm/div64.h> -#include "lag.h" -#include "lag_mp.h" +#include "lag/lag.h" +#include "lag/mp.h" #define nic_chains(priv) ((priv)->fs.tc.chains) #define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto) |