diff options
| author | Saeed Mahameed <saeedm@nvidia.com> | 2022-07-28 23:12:55 +0300 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@nvidia.com> | 2022-07-28 23:12:55 +0300 |
| commit | 78daef217c2ca63fc27e003dbd0c04a810feff92 (patch) | |
| tree | bbb75f7f45ed89d022a23897e66263d259a2fefb | |
| parent | 51a83391d77bb0f7ff0aef06ca4c7f5aa9e80b4c (diff) | |
| parent | e137fb8a295422119567ec30d2d1d084bcff5e5e (diff) | |
| download | linux-net-rc.tar.gz | |
Merge branch 'mlx5-for-net' into net-rcnet-rc
* mlx5-for-net:
net/mlx5e: Remove WARN_ON when trying to offload an unsupported TLS cipher/version
IB/mlx5: Add support for 400G_8X lane speed
| -rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index b68fddeac0f12..48fb28c301e01 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -443,6 +443,10 @@ static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u16 *active_speed, *active_width = IB_WIDTH_2X; *active_speed = IB_SPEED_NDR; break; + case MLX5E_PROT_MASK(MLX5E_400GAUI_8): + *active_width = IB_WIDTH_8X; + *active_speed = IB_SPEED_HDR; + break; case MLX5E_PROT_MASK(MLX5E_400GAUI_4_400GBASE_CR4_KR4): *active_width = IB_WIDTH_4X; *active_speed = IB_SPEED_NDR; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c index 814f2a56f633a..30a70d1390468 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c @@ -54,7 +54,7 @@ static int mlx5e_ktls_add(struct net_device *netdev, struct sock *sk, struct mlx5_core_dev *mdev = priv->mdev; int err; - if (WARN_ON(!mlx5e_ktls_type_check(mdev, crypto_info))) + if (!mlx5e_ktls_type_check(mdev, crypto_info)) return -EOPNOTSUPP; if (direction == TLS_OFFLOAD_CTX_DIR_TX) |