]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
net/mlx5: E-Switch, Fix resetting of encap mode when entering switchdev
authorPaul Blakey <paulb@nvidia.com>
Thu, 20 May 2021 14:09:58 +0000 (17:09 +0300)
committerSaeed Mahameed <saeedm@nvidia.com>
Tue, 16 Nov 2021 20:20:19 +0000 (12:20 -0800)
commitd7751d6476185ff754b9dad2cba0c0a6e43ecadc
tree85b36b6f3c0297c53ab2471812c5feb41742fa7e
parent362980eada85b5ea691e5e0d9257a991aa7ade47
net/mlx5: E-Switch, Fix resetting of encap mode when entering switchdev

E-Switch encap mode is relevant only when in switchdev mode.
The RDMA driver can query the encap configuration via
mlx5_eswitch_get_encap_mode(). Make sure it returns the currently
used mode and not the set one.

This reverts the cited commit which reset the encap mode
on entering switchdev and fixes the original issue properly.

Fixes: 9a64144d683a ("net/mlx5: E-Switch, Fix default encap mode")
Signed-off-by: Paul Blakey <paulb@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Reviewed-by: Maor Dickman <maord@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
include/linux/mlx5/eswitch.h