diff options
| author | Jason Gunthorpe | 2021-04-13 19:37:17 -0300 |
|---|---|---|
| committer | Jason Gunthorpe | 2021-04-13 19:37:17 -0300 |
| commit | fe73f96e7b04412c4b3c8670fc9cd600e552aa9d (patch) | |
| tree | 302bfec05b2c89b41e84096050c7d46be5f3f5b0 /include/rdma | |
| parent | 780278c2c8bb50fc01b70a7392af6ab3ba360074 (diff) | |
| parent | 18731642d4e1f73e446710389d3b01233d6fbc78 (diff) | |
Merge branch 'mlx5_memic_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Maor Gottlieb says:
====================
This series from Maor extends MEMIC to support atomic operations from the
host in addition to already supported regular read/write.
====================
* 'memic_ops':
RDMA/mlx5: Expose UAPI to query DM
RDMA/mlx5: Add support in MEMIC operations
RDMA/mlx5: Add support to MODIFY_MEMIC command
RDMA/mlx5: Re-organize the DM code
RDMA/mlx5: Move all DM logic to separate file
RDMA/uverbs: Make UVERBS_OBJECT_METHODS to consider line number
net/mlx5: Add MEMIC operations related bits
Diffstat (limited to 'include/rdma')
| -rw-r--r-- | include/rdma/uverbs_named_ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rdma/uverbs_named_ioctl.h b/include/rdma/uverbs_named_ioctl.h index f04f5126f61e..ee7873f872c3 100644 --- a/include/rdma/uverbs_named_ioctl.h +++ b/include/rdma/uverbs_named_ioctl.h @@ -20,7 +20,7 @@ /* These are static so they do not need to be qualified */ #define UVERBS_METHOD_ATTRS(method_id) _method_attrs_##method_id -#define UVERBS_OBJECT_METHODS(object_id) _object_methods_##object_id +#define UVERBS_OBJECT_METHODS(object_id) _UVERBS_NAME(_object_methods_##object_id, __LINE__) #define DECLARE_UVERBS_NAMED_METHOD(_method_id, ...) \ static const struct uverbs_attr_def *const UVERBS_METHOD_ATTRS( \ |