tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
RDMA/uapi: Fix uapi breakage
During this merge window, we added support for addition RDMA netlink
operations. Unfortunately, we added the items in the middle of our uapi
enum. Fix that before final release.
Fixes: da5c85078215 ("RDMA/nldev: add driver-specific resource
tracking")
Signed-off-by: Doug Ledford <dledford@redhat.com>
+13
-11
+13
-11
include/uapi/rdma/rdma_netlink.h
+13
-11
include/uapi/rdma/rdma_netlink.h
···
400
400
RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY, /* u32 */
401
401
RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY, /* u32 */
402
402
/*
403
+
* Provides logical name and index of netdevice which is
404
+
* connected to physical port. This information is relevant
405
+
* for RoCE and iWARP.
406
+
*
407
+
* The netdevices which are associated with containers are
408
+
* supposed to be exported together with GID table once it
409
+
* will be exposed through the netlink. Because the
410
+
* associated netdevices are properties of GIDs.
411
+
*/
412
+
RDMA_NLDEV_ATTR_NDEV_INDEX, /* u32 */
413
+
RDMA_NLDEV_ATTR_NDEV_NAME, /* string */
414
+
/*
403
415
* driver-specific attributes.
404
416
*/
405
417
RDMA_NLDEV_ATTR_DRIVER, /* nested table */
···
427
415
RDMA_NLDEV_ATTR_DRIVER_U64, /* u64 */
428
416
429
417
/*
430
-
* Provides logical name and index of netdevice which is
431
-
* connected to physical port. This information is relevant
432
-
* for RoCE and iWARP.
433
-
*
434
-
* The netdevices which are associated with containers are
435
-
* supposed to be exported together with GID table once it
436
-
* will be exposed through the netlink. Because the
437
-
* associated netdevices are properties of GIDs.
418
+
* Always the end
438
419
*/
439
-
RDMA_NLDEV_ATTR_NDEV_INDEX, /* u32 */
440
-
RDMA_NLDEV_ATTR_NDEV_NAME, /* string */
441
-
442
420
RDMA_NLDEV_ATTR_MAX
443
421
};
444
422
#endif /* _UAPI_RDMA_NETLINK_H */