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.
Unified · Split
| @@ -399,6 +399,18 @@ enum rdma_nldev_attr { · 398 unmodified lines | |||
| 399 | RDMA_NLDEV_ATTR_RES_PD_ENTRY, /* nested table */ | 399 | RDMA_NLDEV_ATTR_RES_PD_ENTRY, /* nested table */ |
| 400 | RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY, /* u32 */ | 400 | RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY, /* u32 */ |
| 401 | RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY, /* u32 */ | 401 | RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY, /* u32 */ |
| 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 */ | ||
| 402 | /* | 414 | /* |
| 403 | * driver-specific attributes. | 415 | * driver-specific attributes. |
| 404 | */ | 416 | */ |
| @@ -415,18 +427,8 @@ enum rdma_nldev_attr { · 10 unmodified lines | |||
| 415 | RDMA_NLDEV_ATTR_DRIVER_U64, /* u64 */ | 427 | RDMA_NLDEV_ATTR_DRIVER_U64, /* u64 */ |
| 416 | 428 | ||
| 417 | /* | 429 | /* |
| 418 | * Provides logical name and index of netdevice which is | 430 | * Always the end |
| 419 | * connected to physical port. This information is relevant | ||
| 420 | * for RoCE and iWARP. | ||
| 421 | * | ||
| 422 | * The netdevices which are associated with containers are | ||
| 423 | * supposed to be exported together with GID table once it | ||
| 424 | * will be exposed through the netlink. Because the | ||
| 425 | * associated netdevices are properties of GIDs. | ||
| 426 | */ | 431 | */ |
| 427 | RDMA_NLDEV_ATTR_NDEV_INDEX, /* u32 */ | ||
| 428 | RDMA_NLDEV_ATTR_NDEV_NAME, /* string */ | ||
| 429 | |||
| 430 | RDMA_NLDEV_ATTR_MAX | 432 | RDMA_NLDEV_ATTR_MAX |
| 431 | }; | 433 | }; |
| 432 | #endif /* _UAPI_RDMA_NETLINK_H */ | 434 | #endif /* _UAPI_RDMA_NETLINK_H */ |