uapi: update headers from 6.0-rc1

These are the post-merge of netwoking user headers.
Note: this fixes compilation with gcc-12

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index d98ed67c6964b092cc98f4079ba38bcab5008390..65fa272a63a461cec4ee0d1f246663149e704fb5 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -79,7 +79,7 @@ struct bpf_insn {
 /* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */
 struct bpf_lpm_trie_key {
        __u32   prefixlen;      /* up to 32 for AF_INET, 128 for AF_INET6 */
-       __u8    data[0];        /* Arbitrary size */
+       __u8    data[]; /* Arbitrary size */
 };
 
 struct bpf_cgroup_storage_key {

diff --git a/include/uapi/linux/genetlink.h b/include/uapi/linux/genetlink.h
index 9fa720ee87ae08ee1e8e18e6d95213b83023d446..e9b8117bdcf9853c174c9bed1dcaf6732283a961 100644 (file)
--- a/include/uapi/linux/genetlink.h
+++ b/include/uapi/linux/genetlink.h
@@ -87,6 +87,8 @@ enum {
        __CTRL_ATTR_MCAST_GRP_MAX,
 };
 
+#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
+
 enum {
        CTRL_ATTR_POLICY_UNSPEC,
        CTRL_ATTR_POLICY_DO,
@@ -96,7 +98,6 @@ enum {
        CTRL_ATTR_POLICY_DUMP_MAX = __CTRL_ATTR_POLICY_DUMP_MAX - 1
 };
 
-#define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
-
+#define CTRL_ATTR_POLICY_MAX (__CTRL_ATTR_POLICY_DUMP_MAX - 1)
 
 #endif /* __LINUX_GENERIC_NETLINK_H */

diff --git a/include/uapi/linux/if_alg.h b/include/uapi/linux/if_alg.h
index dc52a11ba6d1585d44cb2351ff7268299885ba81..578b18aab82151ead815702c2ce07daa9f137d33 100644 (file)
--- a/include/uapi/linux/if_alg.h
+++ b/include/uapi/linux/if_alg.h
@@ -42,7 +42,7 @@ struct sockaddr_alg_new {
 
 struct af_alg_iv {
        __u32   ivlen;
-       __u8    iv[0];
+       __u8    iv[];
 };
 
 /* Socket options */

diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h
index 8489ae03744b1cdd013e82af292a3d469ef4299e..3e94e9e07816940584fdf1b865c7b05735162d28 100644 (file)
--- a/include/uapi/linux/if_tun.h
+++ b/include/uapi/linux/if_tun.h
@@ -108,7 +108,7 @@ struct tun_pi {
 struct tun_filter {
        __u16  flags; /* TUN_FLT_ flags see above */
        __u16  count; /* Number of addresses */
-       __u8   addr[0][ETH_ALEN];
+       __u8   addr[][ETH_ALEN];
 };
 
 #endif /* __IF_TUN_H */

diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
index ed1c3153b4f4864ed16794a6ee3d7bb1cb8d1443..d81cb69a26a9afa2f510f5b6cf4b6f20b11e7d21 100644 (file)
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/linux/inet_diag.h
@@ -104,7 +104,7 @@ struct inet_diag_hostcond {
        __u8    family;
        __u8    prefix_len;
        int     port;
-       __be32  addr[0];
+       __be32  addr[];
 };
 
 struct inet_diag_markcond {

diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
index 75c46c1bd361245a508a95a191341c0146a7a143..78b6c798602d7a2bb39294942e49fcca78fc6131 100644 (file)
--- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
@@ -112,13 +112,13 @@ struct ip_auth_hdr {
        __be16 reserved;
        __be32 spi;
        __be32 seq_no;          /* Sequence number */
-       __u8  auth_data[0];     /* Variable len but >=4. Mind the 64 bit alignment! */
+       __u8  auth_data[];      /* Variable len but >=4. Mind the 64 bit alignment! */
 };
 
 struct ip_esp_hdr {
        __be32 spi;
        __be32 seq_no;          /* Sequence number */
-       __u8  enc_data[0];      /* Variable len but >=8. Mind the 64 bit alignment! */
+       __u8  enc_data[];       /* Variable len but >=8. Mind the 64 bit alignment! */
 };
 
 struct ip_comp_hdr {

diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index f724129c04255602a1ba25a5c3f870f8b228081c..6325d1d0e90f5dcdc7bdc91d612f8fc4c7b40135 100644 (file)
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -98,12 +98,8 @@
 
 /* Since UDF 2.01 is ISO 13346 based... */
 #define UDF_SUPER_MAGIC                0x15013346
-#define BALLOON_KVM_MAGIC      0x13661366
-#define ZSMALLOC_MAGIC         0x58295829
 #define DMA_BUF_MAGIC          0x444d4142      /* "DMAB" */
 #define DEVMEM_MAGIC           0x454d444d      /* "DMEM" */
-#define Z3FOLD_MAGIC           0x33
-#define PPC_CMM_MAGIC          0xc7571590
 #define SECRETMEM_MAGIC                0x5345434d      /* "SECM" */
 
 #endif /* __LINUX_MAGIC_H__ */

diff --git a/include/uapi/linux/netfilter/x_tables.h b/include/uapi/linux/netfilter/x_tables.h
index 89ee50d6cf7a5677f51aaef52b9ddd8fe36808ca..15e4a9cd32b70630ee09510d4bebf01dfabe508e 100644 (file)
--- a/include/uapi/linux/netfilter/x_tables.h
+++ b/include/uapi/linux/netfilter/x_tables.h
@@ -28,7 +28,7 @@ struct xt_entry_match {
                __u16 match_size;
        } u;
 
-       unsigned char data[0];
+       unsigned char data[];
 };
 
 struct xt_entry_target {
@@ -119,7 +119,7 @@ struct xt_counters_info {
        unsigned int num_counters;
 
        /* The counters (actually `number' of these). */
-       struct xt_counters counters[0];
+       struct xt_counters counters[];
 };
 
 #define XT_INV_PROTO           0x40    /* Invert the sense of PROTO. */

diff --git a/include/uapi/linux/netfilter_ipv4/ip_tables.h b/include/uapi/linux/netfilter_ipv4/ip_tables.h
index e1ce5b3a2ae95509cb4511848700df680a42ca5d..52024cbc980e6f80f6411e63974ac33d2cbd9006 100644 (file)
--- a/include/uapi/linux/netfilter_ipv4/ip_tables.h
+++ b/include/uapi/linux/netfilter_ipv4/ip_tables.h
@@ -119,7 +119,7 @@ struct ipt_entry {
        struct xt_counters counters;
 
        /* The matches (if any), then the target. */
-       unsigned char elems[0];
+       unsigned char elems[];
 };
 
 /*
@@ -201,7 +201,7 @@ struct ipt_replace {
        struct xt_counters *counters;
 
        /* The entries (hang off end: not really an array). */
-       struct ipt_entry entries[0];
+       struct ipt_entry entries[];
 };
 
 /* The argument to IPT_SO_GET_ENTRIES. */
@@ -213,7 +213,7 @@ struct ipt_get_entries {
        unsigned int size;
 
        /* The entries. */
-       struct ipt_entry entrytable[0];
+       struct ipt_entry entrytable[];
 };
 
 /* Helper functions */

diff --git a/include/uapi/linux/netfilter_ipv6/ip6_tables.h b/include/uapi/linux/netfilter_ipv6/ip6_tables.h
index 7bbead8c7f74b5e295e0f0f77421dc8a7efc9f54..68109ece60abbf655ec4313131b100b8d3795fbf 100644 (file)
--- a/include/uapi/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/uapi/linux/netfilter_ipv6/ip6_tables.h
@@ -241,7 +241,7 @@ struct ip6t_replace {
        struct xt_counters *counters;
 
        /* The entries (hang off end: not really an array). */
-       struct ip6t_entry entries[0];
+       struct ip6t_entry entries[];
 };
 
 /* The argument to IP6T_SO_GET_ENTRIES. */
@@ -253,7 +253,7 @@ struct ip6t_get_entries {
        unsigned int size;
 
        /* The entries. */
-       struct ip6t_entry entrytable[0];
+       struct ip6t_entry entrytable[];
 };
 
 /* Helper functions */

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index c142c0f8ed8ac26516c2d62b47eeaec6454df624..877309d6ca3ce14ff1a13b10eed706a43ea2025a 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -256,7 +256,7 @@ struct tc_u32_sel {
 
        short                   hoff;
        __be32                  hmask;
-       struct tc_u32_key       keys[0];
+       struct tc_u32_key       keys[];
 };
 
 struct tc_u32_mark {
@@ -268,7 +268,7 @@ struct tc_u32_mark {
 struct tc_u32_pcnt {
        __u64 rcnt;
        __u64 rhit;
-       __u64 kcnts[0];
+       __u64 kcnts[];
 };
 
 /* Flags */

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 8f874be7f01e518c3b793bc4b7216b2d722f47b6..f4a540c01b15609444d7c3ce8b67366e4ddee93f 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -440,7 +440,7 @@ struct rtnexthop {
 /* RTA_VIA */
 struct rtvia {
        __kernel_sa_family_t    rtvia_family;
-       __u8                    rtvia_addr[0];
+       __u8                    rtvia_addr[];
 };
 
 /* RTM_CACHEINFO */

diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index 53fdfafcc1535aa7a1d4849f68baf0c36d6f5365..c5f42903b22768639f413ca2358dd9e79157827a 100644 (file)
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -365,7 +365,7 @@ struct sctp_assoc_change {
        __u16 sac_outbound_streams;
        __u16 sac_inbound_streams;
        sctp_assoc_t sac_assoc_id;
-       __u8 sac_info[0];
+       __u8 sac_info[];
 };
 
 /*
@@ -436,7 +436,7 @@ struct sctp_remote_error {
        __u32 sre_length;
        __be16 sre_error;
        sctp_assoc_t sre_assoc_id;
-       __u8 sre_data[0];
+       __u8 sre_data[];
 };
 
 
@@ -453,7 +453,7 @@ struct sctp_send_failed {
        __u32 ssf_error;
        struct sctp_sndrcvinfo ssf_info;
        sctp_assoc_t ssf_assoc_id;
-       __u8 ssf_data[0];
+       __u8 ssf_data[];
 };
 
 struct sctp_send_failed_event {
@@ -463,7 +463,7 @@ struct sctp_send_failed_event {
        __u32 ssf_error;
        struct sctp_sndinfo ssfe_info;
        sctp_assoc_t ssf_assoc_id;
-       __u8 ssf_data[0];
+       __u8 ssf_data[];
 };
 
 /*
@@ -1023,7 +1023,7 @@ struct sctp_getaddrs_old {
 struct sctp_getaddrs {
        sctp_assoc_t            assoc_id; /*input*/
        __u32                   addr_num; /*output*/
-       __u8                    addrs[0]; /*output, variable size*/
+       __u8                    addrs[]; /*output, variable size*/
 };
 
 /* A socket user request obtained via SCTP_GET_ASSOC_STATS that retrieves

diff --git a/include/uapi/linux/seg6.h b/include/uapi/linux/seg6.h
index 329163e4a08d270ec84bc917f94b4e1c9078e105..e888b002b6ed18cad7427208a6299aeab815dded 100644 (file)
--- a/include/uapi/linux/seg6.h
+++ b/include/uapi/linux/seg6.h
@@ -30,7 +30,7 @@ struct ipv6_sr_hdr {
        __u8    flags;
        __u16   tag;
 
-       struct in6_addr segments[0];
+       struct in6_addr segments[];
 };
 
 #define SR6_FLAG1_PROTECTED    (1 << 6)

diff --git a/include/uapi/linux/seg6_iptunnel.h b/include/uapi/linux/seg6_iptunnel.h
index f2e47aada287659084071ef0dfb06328b363d595..e1929d21c0b620e668f8e25d78e5bf04c077b137 100644 (file)
--- a/include/uapi/linux/seg6_iptunnel.h
+++ b/include/uapi/linux/seg6_iptunnel.h
@@ -26,7 +26,7 @@ enum {
 
 struct seg6_iptunnel_encap {
        int mode;
-       struct ipv6_sr_hdr srh[0];
+       struct ipv6_sr_hdr srh[];
 };
 
 #define SEG6_IPTUN_ENCAP_SIZE(x) ((sizeof(*x)) + (((x)->srh->hdrlen + 1) << 3))

diff --git a/include/uapi/linux/virtio_config.h b/include/uapi/linux/virtio_config.h
index 93574a0d0082d54a540ffb02d66525979a277b93..f010cc42a469e5eabc347ac1592abbbd6ea42cc4 100644 (file)
--- a/include/uapi/linux/virtio_config.h
+++ b/include/uapi/linux/virtio_config.h
@@ -52,7 +52,7 @@
  * rest are per-device feature bits.
  */
 #define VIRTIO_TRANSPORT_F_START       28
-#define VIRTIO_TRANSPORT_F_END         38
+#define VIRTIO_TRANSPORT_F_END         41
 
 #ifndef VIRTIO_CONFIG_NO_LEGACY
 /* Do we get callbacks when the ring is completely used, even if we've
@@ -96,4 +96,9 @@
  * Does the device support Single Root I/O Virtualization?
  */
 #define VIRTIO_F_SR_IOV                        37
+
+/*
+ * This feature indicates that the driver can reset a queue individually.
+ */
+#define VIRTIO_F_RING_RESET            40
 #endif /* _LINUX_VIRTIO_CONFIG_H */

diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index ab08237ff2b835d34c4b9907482ac5ca1f8eb469..158bff97fb317ba86c0ad6f0781a37b011fe2a13 100644 (file)
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
@@ -56,7 +56,7 @@
 #define VIRTIO_NET_F_MQ        22      /* Device supports Receive Flow
                                         * Steering */
 #define VIRTIO_NET_F_CTRL_MAC_ADDR 23  /* Set MAC address */
-
+#define VIRTIO_NET_F_NOTF_COAL 53      /* Guest can handle notifications coalescing */
 #define VIRTIO_NET_F_HASH_REPORT  57   /* Supports hash report */
 #define VIRTIO_NET_F_RSS         60    /* Supports RSS RX steering */
 #define VIRTIO_NET_F_RSC_EXT     61    /* extended coalescing info */
@@ -355,4 +355,36 @@ struct virtio_net_hash_config {
 #define VIRTIO_NET_CTRL_GUEST_OFFLOADS   5
 #define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET        0
 
+/*
+ * Control notifications coalescing.
+ *
+ * Request the device to change the notifications coalescing parameters.
+ *
+ * Available with the VIRTIO_NET_F_NOTF_COAL feature bit.
+ */
+#define VIRTIO_NET_CTRL_NOTF_COAL              6
+/*
+ * Set the tx-usecs/tx-max-packets patameters.
+ * tx-usecs - Maximum number of usecs to delay a TX notification.
+ * tx-max-packets - Maximum number of packets to send before a TX notification.
+ */
+struct virtio_net_ctrl_coal_tx {
+       __le32 tx_max_packets;
+       __le32 tx_usecs;
+};
+
+#define VIRTIO_NET_CTRL_NOTF_COAL_TX_SET               0
+
+/*
+ * Set the rx-usecs/rx-max-packets patameters.
+ * rx-usecs - Maximum number of usecs to delay a RX notification.
+ * rx-max-frames - Maximum number of packets to receive before a RX notification.
+ */
+struct virtio_net_ctrl_coal_rx {
+       __le32 rx_max_packets;
+       __le32 rx_usecs;
+};
+
+#define VIRTIO_NET_CTRL_NOTF_COAL_RX_SET               1
+
 #endif /* _LINUX_VIRTIO_NET_H */

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 8f5f1d6e2fa52abbfa94e0c3fe22340bab94f55d..e6289d5bf950a8bcecc6a9b19e9be362ee37d9b0 100644 (file)
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -33,7 +33,7 @@ struct xfrm_sec_ctx {
        __u8    ctx_alg;
        __u16   ctx_len;
        __u32   ctx_sid;
-       char    ctx_str[0];
+       char    ctx_str[];
 };
 
 /* Security Context Domains of Interpretation */
@@ -96,7 +96,7 @@ struct xfrm_replay_state_esn {
        __u32           oseq_hi;
        __u32           seq_hi;
        __u32           replay_window;
-       __u32           bmp[0];
+       __u32           bmp[];
 };
 
 struct xfrm_algo {

diff --git a/rdma/include/uapi/rdma/ib_user_verbs.h b/rdma/include/uapi/rdma/ib_user_verbs.h
index 7dd903d932e54f65c0da53cdd4018feef3db3763..43672cb1fd579866a9e0ed2a1ab2e6143dce79fb 100644 (file)
--- a/rdma/include/uapi/rdma/ib_user_verbs.h
+++ b/rdma/include/uapi/rdma/ib_user_verbs.h
@@ -158,18 +158,18 @@ struct ib_uverbs_ex_cmd_hdr {
 
 struct ib_uverbs_get_context {
        __aligned_u64 response;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_get_context_resp {
        __u32 async_fd;
        __u32 num_comp_vectors;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_query_device {
        __aligned_u64 response;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_query_device_resp {
@@ -278,7 +278,7 @@ struct ib_uverbs_query_port {
        __aligned_u64 response;
        __u8  port_num;
        __u8  reserved[7];
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_query_port_resp {
@@ -308,12 +308,12 @@ struct ib_uverbs_query_port_resp {
 
 struct ib_uverbs_alloc_pd {
        __aligned_u64 response;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_alloc_pd_resp {
        __u32 pd_handle;
-       __u32 driver_data[0];
+       __u32 driver_data[];
 };
 
 struct ib_uverbs_dealloc_pd {
@@ -324,12 +324,12 @@ struct ib_uverbs_open_xrcd {
        __aligned_u64 response;
        __u32 fd;
        __u32 oflags;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_open_xrcd_resp {
        __u32 xrcd_handle;
-       __u32 driver_data[0];
+       __u32 driver_data[];
 };
 
 struct ib_uverbs_close_xrcd {
@@ -343,14 +343,14 @@ struct ib_uverbs_reg_mr {
        __aligned_u64 hca_va;
        __u32 pd_handle;
        __u32 access_flags;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_reg_mr_resp {
        __u32 mr_handle;
        __u32 lkey;
        __u32 rkey;
-       __u32 driver_data[0];
+       __u32 driver_data[];
 };
 
 struct ib_uverbs_rereg_mr {
@@ -362,13 +362,13 @@ struct ib_uverbs_rereg_mr {
        __aligned_u64 hca_va;
        __u32 pd_handle;
        __u32 access_flags;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_rereg_mr_resp {
        __u32 lkey;
        __u32 rkey;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_dereg_mr {
@@ -380,13 +380,13 @@ struct ib_uverbs_alloc_mw {
        __u32 pd_handle;
        __u8  mw_type;
        __u8  reserved[3];
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_alloc_mw_resp {
        __u32 mw_handle;
        __u32 rkey;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_dealloc_mw {
@@ -408,7 +408,7 @@ struct ib_uverbs_create_cq {
        __u32 comp_vector;
        __s32 comp_channel;
        __u32 reserved;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 enum ib_uverbs_ex_create_cq_flags {
@@ -442,13 +442,13 @@ struct ib_uverbs_resize_cq {
        __aligned_u64 response;
        __u32 cq_handle;
        __u32 cqe;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_resize_cq_resp {
        __u32 cqe;
        __u32 reserved;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_poll_cq {
@@ -492,7 +492,7 @@ struct ib_uverbs_wc {
 struct ib_uverbs_poll_cq_resp {
        __u32 count;
        __u32 reserved;
-       struct ib_uverbs_wc wc[0];
+       struct ib_uverbs_wc wc[];
 };
 
 struct ib_uverbs_req_notify_cq {
@@ -585,7 +585,7 @@ struct ib_uverbs_create_qp {
        __u8  qp_type;
        __u8  is_srq;
        __u8  reserved;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 enum ib_uverbs_create_qp_mask {
@@ -624,7 +624,7 @@ struct ib_uverbs_open_qp {
        __u32 qpn;
        __u8  qp_type;
        __u8  reserved[7];
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 /* also used for open response */
@@ -669,7 +669,7 @@ struct ib_uverbs_query_qp {
        __aligned_u64 response;
        __u32 qp_handle;
        __u32 attr_mask;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_query_qp_resp {
@@ -703,7 +703,7 @@ struct ib_uverbs_query_qp_resp {
        __u8  alt_timeout;
        __u8  sq_sig_all;
        __u8  reserved[5];
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_modify_qp {
@@ -824,7 +824,7 @@ struct ib_uverbs_post_send {
        __u32 wr_count;
        __u32 sge_count;
        __u32 wqe_size;
-       struct ib_uverbs_send_wr send_wr[0];
+       struct ib_uverbs_send_wr send_wr[];
 };
 
 struct ib_uverbs_post_send_resp {
@@ -843,7 +843,7 @@ struct ib_uverbs_post_recv {
        __u32 wr_count;
        __u32 sge_count;
        __u32 wqe_size;
-       struct ib_uverbs_recv_wr recv_wr[0];
+       struct ib_uverbs_recv_wr recv_wr[];
 };
 
 struct ib_uverbs_post_recv_resp {
@@ -856,7 +856,7 @@ struct ib_uverbs_post_srq_recv {
        __u32 wr_count;
        __u32 sge_count;
        __u32 wqe_size;
-       struct ib_uverbs_recv_wr recv[0];
+       struct ib_uverbs_recv_wr recv[];
 };
 
 struct ib_uverbs_post_srq_recv_resp {
@@ -869,12 +869,12 @@ struct ib_uverbs_create_ah {
        __u32 pd_handle;
        __u32 reserved;
        struct ib_uverbs_ah_attr attr;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_create_ah_resp {
        __u32 ah_handle;
-       __u32 driver_data[0];
+       __u32 driver_data[];
 };
 
 struct ib_uverbs_destroy_ah {
@@ -886,7 +886,7 @@ struct ib_uverbs_attach_mcast {
        __u32 qp_handle;
        __u16 mlid;
        __u16 reserved;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_detach_mcast {
@@ -894,7 +894,7 @@ struct ib_uverbs_detach_mcast {
        __u32 qp_handle;
        __u16 mlid;
        __u16 reserved;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_flow_spec_hdr {
@@ -1135,7 +1135,7 @@ struct ib_uverbs_flow_attr {
         * struct ib_flow_spec_xxx
         * struct ib_flow_spec_yyy
         */
-       struct ib_uverbs_flow_spec_hdr flow_specs[0];
+       struct ib_uverbs_flow_spec_hdr flow_specs[];
 };
 
 struct ib_uverbs_create_flow  {
@@ -1161,7 +1161,7 @@ struct ib_uverbs_create_srq {
        __u32 max_wr;
        __u32 max_sge;
        __u32 srq_limit;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_create_xsrq {
@@ -1175,7 +1175,7 @@ struct ib_uverbs_create_xsrq {
        __u32 max_num_tags;
        __u32 xrcd_handle;
        __u32 cq_handle;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_create_srq_resp {
@@ -1183,7 +1183,7 @@ struct ib_uverbs_create_srq_resp {
        __u32 max_wr;
        __u32 max_sge;
        __u32 srqn;
-       __u32 driver_data[0];
+       __u32 driver_data[];
 };
 
 struct ib_uverbs_modify_srq {
@@ -1191,14 +1191,14 @@ struct ib_uverbs_modify_srq {
        __u32 attr_mask;
        __u32 max_wr;
        __u32 srq_limit;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_query_srq {
        __aligned_u64 response;
        __u32 srq_handle;
        __u32 reserved;
-       __aligned_u64 driver_data[0];
+       __aligned_u64 driver_data[];
 };
 
 struct ib_uverbs_query_srq_resp {
@@ -1269,7 +1269,7 @@ struct ib_uverbs_ex_create_rwq_ind_table  {
         * wq_handle1
         * wq_handle2
         */
-       __u32 wq_handles[0];
+       __u32 wq_handles[];
 };
 
 struct ib_uverbs_ex_create_rwq_ind_table_resp {

diff --git a/rdma/include/uapi/rdma/rdma_user_cm.h b/rdma/include/uapi/rdma/rdma_user_cm.h
index ed5a514305c1dc9612ab5f80a71aa5a8bc83d901..7cea03581f790613fbf176b8024fa16c9e09fb56 100644 (file)
--- a/rdma/include/uapi/rdma/rdma_user_cm.h
+++ b/rdma/include/uapi/rdma/rdma_user_cm.h
@@ -184,7 +184,7 @@ struct rdma_ucm_query_addr_resp {
 struct rdma_ucm_query_path_resp {
        __u32 num_paths;
        __u32 reserved;
-       struct ib_path_rec_data path_data[0];
+       struct ib_path_rec_data path_data[];
 };
 
 struct rdma_ucm_conn_param {

diff --git a/vdpa/include/uapi/linux/vdpa.h b/vdpa/include/uapi/linux/vdpa.h
index 7f52e703f1ad1d793ec708d1f07250053fdbc64d..94e4dad1d86c764ac452097e8a25256b432f9a4a 100644 (file)
--- a/vdpa/include/uapi/linux/vdpa.h
+++ b/vdpa/include/uapi/linux/vdpa.h
@@ -18,7 +18,7 @@ enum vdpa_command {
        VDPA_CMD_DEV_DEL,
        VDPA_CMD_DEV_GET,               /* can dump */
        VDPA_CMD_DEV_CONFIG_GET,        /* can dump */
-       VDPA_CMD_DEV_STATS_GET,
+       VDPA_CMD_DEV_VSTATS_GET,
 };
 
 enum vdpa_attr {
@@ -48,9 +48,9 @@ enum vdpa_attr {
        VDPA_ATTR_DEV_MGMTDEV_MAX_VQS,          /* u32 */
        VDPA_ATTR_DEV_SUPPORTED_FEATURES,       /* u64 */
 
-       VDPA_ATTR_DEV_QUEUE_INDEX,              /* u32 */
+       VDPA_ATTR_DEV_QUEUE_INDEX,              /* u32 */
        VDPA_ATTR_DEV_VENDOR_ATTR_NAME,         /* string */
-       VDPA_ATTR_DEV_VENDOR_ATTR_VALUE,        /* u64 */
+       VDPA_ATTR_DEV_VENDOR_ATTR_VALUE,        /* u64 */
 
        /* new attributes must be added above here */
        VDPA_ATTR_MAX,