diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2023-05-08 13:41:31 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2023-05-08 13:41:31 -0700 |
| commit | 30d98d1455108b8dde46a1f4150e7ac8d65126d4 (patch) | |
| tree | b4f9eac5ed344a30294eb0336ffe5888b1062b09 | |
| parent | 10caeaaf0c578891bf2d92572a58d93affab9830 (diff) | |
| download | iproute2-30d98d1455108b8dde46a1f4150e7ac8d65126d4.tar.gz | |
uapi: update kernel headers 6.4-rc1
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
| -rw-r--r-- | include/uapi/linux/atmdev.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/const.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/virtio_config.h | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/include/uapi/linux/atmdev.h b/include/uapi/linux/atmdev.h index 9bdb96a4..c95786e9 100644 --- a/include/uapi/linux/atmdev.h +++ b/include/uapi/linux/atmdev.h @@ -101,10 +101,6 @@ struct atm_dev_stats { /* use backend to make new if */ #define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf) /* add party to p2mp call */ -#ifdef CONFIG_COMPAT -/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ -#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf) -#endif #define ATM_DROPPARTY _IOW('a', ATMIOC_SPECIAL+5,int) /* drop party from p2mp call */ diff --git a/include/uapi/linux/const.h b/include/uapi/linux/const.h index 5e489872..1eb84b50 100644 --- a/include/uapi/linux/const.h +++ b/include/uapi/linux/const.h @@ -28,7 +28,7 @@ #define _BITUL(x) (_UL(1) << (x)) #define _BITULL(x) (_ULL(1) << (x)) -#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1) #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) #define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h index f010cc42..94a30195 100644 --- a/include/uapi/linux/virtio_config.h +++ b/include/uapi/linux/virtio_config.h @@ -98,6 +98,12 @@ #define VIRTIO_F_SR_IOV 37 /* + * This feature indicates that the driver passes extra data (besides + * identifying the virtqueue) in its device notifications. + */ +#define VIRTIO_F_NOTIFICATION_DATA 38 + +/* * This feature indicates that the driver can reset a queue individually. */ #define VIRTIO_F_RING_RESET 40 |