| commit | 0e64123141f3854e695eb4924d82b52856691466 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Thu Sep 23 10:07:05 2021 +0200 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Tue Oct 26 16:50:53 2021 +0100 |
| tree | 9f79e140db584f9b107f4e33373a0075983df1f4 | |
| parent | 98854e9675dc7d951fa9c4e10d9c9d230c54bde6 [diff] [blame] |
Update Linux to v5.4.148 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.148.tar.gz Change-Id: Ib3d26c5ba9b022e2e03533005c4fed4d7c30b61b Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/drivers/infiniband/hw/mlx5/flow.c b/drivers/infiniband/hw/mlx5/flow.c index b198ff1..fddefb2 100644 --- a/drivers/infiniband/hw/mlx5/flow.c +++ b/drivers/infiniband/hw/mlx5/flow.c
@@ -13,6 +13,7 @@ #include <rdma/ib_umem.h> #include <linux/mlx5/driver.h> #include <linux/mlx5/fs.h> +#include <linux/mlx5/eswitch.h> #include "mlx5_ib.h" #define UVERBS_MODULE_NAME mlx5_ib @@ -316,6 +317,13 @@ if (err) goto end; + if (obj->ns_type == MLX5_FLOW_NAMESPACE_FDB && + mlx5_eswitch_mode(dev->mdev->priv.eswitch) != + MLX5_ESWITCH_OFFLOADS) { + err = -EINVAL; + goto end; + } + uobj->object = obj; obj->mdev = dev->mdev; atomic_set(&obj->usecnt, 0);