Commit 016c8946 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

mlx5: fix build after merge 



Silent merge conflict between these two:

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

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b89e7f2c

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+2 −2
Original line number Diff line number Diff line
@@ -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)