diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-02-16 22:58:44 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-02-16 23:12:23 -0800 |
| commit | b646acd5eb48ec49ef90404336d7e8ee502ecd05 (patch) | |
| tree | cf6859bd3c44bc865f3248810d66a165bd757f8f /drivers/net/ethernet/mellanox | |
| parent | d489ded1a3690d7eca8633575cba3f7dac8484c7 (diff) | |
| download | linux-stable-b646acd5eb48ec49ef90404336d7e8ee502ecd05.tar.gz linux-stable-b646acd5eb48ec49ef90404336d7e8ee502ecd05.tar.bz2 linux-stable-b646acd5eb48ec49ef90404336d7e8ee502ecd05.zip | |
net: re-solve some conflicts after net -> net-next merge
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/mellanox')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 39acbc83682d..ec2fcb2a2977 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -2123,12 +2123,7 @@ static void mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, u32 buf_size = 0; int i; -<<<<<<< HEAD - if (MLX5_IPSEC_DEV(mdev)) -======= -#ifdef CONFIG_MLX5_EN_IPSEC if (mlx5_fpga_is_ipsec_device(mdev)) ->>>>>>> 3af409ca278d4a8d50e91f9f7c4c33b175645cf3 byte_count += MLX5E_METADATA_ETHER_LEN; if (mlx5e_rx_is_linear_skb(params, xsk)) { |