Update kernel headers

Update kernel headers to commit:
    dbadae927287 ("tsnep: Rework RX buffer allocation")

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

diff --git a/include/libnetlink.h b/include/libnetlink.h
index c91a22314548bd6d96981261df56ba7ae3274ea9..4d9696efa25397d13fcb6048467a6145c9c4b374 100644 (file)
--- a/include/libnetlink.h
+++ b/include/libnetlink.h
@@ -38,9 +38,9 @@ struct nlmsg_chain {
 };
 
 struct ipstats_req {
-       struct nlmsghdr nlh;
        struct if_stats_msg ifsm;
        char buf[128];
+       struct nlmsghdr nlh;
 };
 
 extern int rcvbuf;

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index aedc71e318ffead6248297b6c68e6b6fb536567f..b77a2133c9bdb0a2418bdc38a7b0a6fc6a118002 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2584,14 +2584,19 @@ union bpf_attr {
  *             * **SOL_SOCKET**, which supports the following *optname*\ s:
  *               **SO_RCVBUF**, **SO_SNDBUF**, **SO_MAX_PACING_RATE**,
  *               **SO_PRIORITY**, **SO_RCVLOWAT**, **SO_MARK**,
- *               **SO_BINDTODEVICE**, **SO_KEEPALIVE**.
+ *               **SO_BINDTODEVICE**, **SO_KEEPALIVE**, **SO_REUSEADDR**,
+ *               **SO_REUSEPORT**, **SO_BINDTOIFINDEX**, **SO_TXREHASH**.
  *             * **IPPROTO_TCP**, which supports the following *optname*\ s:
  *               **TCP_CONGESTION**, **TCP_BPF_IW**,
  *               **TCP_BPF_SNDCWND_CLAMP**, **TCP_SAVE_SYN**,
  *               **TCP_KEEPIDLE**, **TCP_KEEPINTVL**, **TCP_KEEPCNT**,
- *               **TCP_SYNCNT**, **TCP_USER_TIMEOUT**, **TCP_NOTSENT_LOWAT**.
+ *               **TCP_SYNCNT**, **TCP_USER_TIMEOUT**, **TCP_NOTSENT_LOWAT**,
+ *               **TCP_NODELAY**, **TCP_MAXSEG**, **TCP_WINDOW_CLAMP**,
+ *               **TCP_THIN_LINEAR_TIMEOUTS**, **TCP_BPF_DELACK_MAX**,
+ *               **TCP_BPF_RTO_MIN**.
  *             * **IPPROTO_IP**, which supports *optname* **IP_TOS**.
- *             * **IPPROTO_IPV6**, which supports *optname* **IPV6_TCLASS**.
+ *             * **IPPROTO_IPV6**, which supports the following *optname*\ s:
+ *               **IPV6_TCLASS**, **IPV6_AUTOFLOWLABEL**.
  *     Return
  *             0 on success, or a negative error in case of failure.
  *
@@ -2647,7 +2652,7 @@ union bpf_attr {
  *     Return
  *             0 on success, or a negative error in case of failure.
  *
- * long bpf_redirect_map(struct bpf_map *map, u32 key, u64 flags)
+ * long bpf_redirect_map(struct bpf_map *map, u64 key, u64 flags)
  *     Description
  *             Redirect the packet to the endpoint referenced by *map* at
  *             index *key*. Depending on its type, this *map* can contain
@@ -2808,12 +2813,10 @@ union bpf_attr {
  *               and **BPF_CGROUP_INET6_CONNECT**.
  *
  *             This helper actually implements a subset of **getsockopt()**.
- *             It supports the following *level*\ s:
- *
- *             * **IPPROTO_TCP**, which supports *optname*
- *               **TCP_CONGESTION**.
- *             * **IPPROTO_IP**, which supports *optname* **IP_TOS**.
- *             * **IPPROTO_IPV6**, which supports *optname* **IPV6_TCLASS**.
+ *             It supports the same set of *optname*\ s that is supported by
+ *             the **bpf_setsockopt**\ () helper.  The exceptions are
+ *             **TCP_BPF_*** is **bpf_setsockopt**\ () only and
+ *             **TCP_SAVED_SYN** is **bpf_getsockopt**\ () only.
  *     Return
  *             0 on success, or a negative error in case of failure.
  *
@@ -6445,6 +6448,7 @@ struct bpf_sock_ops {
                                 * the outgoing header has not
                                 * been written yet.
                                 */
+       __u64 skb_hwtstamp;
 };
 
 /* Definitions for bpf_sock_ops_cb_flags */
@@ -6887,6 +6891,16 @@ struct bpf_dynptr {
        __u64 :64;
 } __attribute__((aligned(8)));
 
+struct bpf_list_head {
+       __u64 :64;
+       __u64 :64;
+} __attribute__((aligned(8)));
+
+struct bpf_list_node {
+       __u64 :64;
+       __u64 :64;
+} __attribute__((aligned(8)));
+
 struct bpf_sysctl {
        __u32   write;          /* Sysctl is being read (= 0) or written (= 1).
                                 * Allows 1,2,4-byte read, but no write.

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 0224b8bd49b2aa426f2638904809fde7c3f31107..7538d93f9c1ad03d1a5574959a369cc0313fec7e 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -607,6 +607,11 @@ enum devlink_attr {
 
        DEVLINK_ATTR_SELFTESTS,                 /* nested */
 
+       DEVLINK_ATTR_RATE_TX_PRIORITY,          /* u32 */
+       DEVLINK_ATTR_RATE_TX_WEIGHT,            /* u32 */
+
+       DEVLINK_ATTR_REGION_DIRECT,             /* flag */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index 0c782b29cbbed3ff7d818f5c441e2bffaf5a97ce..dccf0791d69343e8c1db09cad2ca7c0c0eb7a6d4 100644 (file)
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
@@ -20,6 +20,7 @@
 #define _LINUX_IN_H
 
 #include <linux/types.h>
+#include <linux/stddef.h>
 #include <linux/libc-compat.h>
 #include <linux/socket.h>
 

diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
index 78b6c798602d7a2bb39294942e49fcca78fc6131..8cd20fb0c7060219580b13bbf1ea2dc36ee054bf 100644 (file)
--- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
@@ -100,8 +100,10 @@ struct iphdr {
        __u8    ttl;
        __u8    protocol;
        __sum16 check;
-       __be32  saddr;
-       __be32  daddr;
+       __struct_group(/* no tag */, addrs, /* no attrs */,
+               __be32  saddr;
+               __be32  daddr;
+       );
        /*The options start here. */
 };
 

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index f4ef46a1d6ee20e6e88e09c5a997057551f13fa8..5e7e0553f6f29a88e0198ef4996d883872003381 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -158,6 +158,12 @@ struct mptcp_info {
  *                           daddr4 | daddr6, sport, dport, backup, if_idx
  *                           [, error]
  * The priority of a subflow has changed. 'error' should not be set.
+ *
+ * MPTCP_EVENT_LISTENER_CREATED: family, sport, saddr4 | saddr6
+ * A new PM listener is created.
+ *
+ * MPTCP_EVENT_LISTENER_CLOSED: family, sport, saddr4 | saddr6
+ * A PM listener is closed.
  */
 enum mptcp_event_type {
        MPTCP_EVENT_UNSPEC = 0,
@@ -172,6 +178,9 @@ enum mptcp_event_type {
        MPTCP_EVENT_SUB_CLOSED = 11,
 
        MPTCP_EVENT_SUB_PRIORITY = 13,
+
+       MPTCP_EVENT_LISTENER_CREATED = 15,
+       MPTCP_EVENT_LISTENER_CLOSED = 16,
 };
 
 enum mptcp_event_attr {

diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index 8b0d9ed28f3bedfa2ab56678e51bb303a0bf652e..47bac97ec76b3dbc9a30b434123ce90028fc981c 100644 (file)
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -48,7 +48,6 @@ struct sockaddr_nl {
  * @nlmsg_flags: Additional flags
  * @nlmsg_seq:   Sequence number
  * @nlmsg_pid:   Sending process port ID
- * @nlmsg_data:  Message payload
  */
 struct nlmsghdr {
        __u32           nlmsg_len;
@@ -56,7 +55,6 @@ struct nlmsghdr {
        __u16           nlmsg_flags;
        __u32           nlmsg_seq;
        __u32           nlmsg_pid;
-       __u8            nlmsg_data[];
 };
 
 /* Flags values */

diff --git a/include/uapi/linux/tc_act/tc_ct.h b/include/uapi/linux/tc_act/tc_ct.h
index 5fb1d7ac1027202a7f8a9d9213d93f47453666e6..6c5200f0ed38814f0e7ecc6f33ab2bea638b856b 100644 (file)
--- a/include/uapi/linux/tc_act/tc_ct.h
+++ b/include/uapi/linux/tc_act/tc_ct.h
@@ -22,6 +22,9 @@ enum {
        TCA_CT_NAT_PORT_MIN,    /* be16 */
        TCA_CT_NAT_PORT_MAX,    /* be16 */
        TCA_CT_PAD,
+       TCA_CT_HELPER_NAME,     /* string */
+       TCA_CT_HELPER_FAMILY,   /* u8 */
+       TCA_CT_HELPER_PROTO,    /* u8 */
        __TCA_CT_MAX
 };