diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2023-11-13 08:38:58 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2023-11-13 08:38:58 -0800 |
| commit | 22f27fcb13175882abbcfc6f1138687432a7f072 (patch) | |
| tree | 6313855809ca3de1e011dd021155a3325b98d11e | |
| parent | 78eebdbc7d2f96b01a18d7db33c1c99266efc4bc (diff) | |
| download | iproute2-next-22f27fcb13175882abbcfc6f1138687432a7f072.tar.gz | |
uapi: update headers from 6.7-rc1
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
| -rw-r--r-- | include/uapi/linux/virtio_config.h | 5 | ||||
| -rw-r--r-- | rdma/include/uapi/rdma/rdma_netlink.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index 94a301954..8c3f151d7 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -103,6 +103,11 @@ */ #define VIRTIO_F_NOTIFICATION_DATA 38 +/* This feature indicates that the driver uses the data provided by the device + * as a virtqueue identifier in available buffer notifications. + */ +#define VIRTIO_F_NOTIF_CONFIG_DATA 39 + /* * This feature indicates that the driver can reset a queue individually. */ diff --git a/rdma/include/uapi/rdma/rdma_netlink.h b/rdma/include/uapi/rdma/rdma_netlink.h index 47ca21768..e8861b5ee 100644 --- a/rdma/include/uapi/rdma/rdma_netlink.h +++ b/rdma/include/uapi/rdma/rdma_netlink.h @@ -556,11 +556,7 @@ enum rdma_nldev_attr { RDMA_NLDEV_ATTR_STAT_HWCOUNTER_INDEX, /* u32 */ RDMA_NLDEV_ATTR_STAT_HWCOUNTER_DYNAMIC, /* u8 */ - /* - * To enable or disable using privileged_qkey without being - * a privileged user. - */ - RDMA_NLDEV_SYS_ATTR_PRIVILEGED_QKEY_MODE, /* u8 */ + RDMA_NLDEV_SYS_ATTR_PRIVILEGED_QKEY_MODE, /* u8 */ /* * Always the end |