diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-10 11:54:17 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-10 11:54:17 -0300 |
| commit | 3e3cf2e82cca92ecedba972251a20da4fa4ab1c8 (patch) | |
| tree | b6172bd58215dfb800deb8c48c0f31488e3ba28e /drivers/infiniband/hw/mlx5/main.c | |
| parent | 0aeb3622ea6f14f36232a33f1d08c2ff02f4048b (diff) | |
| parent | 30f2fe40c72bfbdde7bc066cb862bd05014be9f1 (diff) | |
| download | lwn-3e3cf2e82cca92ecedba972251a20da4fa4ab1c8.tar.gz lwn-3e3cf2e82cca92ecedba972251a20da4fa4ab1c8.zip | |
Merge branch 'mlx5_packet_pacing' into rdma.git for-next
Yishai Hadas Says:
====================
Expose raw packet pacing APIs to be used by DEVX based applications. The
existing code was refactored to have a single flow with the new raw APIs.
====================
Based on the mlx5-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Due to dependencies
* branch 'mlx5_packet_pacing':
IB/mlx5: Introduce UAPIs to manage packet pacing
net/mlx5: Expose raw packet pacing APIs
Diffstat (limited to 'drivers/infiniband/hw/mlx5/main.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index 709ef3f57a06..eba7604eaa76 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -6251,6 +6251,7 @@ ADD_UVERBS_ATTRIBUTES_SIMPLE( static const struct uapi_definition mlx5_ib_defs[] = { UAPI_DEF_CHAIN(mlx5_ib_devx_defs), UAPI_DEF_CHAIN(mlx5_ib_flow_defs), + UAPI_DEF_CHAIN(mlx5_ib_qos_defs), UAPI_DEF_CHAIN_OBJ_TREE(UVERBS_OBJECT_FLOW_ACTION, &mlx5_ib_flow_action), |