Update kernel headers

Update kernel headers to commit
    45bd443bfd86 ("net: 802: Remove unused p8022 code")

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 0cfb64a8b3c2bac608f9926eddbef9ff8d7e6969..00d05b86c90ca1a882462968cbfb16086473e21a 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -51,6 +51,9 @@
 #define BPF_XCHG       (0xe0 | BPF_FETCH)      /* atomic exchange */
 #define BPF_CMPXCHG    (0xf0 | BPF_FETCH)      /* atomic compare-and-write */
 
+#define BPF_LOAD_ACQ   0x100   /* load-acquire */
+#define BPF_STORE_REL  0x110   /* store-release */
+
 enum bpf_cond_pseudo_jmp {
        BPF_MAY_GOTO = 0,
 };
@@ -1207,6 +1210,7 @@ enum bpf_perf_event_type {
 #define BPF_F_BEFORE           (1U << 3)
 #define BPF_F_AFTER            (1U << 4)
 #define BPF_F_ID               (1U << 5)
+#define BPF_F_PREORDER         (1U << 6)
 #define BPF_F_LINK             BPF_F_LINK /* 1 << 13 */
 
 /* If BPF_F_STRICT_ALIGNMENT is used in BPF_PROG_LOAD command, the
@@ -1648,6 +1652,7 @@ union bpf_attr {
                };
                __u32           next_id;
                __u32           open_flags;
+               __s32           fd_by_id_token_fd;
        };
 
        struct { /* anonymous struct used by BPF_OBJ_GET_INFO_BY_FD */
@@ -6019,7 +6024,10 @@ union bpf_attr {
        FN(user_ringbuf_drain, 209, ##ctx)              \
        FN(cgrp_storage_get, 210, ##ctx)                \
        FN(cgrp_storage_delete, 211, ##ctx)             \
-       /* */
+       /* This helper list is effectively frozen. If you are trying to \
+        * add a new helper, you should add a kfunc instead which has   \
+        * less stability guarantees. See Documentation/bpf/kfuncs.rst  \
+        */
 
 /* backwards-compatibility macros for users of __BPF_FUNC_MAPPER that don't
  * know or care about integer value that is now passed as second argument

diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h
index 426daf5aa61804ec98deeca3532c20cea0adf7d0..ffba4eb1416876386eb5c110284bbf5728eeed7d 100644 (file)
--- a/include/uapi/linux/btf.h
+++ b/include/uapi/linux/btf.h
@@ -36,7 +36,8 @@ struct btf_type {
         * bits 24-28: kind (e.g. int, ptr, array...etc)
         * bits 29-30: unused
         * bit     31: kind_flag, currently used by
-        *             struct, union, enum, fwd and enum64
+        *             struct, union, enum, fwd, enum64,
+        *             decl_tag and type_tag
         */
        __u32 info;
        /* "size" is used by INT, ENUM, STRUCT, UNION, DATASEC and ENUM64.

diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h
index e48f039ec0eca6979ad959949dd22e477361b797..ccab337dfe71058dd775f946cf5dce9cf2ccc7a1 100644 (file)
--- a/include/uapi/linux/capability.h
+++ b/include/uapi/linux/capability.h
@@ -273,6 +273,7 @@ struct vfs_ns_cap_data {
 /* Allow setting encryption key on loopback filesystem */
 /* Allow setting zone reclaim policy */
 /* Allow everything under CAP_BPF and CAP_PERFMON for backward compatibility */
+/* Allow setting hardware protection emergency action */
 
 #define CAP_SYS_ADMIN        21
 

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index c206cf6d9a1edffa5df211d69f8ef4ff772c6078..bed5e0c11218d6cee7e7db441088fa7b9cdf302a 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -699,10 +699,11 @@ struct br_mdb_entry {
 #define MDB_TEMPORARY 0
 #define MDB_PERMANENT 1
        __u8 state;
-#define MDB_FLAGS_OFFLOAD      (1 << 0)
-#define MDB_FLAGS_FAST_LEAVE   (1 << 1)
-#define MDB_FLAGS_STAR_EXCL    (1 << 2)
-#define MDB_FLAGS_BLOCKED      (1 << 3)
+#define MDB_FLAGS_OFFLOAD              (1 << 0)
+#define MDB_FLAGS_FAST_LEAVE           (1 << 1)
+#define MDB_FLAGS_STAR_EXCL            (1 << 2)
+#define MDB_FLAGS_BLOCKED              (1 << 3)
+#define MDB_FLAGS_OFFLOAD_FAILED       (1 << 4)
        __u8 flags;
        __u16 vid;
        struct {
@@ -830,6 +831,7 @@ enum br_boolopt_id {
        BR_BOOLOPT_NO_LL_LEARN,
        BR_BOOLOPT_MCAST_VLAN_SNOOPING,
        BR_BOOLOPT_MST_ENABLE,
+       BR_BOOLOPT_MDB_OFFLOAD_FAIL_NOTIFICATION,
        BR_BOOLOPT_MAX
 };
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index ceff2f20496f6eca70fd5dcecbfc78e06e475c49..bb94d881b49f97e91c96ac7c0e3ff5a94f112c7c 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -1984,4 +1984,19 @@ enum {
 
 #define IFLA_DSA_MAX   (__IFLA_DSA_MAX - 1)
 
+/* OVPN section */
+
+enum ovpn_mode {
+       OVPN_MODE_P2P,
+       OVPN_MODE_MP,
+};
+
+enum {
+       IFLA_OVPN_UNSPEC,
+       IFLA_OVPN_MODE,
+       __IFLA_OVPN_MAX,
+};
+
+#define IFLA_OVPN_MAX  (__IFLA_OVPN_MAX - 1)
+
 #endif /* _LINUX_IF_LINK_H */

diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h
index ec47f9b68a1bfb1908f2197555c876424481ab1c..1d234d7e1892778c5ff04c240f8360608f391401 100644 (file)
--- a/include/uapi/linux/snmp.h
+++ b/include/uapi/linux/snmp.h
@@ -188,6 +188,7 @@ enum
        LINUX_MIB_PAWSESTABREJECTED,            /* PAWSEstabRejected */
        LINUX_MIB_TSECRREJECTED,                /* TSEcrRejected */
        LINUX_MIB_PAWS_OLD_ACK,                 /* PAWSOldAck */
+       LINUX_MIB_PAWS_TW_REJECTED,             /* PAWSTimewait */
        LINUX_MIB_DELAYEDACKS,                  /* DelayedACKs */
        LINUX_MIB_DELAYEDACKLOCKED,             /* DelayedACKLocked */
        LINUX_MIB_DELAYEDACKLOST,               /* DelayedACKLost */

diff --git a/include/uapi/linux/udp.h b/include/uapi/linux/udp.h
index 13b485fba4df1e480a4bacd235b74eb034dee2ce..cd6a8b17e2ebd245ebced592ce51b5f04cf2cd15 100644 (file)
--- a/include/uapi/linux/udp.h
+++ b/include/uapi/linux/udp.h
@@ -43,5 +43,6 @@ struct udphdr {
 #define UDP_ENCAP_GTP1U                5 /* 3GPP TS 29.060 */
 #define UDP_ENCAP_RXRPC                6
 #define TCP_ENCAP_ESPINTCP     7 /* Yikes, this is really xfrm encap types. */
+#define UDP_ENCAP_OVPNINUDP    8 /* OpenVPN traffic */
 
 #endif /* _LINUX_UDP_H */