leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mlx5: fix build after merge

Browse Source 
Silent merge conflict between these two:

  3d677735d3 ("net/mlx5: Lag, move lag files into directory")
  14fe2471c6 ("net/mlx5: Lag, change multipath and bonding to be mutually exclusive")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2021-10-22 08:51:45 -07:00
parent b89e7f2c31
commit 016c89460d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
View File

@ -10,8 +10,8 @@
#include "en_tc.h"
#include "rep/tc.h"
#include "rep/neigh.h"
#include "lag.h"
#include "lag_mp.h"
#include "lag/lag.h"
#include "lag/mp.h"
struct mlx5e_tc_tun_route_attr {
struct net_device *out_dev;

4
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
View File

@ -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)