uapi: update headers from 5.4-rc

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

diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h
index 1274c692e59c5474fcb89a4e75fc8198831b7591..903cc2d2750b24f4bc48cbdce4a71c5543e41137 100644 (file)
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@ -19,6 +19,7 @@
 #define SQUASHFS_MAGIC         0x73717368
 #define ECRYPTFS_SUPER_MAGIC   0xf15f
 #define EFS_SUPER_MAGIC                0x414A53
+#define EROFS_SUPER_MAGIC_V1   0xE0F5E1E2
 #define EXT2_SUPER_MAGIC       0xEF53
 #define EXT3_SUPER_MAGIC       0xEF53
 #define XENFS_SUPER_MAGIC      0xabba1974

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 18f185299f472a2eff3b984aee90253fa617af54..5011259b8f67aac86565b17544f54fa47cb624d4 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -1160,7 +1160,8 @@ enum {
  *       [TCA_TAPRIO_ATTR_SCHED_ENTRY_INTERVAL]
  */
 
-#define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST 0x1
+#define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST     BIT(0)
+#define TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD      BIT(1)
 
 enum {
        TCA_TAPRIO_ATTR_UNSPEC,

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 3fd9b29146b174b082c7c78c677e82592bf45ace..d08acf4315ab76fc71e0bd4d1bd7c9f3b7bdf72b 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -270,6 +270,12 @@ struct tcp_info {
        __u64   tcpi_bytes_retrans;  /* RFC4898 tcpEStatsPerfOctetsRetrans */
        __u32   tcpi_dsack_dups;     /* RFC4898 tcpEStatsStackDSACKDups */
        __u32   tcpi_reord_seen;     /* reordering events seen */
+
+       __u32   tcpi_rcv_ooopack;    /* Out-of-order packets received */
+
+       __u32   tcpi_snd_wnd;        /* peer's advertised receive window after
+                                     * scaling (bytes)
+                                     */
 };
 
 /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */