diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2022-08-03 08:50:42 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-08-03 09:04:55 +0200 |
| commit | 7c6327c77d509e78bff76f2a4551fcfee851682e (patch) | |
| tree | 9e5e128945eadd50462620927ed915fb88fb6eb1 /drivers/net/ethernet/mellanox/mlx5/core/en_accel | |
| parent | doc: sfp-phylink: Fix a broken reference (diff) | |
| parent | net/mlx5e: xsk: Discard unaligned XSK frames on striding RQ (diff) | |
| download | linux-dev-7c6327c77d509e78bff76f2a4551fcfee851682e.tar.xz linux-dev-7c6327c77d509e78bff76f2a4551fcfee851682e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
net/ax25/af_ax25.c
d7c4c9e075f8c ("ax25: fix incorrect dev_tracker usage")
d62607c3fe459 ("net: rename reference+tracking helpers")
drivers/net/netdevsim/fib.c
180a6a3ee60a ("netdevsim: fib: Fix reference count leak on route deletion failure")
012ec02ae441 ("netdevsim: convert driver to use unlocked devlink API during init/fini")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_accel')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 814f2a56f633..30a70d139046 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) |