include: update kernel headers from v7.2-rc5

It seems there is no notable changes to us.

diff --git a/src/include/uapi/linux/bpf.h b/src/include/uapi/linux/bpf.h
index 2ae9d05cb4e156bf220c9763991c4260c8a03b9c..a14e19aaba0ed51ae7cf931b699a818da4d5d4d2 100644 (file)
--- a/src/include/uapi/linux/bpf.h
+++ b/src/include/uapi/linux/bpf.h
@@ -994,6 +994,7 @@ enum bpf_cmd {
        BPF_PROG_STREAM_READ_BY_FD,
        BPF_PROG_ASSOC_STRUCT_OPS,
        __MAX_BPF_CMD,
+       BPF_COMMON_ATTRS = 1 << 16, /* Indicate carrying syscall common attrs. */
 };
 
 enum bpf_map_type {
@@ -1046,6 +1047,7 @@ enum bpf_map_type {
        BPF_MAP_TYPE_CGRP_STORAGE,
        BPF_MAP_TYPE_ARENA,
        BPF_MAP_TYPE_INSN_ARRAY,
+       BPF_MAP_TYPE_RHASH,
        __MAX_BPF_MAP_TYPE
 };
 
@@ -1154,6 +1156,9 @@ enum bpf_attach_type {
        BPF_TRACE_KPROBE_SESSION,
        BPF_TRACE_UPROBE_SESSION,
        BPF_TRACE_FSESSION,
+       BPF_TRACE_FENTRY_MULTI,
+       BPF_TRACE_FEXIT_MULTI,
+       BPF_TRACE_FSESSION_MULTI,
        __MAX_BPF_ATTACH_TYPE
 };
 
@@ -1178,6 +1183,7 @@ enum bpf_link_type {
        BPF_LINK_TYPE_UPROBE_MULTI = 12,
        BPF_LINK_TYPE_NETKIT = 13,
        BPF_LINK_TYPE_SOCKMAP = 14,
+       BPF_LINK_TYPE_TRACING_MULTI = 15,
        __MAX_BPF_LINK_TYPE,
 };
 
@@ -1321,7 +1327,11 @@ enum {
  * BPF_TRACE_UPROBE_MULTI attach type to create return probe.
  */
 enum {
-       BPF_F_UPROBE_MULTI_RETURN = (1U << 0)
+       /* Get return uprobe. */
+       BPF_F_UPROBE_MULTI_RETURN     = (1U << 0),
+
+       /* Get path from provided path_fd. */
+       BPF_F_UPROBE_MULTI_PATH_FD    = (1U << 1),
 };
 
 /* link_create.netfilter.flags used in LINK_CREATE command for
@@ -1500,6 +1510,13 @@ struct bpf_stack_build_id {
        };
 };
 
+struct bpf_common_attr {
+       __aligned_u64 log_buf;
+       __u32 log_size;
+       __u32 log_level;
+       __u32 log_true_size;
+};
+
 #define BPF_OBJ_NAME_LEN 16U
 
 enum {
@@ -1537,6 +1554,11 @@ union bpf_attr {
                 *
                 * BPF_MAP_TYPE_ARENA - contains the address where user space
                 * is going to mmap() the arena. It has to be page aligned.
+                *
+                * BPF_MAP_TYPE_RHASH - initial table size hint
+                * (nelem_hint). 0 = use rhashtable default. Must be
+                * <= min(max_entries, U16_MAX). Upper 32 bits reserved,
+                * must be zero.
                 */
                __u64   map_extra;
 
@@ -1846,6 +1868,7 @@ union bpf_attr {
                                __u32           cnt;
                                __u32           flags;
                                __u32           pid;
+                               __u32           path_fd;
                        } uprobe_multi;
                        struct {
                                union {
@@ -1861,6 +1884,11 @@ union bpf_attr {
                                };
                                __u64           expected_revision;
                        } cgroup;
+                       struct {
+                               __aligned_u64   ids;
+                               __aligned_u64   cookies;
+                               __u32           cnt;
+                       } tracing_multi;
                };
        } link_create;
 
@@ -6698,6 +6726,7 @@ struct bpf_prog_info {
        __u32 verified_insns;
        __u32 attach_btf_obj_id;
        __u32 attach_btf_id;
+       __u32 :32;
 } __attribute__((aligned(8)));
 
 struct bpf_map_info {
@@ -6719,6 +6748,7 @@ struct bpf_map_info {
        __u64 map_extra;
        __aligned_u64 hash;
        __u32 hash_size;
+       __u32 :32;
 } __attribute__((aligned(8)));
 
 struct bpf_btf_info {

diff --git a/src/include/uapi/linux/btrfs.h b/src/include/uapi/linux/btrfs.h
index 2988d1b29a8dad2bc922a0174ec811cfbe4d8c30..8d713d9c2dd4a6166f4377f0b58236e09ffaabc5 100644 (file)
--- a/src/include/uapi/linux/btrfs.h
+++ b/src/include/uapi/linux/btrfs.h
@@ -596,7 +596,7 @@ struct btrfs_ioctl_search_args_v2 {
        __u64 buf_size;            /* in - size of buffer
                                            * out - on EOVERFLOW: needed size
                                            *       to store item */
-       __u64 buf[];                       /* out - found items */
+       __u8 buf[];                        /* out - found items */
 };
 
 /* With a @src_length of zero, the range from @src_offset->EOF is cloned! */
@@ -1098,6 +1098,38 @@ enum btrfs_err_code {
        BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET,
 };
 
+/* Flags for struct btrfs_ioctl_get_csums_entry::type. */
+#define BTRFS_GET_CSUMS_HAS_CSUMS                      (1U << 0)
+#define BTRFS_GET_CSUMS_ZEROED                         (1U << 1)
+#define BTRFS_GET_CSUMS_NODATASUM                      (1U << 2)
+#define BTRFS_GET_CSUMS_COMPRESSED                     (1U << 3)
+#define BTRFS_GET_CSUMS_ENCRYPTED                      (1U << 4)
+#define BTRFS_GET_CSUMS_INLINE                         (1U << 5)
+
+struct btrfs_ioctl_get_csums_entry {
+       /* File offset of this range. */
+       __u64 offset;
+       /* Length in bytes. */
+       __u64 length;
+       /* One of BTRFS_GET_CSUMS_* types. */
+       __u32 type;
+       /* Padding, must be 0. */
+       __u32 reserved;
+};
+
+struct btrfs_ioctl_get_csums_args {
+       /* In/out: file offset in bytes. */
+       __u64 offset;
+       /* In/out: range length in bytes. */
+       __u64 length;
+       /* In/out: buffer capacity / bytes written. */
+       __u64 buf_size;
+       /* In: flags, must be 0 for now. */
+       __u64 flags;
+       /* Out: entries of type btrfs_ioctl_get_csums_entry + csum data */
+       __u8 buf[];
+};
+
 /* Flags for IOC_SHUTDOWN, must match XFS_FSOP_GOING_FLAGS_* flags. */
 #define BTRFS_SHUTDOWN_FLAGS_DEFAULT                   0x0
 #define BTRFS_SHUTDOWN_FLAGS_LOGFLUSH                  0x1
@@ -1224,6 +1256,8 @@ enum btrfs_err_code {
                                     struct btrfs_ioctl_encoded_io_args)
 #define BTRFS_IOC_SUBVOL_SYNC_WAIT _IOW(BTRFS_IOCTL_MAGIC, 65, \
                                        struct btrfs_ioctl_subvol_wait)
+#define BTRFS_IOC_GET_CSUMS _IOWR(BTRFS_IOCTL_MAGIC, 66, \
+                                 struct btrfs_ioctl_get_csums_args)
 
 /* Shutdown ioctl should follow XFS's interfaces, thus not using btrfs magic. */
 #define BTRFS_IOC_SHUTDOWN     _IOR('X', 125, __u32)

diff --git a/src/include/uapi/linux/ethtool.h b/src/include/uapi/linux/ethtool.h
index fc439ea218f8616e36a03c00b36546c3a9225eb7..f38038c1efd5637af4bdc7f8cfc0628f146f8328 100644 (file)
--- a/src/include/uapi/linux/ethtool.h
+++ b/src/include/uapi/linux/ethtool.h
@@ -291,6 +291,9 @@ enum phy_tunable_id {
        ETHTOOL_PHY_DOWNSHIFT,
        ETHTOOL_PHY_FAST_LINK_DOWN,
        ETHTOOL_PHY_EDPD,
+       ETHTOOL_PHY_SHORT_CABLE_PRESET,
+       ETHTOOL_PHY_LPF_BW,
+       ETHTOOL_PHY_DSP_EQ_INIT_VALUE,
        /*
         * Add your fresh new phy tunable attribute above and remember to update
         * phy_tunable_strings[] in net/ethtool/common.c

diff --git a/src/include/uapi/linux/fs.h b/src/include/uapi/linux/fs.h
index 6e9a44969f22980cf718cfb951974ddd564f0ca1..dadf67c48df042b01236247e36c6c28fe71c258a 100644 (file)
--- a/src/include/uapi/linux/fs.h
+++ b/src/include/uapi/linux/fs.h
@@ -250,6 +250,13 @@ struct file_attr {
 #define FS_XFLAG_DAX           0x00008000      /* use DAX for IO */
 #define FS_XFLAG_COWEXTSIZE    0x00010000      /* CoW extent size allocator hint */
 #define FS_XFLAG_VERITY                0x00020000      /* fs-verity enabled */
+/*
+ * Case handling flags (read-only, cannot be set via ioctl).
+ * Default (neither set) indicates POSIX semantics: case-sensitive
+ * lookups and case-preserving storage.
+ */
+#define FS_XFLAG_CASEFOLD      0x00040000      /* case-insensitive lookups */
+#define FS_XFLAG_CASENONPRESERVING 0x00080000  /* case not preserved */
 #define FS_XFLAG_HASATTR       0x80000000      /* no DIFLAG for this   */
 
 /* the read-only stuff doesn't really belong here, but any other place is
@@ -384,7 +391,16 @@ struct file_attr {
 #define FS_DAX_FL                      0x02000000 /* Inode is DAX */
 #define FS_INLINE_DATA_FL              0x10000000 /* Reserved for ext4 */
 #define FS_PROJINHERIT_FL              0x20000000 /* Create with parents projid */
-#define FS_CASEFOLD_FL                 0x40000000 /* Folder is case insensitive */
+/*
+ * FS_CASEFOLD_FL indicates case-insensitive name lookup. The
+ * bit is most often reported on directories, where it controls
+ * lookups of entries within. Filesystems that derive
+ * case-insensitivity from mount or volume state may also report
+ * it on non-directory inodes; userspace must not assume the bit
+ * is directory-only. FS_XFLAG_CASEFOLD reports the same
+ * information read-only via FS_IOC_FSGETXATTR.
+ */
+#define FS_CASEFOLD_FL                 0x40000000
 #define FS_RESERVED_FL                 0x80000000 /* reserved for ext2 lib */
 
 #define FS_FL_USER_VISIBLE             0x0003DFFF /* User visible flags */

diff --git a/src/include/uapi/linux/if_bridge.h b/src/include/uapi/linux/if_bridge.h
index 4d7509c4b84d992ec89e522ad934ac3586920d7a..643f5f08bd872ea8f6c4a2ef178c1c8b9a5c2630 100644 (file)
--- a/src/include/uapi/linux/if_bridge.h
+++ b/src/include/uapi/linux/if_bridge.h
@@ -526,6 +526,7 @@ enum {
        BRIDGE_VLANDB_ENTRY_MCAST_N_GROUPS,
        BRIDGE_VLANDB_ENTRY_MCAST_MAX_GROUPS,
        BRIDGE_VLANDB_ENTRY_NEIGH_SUPPRESS,
+       BRIDGE_VLANDB_ENTRY_NEIGH_FORWARD_GRAT,
        __BRIDGE_VLANDB_ENTRY_MAX,
 };
 #define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)

diff --git a/src/include/uapi/linux/if_ether.h b/src/include/uapi/linux/if_ether.h
index 7867b630dcec85b137c6662b24d198f457ac2dca..cc75a6f80c042d23969bc3a03a3ca6d78f3c085b 100644 (file)
--- a/src/include/uapi/linux/if_ether.h
+++ b/src/include/uapi/linux/if_ether.h
@@ -82,6 +82,7 @@
 #define ETH_P_PPP_DISC 0x8863          /* PPPoE discovery messages     */
 #define ETH_P_PPP_SES  0x8864          /* PPPoE session messages       */
 #define ETH_P_LINK_CTL 0x886c          /* HPNA, wlan link local tunnel */
+#define ETH_P_8021AC   0x8870          /* 802.1AC LLC > 1500 bytes     */
 #define ETH_P_ATMFATE  0x8884          /* Frame-based ATM Transport
                                         * over Ethernet
                                         */
@@ -123,6 +124,7 @@
 #define ETH_P_DSA_A5PSW        0xE001          /* A5PSW Tag Value [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_IFE      0xED3E          /* ForCES inter-FE LFB type */
 #define ETH_P_AF_IUCV   0xFBFB         /* IBM af_iucv [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_NXP_NETC  0xFD3A         /* NXP NETC DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
 
 #define ETH_P_802_3_MIN        0x0600          /* If the value in the ethernet type is more than this value
                                         * then the frame is Ethernet II. Else it is 802.3 */
@@ -163,6 +165,10 @@
 #define ETH_P_MCTP     0x00FA          /* Management component transport
                                         * protocol packets
                                         */
+#define ETH_P_GRE_OSI  0x00FE          /* GRE tunnels: LLC "fe fe 03" analog,
+                                        * used primarily for IS-IS over GRE
+                                        * WARNING: not internal, used on wire!
+                                        */
 
 /*
  *     This is an Ethernet frame header.

diff --git a/src/include/uapi/linux/if_link.h b/src/include/uapi/linux/if_link.h
index a8c64be26f2caa7f56f10f5c393f253a05c50547..d3a21fba113596da886cd7f21e1317102f64e2a0 100644 (file)
--- a/src/include/uapi/linux/if_link.h
+++ b/src/include/uapi/linux/if_link.h
@@ -1083,6 +1083,22 @@ enum {
  *   Note that this option only takes effect when *IFLA_BRPORT_NEIGH_SUPPRESS*
  *   is enabled for a given port.
  *
+ * @IFLA_BRPORT_NEIGH_FORWARD_GRAT
+ *   Controls whether gratuitous ARP packets and unsolicited Neighbor
+ *   Advertisement packets are forwarded on a given port even when neighbor
+ *   suppression is enabled.
+ *   By default this flag is off, meaning gratuitous ARP and unsolicited NA
+ *   packets will be suppressed when neighbor suppression is enabled.
+ *   Setting this flag to on allows these packets to be forwarded even
+ *   when *IFLA_BRPORT_NEIGH_SUPPRESS* or *IFLA_BRPORT_NEIGH_VLAN_SUPPRESS*
+ *   is enabled.
+ *
+ *   Note that this option only takes effect when *IFLA_BRPORT_NEIGH_SUPPRESS*
+ *   or *IFLA_BRPORT_NEIGH_VLAN_SUPPRESS* is enabled for a given port.
+ *   When *IFLA_BRPORT_NEIGH_VLAN_SUPPRESS* is set, this port-level flag is
+ *   ignored and per-VLAN control is available via
+ *   *BRIDGE_VLANDB_ENTRY_NEIGH_FORWARD_GRAT*.
+ *
  * @IFLA_BRPORT_BACKUP_NHID
  *   The FDB nexthop object ID to attach to packets being redirected to a
  *   backup port that has VLAN tunnel mapping enabled (via the
@@ -1135,6 +1151,7 @@ enum {
        IFLA_BRPORT_MCAST_MAX_GROUPS,
        IFLA_BRPORT_NEIGH_VLAN_SUPPRESS,
        IFLA_BRPORT_BACKUP_NHID,
+       IFLA_BRPORT_NEIGH_FORWARD_GRAT,
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -1487,6 +1504,8 @@ enum {
        IFLA_GENEVE_INNER_PROTO_INHERIT,
        IFLA_GENEVE_PORT_RANGE,
        IFLA_GENEVE_GRO_HINT,
+       IFLA_GENEVE_LOCAL,
+       IFLA_GENEVE_LOCAL6,
        __IFLA_GENEVE_MAX
 };
 #define IFLA_GENEVE_MAX        (__IFLA_GENEVE_MAX - 1)
@@ -1582,6 +1601,7 @@ enum {
        IFLA_BOND_NS_IP6_TARGET,
        IFLA_BOND_COUPLED_CONTROL,
        IFLA_BOND_BROADCAST_NEIGH,
+       IFLA_BOND_LACP_STRICT,
        __IFLA_BOND_MAX,
 };
 

diff --git a/src/include/uapi/linux/liveupdate.h b/src/include/uapi/linux/liveupdate.h
index 4043d4038712552f7431b656f1228ddadbb0f398..731c39367d5c85726dacb72554bc64351a1e04e7 100644 (file)
--- a/src/include/uapi/linux/liveupdate.h
+++ b/src/include/uapi/linux/liveupdate.h
@@ -8,8 +8,8 @@
  * Pasha Tatashin <pasha.tatashin@soleen.com>
  */
 
-#ifndef _UAPI_LIVEUPDATE_H
-#define _UAPI_LIVEUPDATE_H
+#ifndef _LIVEUPDATE_H
+#define _LIVEUPDATE_H
 
 #include <linux/ioctl.h>
 #include <linux/types.h>
@@ -236,4 +236,4 @@ struct liveupdate_session_get_name {
 #define LIVEUPDATE_SESSION_GET_NAME                                    \
        _IO(LIVEUPDATE_IOCTL_TYPE, LIVEUPDATE_CMD_SESSION_GET_NAME)
 
-#endif /* _UAPI_LIVEUPDATE_H */
+#endif /* _LIVEUPDATE_H */

diff --git a/src/include/uapi/linux/nl80211.h b/src/include/uapi/linux/nl80211.h
index 3d55bf4be36fe5f55b8e7171c825c476f56c9926..9998f6c0a665ccb4797a124bc7eed44bfc85fa42 100644 (file)
--- a/src/include/uapi/linux/nl80211.h
+++ b/src/include/uapi/linux/nl80211.h
@@ -729,7 +729,9 @@
  *     to remain on the channel. This command is also used as an event to
  *     notify when the requested duration starts (it may take a while for the
  *     driver to schedule this time due to other concurrent needs for the
- *     radio).
+ *     radio). An optional attribute %NL80211_ATTR_MAC can be used to filter
+ *     incoming frames during remain-on-channel, such that frames
+ *     addressed to the specified destination MAC are reported.
  *     When called, this operation returns a cookie (%NL80211_ATTR_COOKIE)
  *     that will be included with any events pertaining to this request;
  *     the cookie is also used to cancel the request.
@@ -1204,10 +1206,12 @@
  *     user space through the connect result as the user space would have
  *     initiated the connection through the connect request.
  *
- * @NL80211_CMD_STA_OPMODE_CHANGED: An event that notify station's
- *     ht opmode or vht opmode changes using any of %NL80211_ATTR_SMPS_MODE,
- *     %NL80211_ATTR_CHANNEL_WIDTH,%NL80211_ATTR_NSS attributes with its
- *     address(specified in %NL80211_ATTR_MAC).
+ * @NL80211_CMD_STA_OPMODE_CHANGED: An event that notifies that a station's
+ *     HT opmode or VHT opmode changed using any of %NL80211_ATTR_SMPS_MODE,
+ *     %NL80211_ATTR_CHANNEL_WIDTH, %NL80211_ATTR_NSS attributes with its
+ *     address (specified in %NL80211_ATTR_MAC).
+ *     Note that 80+80 and 160 MHz might not be differentiated, i.e. may
+ *     report %NL80211_CHAN_WIDTH_160 instead of %NL80211_CHAN_WIDTH_80P80.
  *
  * @NL80211_CMD_GET_FTM_RESPONDER_STATS: Retrieve FTM responder statistics, in
  *     the %NL80211_ATTR_FTM_RESPONDER_STATS attribute.
@@ -1415,6 +1419,12 @@
  *     identifying the evacuated channel.
  *     User space may reconfigure the local schedule in response to this
  *     notification.
+ * @NL80211_CMD_START_PD: Start PD operation, identified by its
+ *     %NL80211_ATTR_WDEV interface. This interface must have been previously
+ *     created with %NL80211_CMD_NEW_INTERFACE.
+ * @NL80211_CMD_STOP_PD: Stop the PD operation, identified by
+ *     its %NL80211_ATTR_WDEV interface.
+ *
  * @NL80211_CMD_MAX: highest used command number
  * @__NL80211_CMD_AFTER_LAST: internal use
  */
@@ -1690,6 +1700,9 @@ enum nl80211_commands {
 
        NL80211_CMD_NAN_CHANNEL_EVAC,
 
+       NL80211_CMD_START_PD,
+       NL80211_CMD_STOP_PD,
+
        /* add new commands above here */
 
        /* used to define NL80211_CMD_MAX below */
@@ -2991,11 +3004,13 @@ enum nl80211_commands {
  * @NL80211_ATTR_EPCS: Flag attribute indicating that EPCS is enabled for a
  *     station interface.
  *
- * @NL80211_ATTR_ASSOC_MLD_EXT_CAPA_OPS: Extended MLD capabilities and
- *     operations that userspace implements to use during association/ML
- *     link reconfig, currently only "BTM MLD Recommendation For Multiple
- *     APs Support". Drivers may set additional flags that they support
- *     in the kernel or device.
+ * @NL80211_ATTR_EXT_MLD_CAPA_AND_OPS: Extended MLD capabilities and operations.
+ *     For association and link reconfiguration, indicates extra capabilities
+ *     that userspace implements, currently only "BTM MLD Recommendation For
+ *     Multiple APs Support".
+ *     For wiphy information, additional flags that drivers will set, but
+ *     this is informational only for userspace (it's not expected to set
+ *     these.)
  *
  * @NL80211_ATTR_WIPHY_RADIO_INDEX: (int) Integer attribute denoting the index
  *     of the radio in interest. Internally a value of -1 is used to
@@ -3140,6 +3155,16 @@ enum nl80211_commands {
  *     association response etc., since it's abridged in the beacon. Used
  *     for START_AP etc.
  *
+ * @NL80211_ATTR_ASSOC_ENCRYPTED: Flag attribute, used only with the
+ *     %NL80211_CMD_CONNECT event in SME-in-driver mode. The driver should
+ *     set this flag to indicate that both the (Re)Association Request frame
+ *     and the corresponding (Re)Association Response frame are transmitted
+ *     encrypted over the air. Enhanced Privacy Protection (EPP), as defined
+ *     in IEEE P802.11bi/D4.0, mandates this encryption.
+ *
+ * @NL80211_ATTR_NPCA_PRIMARY_FREQ: NPCA primary channel (u32)
+ * @NL80211_ATTR_NPCA_PUNCT_BITMAP: NPCA puncturing bitmap (u32)
+ *
  * @NUM_NL80211_ATTR: total number of nl80211_attrs available
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3695,7 +3720,7 @@ enum nl80211_attrs {
        NL80211_ATTR_MLO_RECONF_REM_LINKS,
        NL80211_ATTR_EPCS,
 
-       NL80211_ATTR_ASSOC_MLD_EXT_CAPA_OPS,
+       NL80211_ATTR_EXT_MLD_CAPA_AND_OPS,
 
        NL80211_ATTR_WIPHY_RADIO_INDEX,
 
@@ -3733,6 +3758,11 @@ enum nl80211_attrs {
        NL80211_ATTR_NAN_MAX_CHAN_SWITCH_TIME,
        NL80211_ATTR_NAN_PEER_MAPS,
 
+       NL80211_ATTR_ASSOC_ENCRYPTED,
+
+       NL80211_ATTR_NPCA_PRIMARY_FREQ,
+       NL80211_ATTR_NPCA_PUNCT_BITMAP,
+
        /* add attributes here, update the policy in nl80211.c */
 
        __NL80211_ATTR_AFTER_LAST,
@@ -3747,6 +3777,7 @@ enum nl80211_attrs {
 #define NL80211_ATTR_SAE_DATA NL80211_ATTR_AUTH_DATA
 #define NL80211_ATTR_CSA_C_OFF_BEACON NL80211_ATTR_CNTDWN_OFFS_BEACON
 #define NL80211_ATTR_CSA_C_OFF_PRESP NL80211_ATTR_CNTDWN_OFFS_PRESP
+#define NL80211_ATTR_ASSOC_MLD_EXT_CAPA_OPS NL80211_ATTR_EXT_MLD_CAPA_AND_OPS
 
 /*
  * Allow user space programs to use #ifdef on new attributes by defining them
@@ -3829,6 +3860,7 @@ enum nl80211_attrs {
  * @NL80211_IFTYPE_NAN_DATA: NAN data interface type (netdev); NAN data
  *     interfaces can only be brought up (IFF_UP) when a NAN interface
  *     already exists and NAN has been started (using %NL80211_CMD_START_NAN).
+ * @NL80211_IFTYPE_PD: PD device interface type (not a netdev)
  * @NL80211_IFTYPE_MAX: highest interface type number currently defined
  * @NUM_NL80211_IFTYPES: number of defined interface types
  *
@@ -3851,6 +3883,7 @@ enum nl80211_iftype {
        NL80211_IFTYPE_OCB,
        NL80211_IFTYPE_NAN,
        NL80211_IFTYPE_NAN_DATA,
+       NL80211_IFTYPE_PD,
 
        /* keep last */
        NUM_NL80211_IFTYPES,
@@ -5790,6 +5823,18 @@ enum nl80211_key_default_types {
  * @NL80211_KEY_MODE: the mode from enum nl80211_key_mode.
  *     Defaults to @NL80211_KEY_RX_TX.
  * @NL80211_KEY_DEFAULT_BEACON: flag indicating default Beacon frame key
+ * @NL80211_KEY_LTF_SEED: LTF key seed is used by the driver to generate
+ *     secure LTF keys used in case of peer measurement request with FTM
+ *     request type as either %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED
+ *     or %NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED. Secure LTF key seeds
+ *     will help enable PHY security in peer measurement session.
+ *     The LTF key seed is installed along with the TK (Temporal Key) using
+ *     %NL80211_CMD_NEW_KEY. The TK is configured using the
+ *     %NL80211_ATTR_KEY_DATA attribute, while the LTF key seed is configured
+ *     using this attribute. Both keys must be configured before initiation
+ *     of peer measurement to ensure peer measurement session is secure.
+ *     Only valid if %NL80211_EXT_FEATURE_SET_KEY_LTF_SEED is set. This
+ *     attribute is restricted to pairwise keys (%NL80211_KEYTYPE_PAIRWISE).
  *
  * @__NL80211_KEY_AFTER_LAST: internal
  * @NL80211_KEY_MAX: highest key attribute
@@ -5806,6 +5851,7 @@ enum nl80211_key_attributes {
        NL80211_KEY_DEFAULT_TYPES,
        NL80211_KEY_MODE,
        NL80211_KEY_DEFAULT_BEACON,
+       NL80211_KEY_LTF_SEED,
 
        /* keep last */
        __NL80211_KEY_AFTER_LAST,
@@ -7029,6 +7075,16 @@ enum nl80211_feature_flags {
  *     (NL80211_CMD_AUTHENTICATE) in non-AP STA mode, as specified in
  *     "IEEE P802.11bi/D4.0, 12.16.5".
  *
+ * @NL80211_EXT_FEATURE_ROC_ADDR_FILTER: Driver supports MAC address
+ *     filtering during remain-on-channel. When %NL80211_ATTR_MAC is
+ *     provided with %NL80211_CMD_REMAIN_ON_CHANNEL, the driver will
+ *     forward frames with a matching MAC address to userspace during
+ *     the off-channel period.
+ *
+ * @NL80211_EXT_FEATURE_SET_KEY_LTF_SEED: Driver supports installing the
+ *     LTF key seed via %NL80211_KEY_LTF_SEED. The seed is used to generate
+ *     secure LTF keys for secure LTF measurement sessions.
+ *
  * @NUM_NL80211_EXT_FEATURES: number of extended features.
  * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
  */
@@ -7108,6 +7164,8 @@ enum nl80211_ext_feature_index {
        NL80211_EXT_FEATURE_EPPKE,
        NL80211_EXT_FEATURE_ASSOC_FRAME_ENCRYPTION,
        NL80211_EXT_FEATURE_IEEE8021X_AUTH,
+       NL80211_EXT_FEATURE_ROC_ADDR_FILTER,
+       NL80211_EXT_FEATURE_SET_KEY_LTF_SEED,
 
        /* add new features before the definition below */
        NUM_NL80211_EXT_FEATURES,
@@ -7960,6 +8018,26 @@ enum nl80211_peer_measurement_resp {
        NL80211_PMSR_RESP_ATTR_MAX = NUM_NL80211_PMSR_RESP_ATTRS - 1
 };
 
+/**
+ * enum nl80211_peer_measurement_ftm_req_type - FTM ranging request type,
+ *     used with %NL80211_PMSR_PEER_ATTR_REQ_TYPE
+ *
+ * @NL80211_PMSR_FTM_REQ_TYPE_INFRA: infrastructure ranging, i.e. STA-to-AP
+ * @NL80211_PMSR_FTM_REQ_TYPE_PD: peer-to-peer ranging as defined in the
+ *     Wi-Fi Alliance specification "Proximity Ranging (PR) Implementation
+ *     Consideration Draft 1.9 Rev 1"
+ * @NUM_NL80211_PMSR_FTM_REQ_TYPE: internal
+ * @NL80211_PMSR_FTM_REQ_TYPE_MAX: highest request type value
+ */
+enum nl80211_peer_measurement_ftm_req_type {
+       NL80211_PMSR_FTM_REQ_TYPE_INFRA,
+       NL80211_PMSR_FTM_REQ_TYPE_PD,
+
+       /* keep last */
+       NUM_NL80211_PMSR_FTM_REQ_TYPE,
+       NL80211_PMSR_FTM_REQ_TYPE_MAX = NUM_NL80211_PMSR_FTM_REQ_TYPE - 1
+};
+
 /**
  * enum nl80211_peer_measurement_peer_attrs - peer attributes for measurement
  * @__NL80211_PMSR_PEER_ATTR_INVALID: invalid
@@ -7973,6 +8051,9 @@ enum nl80211_peer_measurement_resp {
  * @NL80211_PMSR_PEER_ATTR_RESP: This is a nested attribute indexed by
  *     measurement type, with attributes from the
  *     &enum nl80211_peer_measurement_resp inside.
+ * @NL80211_PMSR_PEER_ATTR_REQ_TYPE: u32 attribute specifying the ranging
+ *     request type, using values from &enum nl80211_peer_measurement_ftm_req_type.
+ *     If absent, defaults to %NL80211_PMSR_FTM_REQ_TYPE_INFRA.
  *
  * @NUM_NL80211_PMSR_PEER_ATTRS: internal
  * @NL80211_PMSR_PEER_ATTR_MAX: highest attribute number
@@ -7984,6 +8065,7 @@ enum nl80211_peer_measurement_peer_attrs {
        NL80211_PMSR_PEER_ATTR_CHAN,
        NL80211_PMSR_PEER_ATTR_REQ,
        NL80211_PMSR_PEER_ATTR_RESP,
+       NL80211_PMSR_PEER_ATTR_REQ_TYPE,
 
        /* keep last */
        NUM_NL80211_PMSR_PEER_ATTRS,
@@ -8010,6 +8092,18 @@ enum nl80211_peer_measurement_peer_attrs {
  *     meaningless, just a list of peers to measure with, with the
  *     sub-attributes taken from
  *     &enum nl80211_peer_measurement_peer_attrs.
+ * @NL80211_PMSR_ATTR_MAX_PEER_ISTA_ROLE: u32 attribute indicating the
+ *     maximum number of peers supported when the device operates in the
+ *     ISTA (Initiator STA) role. If absent, no role-specific peer limit
+ *     applies. The sum of %NL80211_PMSR_ATTR_MAX_PEER_ISTA_ROLE and
+ *     %NL80211_PMSR_ATTR_MAX_PEER_RSTA_ROLE is enforced when the device
+ *     supports concurrent ISTA/RSTA operation.
+ * @NL80211_PMSR_ATTR_MAX_PEER_RSTA_ROLE: u32 attribute indicating the
+ *     maximum number of peers supported when the device operates in the
+ *     RSTA (Responder STA) role. If absent, no role-specific peer limit
+ *     applies. The sum of %NL80211_PMSR_ATTR_MAX_PEER_ISTA_ROLE and
+ *     %NL80211_PMSR_ATTR_MAX_PEER_RSTA_ROLE is enforced when the device
+ *     supports concurrent ISTA/RSTA operation.
  *
  * @NUM_NL80211_PMSR_ATTR: internal
  * @NL80211_PMSR_ATTR_MAX: highest attribute number
@@ -8022,6 +8116,8 @@ enum nl80211_peer_measurement_attrs {
        NL80211_PMSR_ATTR_RANDOMIZE_MAC_ADDR,
        NL80211_PMSR_ATTR_TYPE_CAPA,
        NL80211_PMSR_ATTR_PEERS,
+       NL80211_PMSR_ATTR_MAX_PEER_ISTA_ROLE,
+       NL80211_PMSR_ATTR_MAX_PEER_RSTA_ROLE,
 
        /* keep last */
        NUM_NL80211_PMSR_ATTR,
@@ -8080,6 +8176,54 @@ enum nl80211_peer_measurement_attrs {
  *     This limits the allowed combinations of LTF repetitions and STS.
  * @NL80211_PMSR_FTM_CAPA_ATTR_RSTA_SUPPORT: flag attribute indicating the
  *     device supports operating as the RSTA in PMSR FTM request
+ * @NL80211_PMSR_FTM_CAPA_ATTR_ISTA_CAPS: nested attribute containing ISTA
+ *     (initiator) role capabilities. Uses the same sub-attributes as
+ *     %NL80211_PMSR_FTM_CAPA_ATTR_RSTA_CAPS.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_RSTA_CAPS: nested attribute containing RSTA
+ *     (responder) role capabilities.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_SUPPORT_NTB: flag attribute (used inside
+ *     %NL80211_PMSR_FTM_CAPA_ATTR_ISTA_CAPS or
+ *     %NL80211_PMSR_FTM_CAPA_ATTR_RSTA_CAPS) indicating NTB ranging support.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_SUPPORT_TB: flag attribute (used inside
+ *     %NL80211_PMSR_FTM_CAPA_ATTR_ISTA_CAPS or
+ *     %NL80211_PMSR_FTM_CAPA_ATTR_RSTA_CAPS) indicating TB ranging support.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_SUPPORT_EDCA: flag attribute (used inside
+ *     %NL80211_PMSR_FTM_CAPA_ATTR_ISTA_CAPS or
+ *     %NL80211_PMSR_FTM_CAPA_ATTR_RSTA_CAPS) indicating EDCA based ranging
+ *     support.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_TYPE_CAPS: nested attribute containing ranging
+ *     type capabilities. Uses sub-attributes from
+ *     &enum nl80211_peer_measurement_ftm_type_capa.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_CONCURRENT_ISTA_RSTA_SUPPORT: flag attribute
+ *     indicating that the device can simultaneously act as initiator and
+ *     responder in a multi-peer measurement request. Only valid if
+ *     @NL80211_PMSR_FTM_CAPA_ATTR_RSTA_SUPPORT is set.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_MAX_NUM_TX_ANTENNAS: u32 attribute indicating
+ *     the maximum number of transmit antennas supported for EDCA based ranging
+ *     (0 means unknown)
+ * @NL80211_PMSR_FTM_CAPA_ATTR_MAX_NUM_RX_ANTENNAS: u32 attribute indicating
+ *     the maximum number of receive antennas supported for EDCA based ranging
+ *     (0 means unknown)
+ * @NL80211_PMSR_FTM_CAPA_ATTR_MIN_INTERVAL_EDCA: u32 attribute indicating
+ *     the minimum EDCA ranging interval supported by the device
+ *     in milli seconds. (0 means unknown). Applications can use this value
+ *     to estimate the burst period to be given in the FTM request for the
+ *     EDCA based ranging case. If non-zero, this value will be used to
+ *     validate the burst period in the FTM request.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_MIN_INTERVAL_NTB: u32 attribute indicating
+ *     the minimum NTB ranging interval supported by the device
+ *     in milli seconds. (0 means unknown). Applications can use this value
+ *     to estimate the burst period to be given in the FTM request for the
+ *     NTB ranging case. If non-zero, this value will be used to validate
+ *     the nominal time in the FTM request.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_PD_PREAMBLES: u32 bitmap of values from
+ *     &enum nl80211_preamble indicating the supported preambles for PD
+ *     ranging requests. Only valid if %NL80211_PMSR_FTM_TYPE_CAPA_ATTR_PD_SUPPORT
+ *     is set.
+ * @NL80211_PMSR_FTM_CAPA_ATTR_PD_BANDWIDTHS: u32 bitmap of values from
+ *     &enum nl80211_chan_width indicating the supported channel bandwidths
+ *     for PD ranging requests. Only valid if
+ *     %NL80211_PMSR_FTM_TYPE_CAPA_ATTR_PD_SUPPORT is set.
  *
  * @NUM_NL80211_PMSR_FTM_CAPA_ATTR: internal
  * @NL80211_PMSR_FTM_CAPA_ATTR_MAX: highest attribute number
@@ -8105,12 +8249,52 @@ enum nl80211_peer_measurement_ftm_capa {
        NL80211_PMSR_FTM_CAPA_ATTR_MAX_TOTAL_LTF_TX,
        NL80211_PMSR_FTM_CAPA_ATTR_MAX_TOTAL_LTF_RX,
        NL80211_PMSR_FTM_CAPA_ATTR_RSTA_SUPPORT,
+       NL80211_PMSR_FTM_CAPA_ATTR_ISTA_CAPS,
+       NL80211_PMSR_FTM_CAPA_ATTR_RSTA_CAPS,
+       NL80211_PMSR_FTM_CAPA_ATTR_SUPPORT_NTB,
+       NL80211_PMSR_FTM_CAPA_ATTR_SUPPORT_TB,
+       NL80211_PMSR_FTM_CAPA_ATTR_SUPPORT_EDCA,
+       NL80211_PMSR_FTM_CAPA_ATTR_TYPE_CAPS,
+       NL80211_PMSR_FTM_CAPA_ATTR_CONCURRENT_ISTA_RSTA_SUPPORT,
+       NL80211_PMSR_FTM_CAPA_ATTR_MAX_NUM_TX_ANTENNAS,
+       NL80211_PMSR_FTM_CAPA_ATTR_MAX_NUM_RX_ANTENNAS,
+       NL80211_PMSR_FTM_CAPA_ATTR_MIN_INTERVAL_EDCA,
+       NL80211_PMSR_FTM_CAPA_ATTR_MIN_INTERVAL_NTB,
+       NL80211_PMSR_FTM_CAPA_ATTR_PD_PREAMBLES,
+       NL80211_PMSR_FTM_CAPA_ATTR_PD_BANDWIDTHS,
 
        /* keep last */
        NUM_NL80211_PMSR_FTM_CAPA_ATTR,
        NL80211_PMSR_FTM_CAPA_ATTR_MAX = NUM_NL80211_PMSR_FTM_CAPA_ATTR - 1
 };
 
+/**
+ * enum nl80211_peer_measurement_ftm_type_capa - FTM ranging type capability
+ *     sub-attributes, used inside %NL80211_PMSR_FTM_CAPA_ATTR_TYPE_CAPS
+ * @__NL80211_PMSR_FTM_TYPE_CAPA_ATTR_INVALID: invalid
+ *
+ * @NL80211_PMSR_FTM_TYPE_CAPA_ATTR_INFRA_SUPPORT: flag attribute indicating
+ *     that the device supports infrastructure ranging (STA-to-AP or
+ *     AP-to-STA) as part of Proximity Detection
+ * @NL80211_PMSR_FTM_TYPE_CAPA_ATTR_PD_SUPPORT: flag attribute indicating that
+ *     the device supports peer-to-peer ranging as mentioned in the
+ *     specification "PR Implementation Consideration Draft 1.9 rev 1" where
+ *     PD stands for proximity detection
+ *
+ * @NUM_NL80211_PMSR_FTM_TYPE_CAPA_ATTR: internal
+ * @NL80211_PMSR_FTM_TYPE_CAPA_ATTR_MAX: highest attribute number
+ */
+enum nl80211_peer_measurement_ftm_type_capa {
+       __NL80211_PMSR_FTM_TYPE_CAPA_ATTR_INVALID,
+
+       NL80211_PMSR_FTM_TYPE_CAPA_ATTR_INFRA_SUPPORT,
+       NL80211_PMSR_FTM_TYPE_CAPA_ATTR_PD_SUPPORT,
+
+       /* keep last */
+       NUM_NL80211_PMSR_FTM_TYPE_CAPA_ATTR,
+       NL80211_PMSR_FTM_TYPE_CAPA_ATTR_MAX = NUM_NL80211_PMSR_FTM_TYPE_CAPA_ATTR - 1
+};
+
 /**
  * enum nl80211_peer_measurement_ftm_req - FTM request attributes
  * @__NL80211_PMSR_FTM_REQ_ATTR_INVALID: invalid
@@ -8129,9 +8313,11 @@ enum nl80211_peer_measurement_ftm_capa {
  *     default 15 i.e. "no preference"). For non-EDCA ranging, this is the
  *     burst duration in milliseconds (optional with default 0, i.e. let the
  *     device decide).
- * @NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST: number of successful FTM frames
- *     requested per burst
+ * @NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST: (Optional) number of successful
+ *     FTM frames requested per burst
  *     (u8, 0-31, optional with default 0 i.e. "no preference")
+ *     If the attribute is absent ("no preference"), the driver or firmware can
+ *     choose a suitable value.
  * @NL80211_PMSR_FTM_REQ_ATTR_NUM_FTMR_RETRIES: number of FTMR frame retries
  *     (u8, default 3)
  * @NL80211_PMSR_FTM_REQ_ATTR_REQUEST_LCI: request LCI data (flag)
@@ -8165,6 +8351,50 @@ enum nl80211_peer_measurement_ftm_capa {
  *     Only valid if %NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK is set (so the
  *     RSTA will have the measurement results to report back in the FTM
  *     response).
+ * @NL80211_PMSR_FTM_REQ_ATTR_MIN_TIME_BETWEEN_MEASUREMENTS: minimum time
+ *     between two consecutive range measurements in units of 100 microseconds,
+ *     for non-trigger based ranging (u32). Should be set as short as possible
+ *     to minimize turnaround time, since two-way ranging with delayed LMR
+ *     requires two measurements. Only valid if
+ *     %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set.
+ * @NL80211_PMSR_FTM_REQ_ATTR_MAX_TIME_BETWEEN_MEASUREMENTS: maximum time
+ *     between two consecutive range measurements in units of 10 milliseconds,
+ *     for non-trigger based ranging (u32). Acts as a session timeout; if
+ *     exceeded, the ranging session should be terminated. Only valid if
+ *     %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set.
+ * @NL80211_PMSR_FTM_REQ_ATTR_NOMINAL_TIME: The nominal time field shall be
+ *     set to the nominal duration between adjacent Availability Windows in
+ *     units of milli seconds (u32). Mandatory if
+ *     %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set.
+ * @NL80211_PMSR_FTM_REQ_ATTR_AW_DURATION: (Optional) The AW duration field
+ *     shall be set to the duration of the AW in units of 1ms (0-255 ms) (u32).
+ *     Only valid if %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set.
+ *     If the attribute is absent ("no preference"), the driver or firmware
+ *     can choose a suitable value.
+ * @NL80211_PMSR_FTM_REQ_ATTR_NUM_MEASUREMENTS: (Optional) number of
+ *     Availability Windows (AWs) to schedule for non-trigger-based ranging.
+ *     Each AW may contain multiple FTM exchanges as configured by
+ *     %NL80211_PMSR_FTM_REQ_ATTR_FTMS_PER_BURST. Only valid if
+ *     %NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED is set.
+ *     If the attribute is absent ("no preference"), the driver or firmware
+ *     can choose a suitable value.
+ * @NL80211_PMSR_FTM_REQ_ATTR_PAD: ignore, for u64/s64 padding only.
+ * @NL80211_PMSR_FTM_REQ_ATTR_INGRESS: optional u64 attribute in units of mm.
+ *     When specified, the measurement result of the peer needs to be
+ *     indicated if the device moves into this range.
+ * @NL80211_PMSR_FTM_REQ_ATTR_EGRESS: optional u64 attribute in units of mm.
+ *     When specified, the measurement result of the peer needs to be
+ *     indicated if the device moves out of this range.
+ *     If neither or only one of @NL80211_PMSR_FTM_REQ_ATTR_INGRESS and
+ *     @NL80211_PMSR_FTM_REQ_ATTR_EGRESS is specified, only the specified
+ *     threshold is used. If both are specified, both thresholds are applied.
+ *     If neither is specified, results are reported without threshold
+ *     filtering.
+ * @NL80211_PMSR_FTM_REQ_ATTR_PD_SUPPRESS_RESULTS: Flag to suppress ranging
+ *     results for PD requests. When set, ranging measurements are performed
+ *     but results are not reported to userspace, regardless of ranging role
+ *     or type. Only valid when %NL80211_PMSR_PEER_ATTR_REQ_TYPE is set to
+ *     %NL80211_PMSR_FTM_REQ_TYPE_PD.
  *
  * @NUM_NL80211_PMSR_FTM_REQ_ATTR: internal
  * @NL80211_PMSR_FTM_REQ_ATTR_MAX: highest attribute number
@@ -8186,6 +8416,15 @@ enum nl80211_peer_measurement_ftm_req {
        NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK,
        NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR,
        NL80211_PMSR_FTM_REQ_ATTR_RSTA,
+       NL80211_PMSR_FTM_REQ_ATTR_MIN_TIME_BETWEEN_MEASUREMENTS,
+       NL80211_PMSR_FTM_REQ_ATTR_MAX_TIME_BETWEEN_MEASUREMENTS,
+       NL80211_PMSR_FTM_REQ_ATTR_NOMINAL_TIME,
+       NL80211_PMSR_FTM_REQ_ATTR_AW_DURATION,
+       NL80211_PMSR_FTM_REQ_ATTR_NUM_MEASUREMENTS,
+       NL80211_PMSR_FTM_REQ_ATTR_PAD,
+       NL80211_PMSR_FTM_REQ_ATTR_INGRESS,
+       NL80211_PMSR_FTM_REQ_ATTR_EGRESS,
+       NL80211_PMSR_FTM_REQ_ATTR_PD_SUPPRESS_RESULTS,
 
        /* keep last */
        NUM_NL80211_PMSR_FTM_REQ_ATTR,
@@ -8272,6 +8511,33 @@ enum nl80211_peer_measurement_ftm_failure_reasons {
  * @NL80211_PMSR_FTM_RESP_ATTR_PAD: ignore, for u64/s64 padding only
  * @NL80211_PMSR_FTM_RESP_ATTR_BURST_PERIOD: actual burst period used by
  *     the responder (similar to request, u16)
+ * @NL80211_PMSR_FTM_RESP_ATTR_TX_LTF_REPETITION_COUNT: negotiated value of
+ *     number of tx ltf repetitions in NDP frames (u32, optional)
+ * @NL80211_PMSR_FTM_RESP_ATTR_RX_LTF_REPETITION_COUNT: negotiated value of
+ *     number of rx ltf repetitions in NDP frames (u32, optional)
+ * @NL80211_PMSR_FTM_RESP_ATTR_MAX_TIME_BETWEEN_MEASUREMENTS: negotiated value
+ *     where latest time by which the ISTA needs to complete the next round of
+ *     measurements, in units of 10 ms (u32, optional)
+ * @NL80211_PMSR_FTM_RESP_ATTR_MIN_TIME_BETWEEN_MEASUREMENTS: negotiated
+ *     minimum time between two consecutive range measurements initiated by an
+ *     ISTA, in units of 100 us (u32, optional)
+ * @NL80211_PMSR_FTM_RESP_ATTR_NUM_TX_SPATIAL_STREAMS: number of Tx space-time
+ *     streams used in NDP frames during the measurement sounding phase
+ *     (u32, optional).
+ * @NL80211_PMSR_FTM_RESP_ATTR_NUM_RX_SPATIAL_STREAMS: number of Rx space-time
+ *     streams used in the NDP frames during the measurement sounding phase
+ *     (u32, optional)
+ * @NL80211_PMSR_FTM_RESP_ATTR_NOMINAL_TIME: negotiated nominal time used in
+ *     this session in milliseconds. (u32, optional)
+ * @NL80211_PMSR_FTM_RESP_ATTR_AVAILABILITY_WINDOW: negotiated availability
+ *     window time used in this session, in units of milli seconds.
+ *     (u32, optional)
+ * @NL80211_PMSR_FTM_RESP_ATTR_CHANNEL_WIDTH: u32 attribute indicating channel
+ *     width used for measurement, see &enum nl80211_chan_width (optional).
+ * @NL80211_PMSR_FTM_RESP_ATTR_PREAMBLE: u32 attribute indicating the preamble
+ *     type used for the measurement, see &enum nl80211_preamble (optional).
+ * @NL80211_PMSR_FTM_RESP_ATTR_IS_DELAYED_LMR: flag, indicates if the
+ *     current result is delayed LMR data.
  *
  * @NUM_NL80211_PMSR_FTM_RESP_ATTR: internal
  * @NL80211_PMSR_FTM_RESP_ATTR_MAX: highest attribute number
@@ -8301,6 +8567,17 @@ enum nl80211_peer_measurement_ftm_resp {
        NL80211_PMSR_FTM_RESP_ATTR_CIVICLOC,
        NL80211_PMSR_FTM_RESP_ATTR_PAD,
        NL80211_PMSR_FTM_RESP_ATTR_BURST_PERIOD,
+       NL80211_PMSR_FTM_RESP_ATTR_TX_LTF_REPETITION_COUNT,
+       NL80211_PMSR_FTM_RESP_ATTR_RX_LTF_REPETITION_COUNT,
+       NL80211_PMSR_FTM_RESP_ATTR_MAX_TIME_BETWEEN_MEASUREMENTS,
+       NL80211_PMSR_FTM_RESP_ATTR_MIN_TIME_BETWEEN_MEASUREMENTS,
+       NL80211_PMSR_FTM_RESP_ATTR_NUM_TX_SPATIAL_STREAMS,
+       NL80211_PMSR_FTM_RESP_ATTR_NUM_RX_SPATIAL_STREAMS,
+       NL80211_PMSR_FTM_RESP_ATTR_NOMINAL_TIME,
+       NL80211_PMSR_FTM_RESP_ATTR_AVAILABILITY_WINDOW,
+       NL80211_PMSR_FTM_RESP_ATTR_CHANNEL_WIDTH,
+       NL80211_PMSR_FTM_RESP_ATTR_PREAMBLE,
+       NL80211_PMSR_FTM_RESP_ATTR_IS_DELAYED_LMR,
 
        /* keep last */
        NUM_NL80211_PMSR_FTM_RESP_ATTR,

diff --git a/src/include/uapi/linux/openat2.h b/src/include/uapi/linux/openat2.h
index 4759c471676ccb5f3848997f21a880061ab810d5..6960b9a74403d82db31efacbaedac8ea73fb44e1 100644 (file)
--- a/src/include/uapi/linux/openat2.h
+++ b/src/include/uapi/linux/openat2.h
@@ -22,6 +22,13 @@ struct open_how {
        __u64 resolve;
 };
 
+/*
+ * how->flags bits exclusive to openat2(2). These live in the upper 32 bits
+ * of @flags so that they cannot be expressed by open(2) / openat(2), whose
+ * @flags argument is a C int.
+ */
+#define OPENAT2_REGULAR                ((__u64)1 << 32) /* Only open regular files. */
+
 /* how->resolve flags for openat2(2). */
 #define RESOLVE_NO_XDEV                0x01 /* Block mount-point crossings
                                        (includes bind-mounts). */

diff --git a/src/include/uapi/linux/pkt_sched.h b/src/include/uapi/linux/pkt_sched.h
index fb07a88982257985da85a5b42af196ef2ffcef4c..d1f67ef803f5731f1bcd216355ca597e87d59bef 100644 (file)
--- a/src/include/uapi/linux/pkt_sched.h
+++ b/src/include/uapi/linux/pkt_sched.h
@@ -569,6 +569,16 @@ struct tc_netem_gemodel {
 #define NETEM_DIST_SCALE       8192
 #define NETEM_DIST_MAX         16384
 
+struct tc_netem_xstats {
+       __u64   delayed;        /* packets delayed */
+       __u64   dropped;        /* packets dropped by loss model      */
+       __u64   corrupted;      /* packets with bit errors injected   */
+       __u64   duplicated;     /* duplicate packets generated        */
+       __u64   reordered;      /* packets sent out of order          */
+       __u64   ecn_marked;     /* packets ECN CE-marked (not dropped)*/
+       __u64   allocation_errors;
+};
+
 /* DRR */
 
 enum {

diff --git a/src/include/uapi/linux/rtnetlink.h b/src/include/uapi/linux/rtnetlink.h
index 085bb13970307852ae754e7a4ac27d7ca3fecd7b..f86c13680b4da07c1770cfddb94aea5fdbb379c0 100644 (file)
--- a/src/include/uapi/linux/rtnetlink.h
+++ b/src/include/uapi/linux/rtnetlink.h
@@ -838,6 +838,7 @@ enum {
 #define RTEXT_FILTER_CFM_CONFIG        (1 << 5)
 #define RTEXT_FILTER_CFM_STATUS        (1 << 6)
 #define RTEXT_FILTER_MST       (1 << 7)
+#define RTEXT_FILTER_NAME_ONLY (1 << 8)
 
 /* End of information exported to user level */