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

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
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "en_tc.h" #include "en_tc.h"
#include "rep/tc.h" #include "rep/tc.h"
#include "rep/neigh.h" #include "rep/neigh.h"
#include "lag.h" #include "lag/lag.h"
#include "lag_mp.h" #include "lag/mp.h"
struct mlx5e_tc_tun_route_attr { struct mlx5e_tc_tun_route_attr {
struct net_device *out_dev; struct net_device *out_dev;
......
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
#include "lib/fs_chains.h" #include "lib/fs_chains.h"
#include "diag/en_tc_tracepoint.h" #include "diag/en_tc_tracepoint.h"
#include <asm/div64.h> #include <asm/div64.h>
#include "lag.h" #include "lag/lag.h"
#include "lag_mp.h" #include "lag/mp.h"
#define nic_chains(priv) ((priv)->fs.tc.chains) #define nic_chains(priv) ((priv)->fs.tc.chains)
#define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto) #define MLX5_MH_ACT_SZ MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment