Update kernel headers

Update kernel headers to commit:
	df58ee7d8faf: ("Merge branch 'net-phy-mscc-add-support-for-phy-led-control'")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index ece0fe39116eff7a8de9181f0c475dc77a71f3f3..94ddf1dcd444dcf43096fd6dc27e96005fbd7f0e 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -7200,6 +7200,8 @@ enum {
        TCP_BPF_SYN_MAC         = 1007, /* Copy the MAC, IP[46], and TCP header */
        TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */
        SK_BPF_CB_FLAGS         = 1009, /* Get or set sock ops flags in socket */
+       SK_BPF_BYPASS_PROT_MEM  = 1010, /* Get or Set sk->sk_bypass_prot_mem */
+
 };
 
 enum {

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index bcd5fde1c89ec829fde1f93ff7704644cb1cf3ed..317c088b2a4f5dbd6b1c040bb670ec8fb67b1978 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -181,6 +181,7 @@ enum devlink_sb_threshold_type {
 enum devlink_eswitch_mode {
        DEVLINK_ESWITCH_MODE_LEGACY,
        DEVLINK_ESWITCH_MODE_SWITCHDEV,
+       DEVLINK_ESWITCH_MODE_SWITCHDEV_INACTIVE,
 };
 
 enum devlink_eswitch_inline_mode {

diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
index a1aff8e337998e7d870c0fb96f805532f3df7a7a..2c0ca402386c7c12e94f606b9691a457c8d33d64 100644 (file)
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
@@ -92,6 +92,7 @@
 #define ETH_P_ETHERCAT 0x88A4          /* EtherCAT                     */
 #define ETH_P_8021AD   0x88A8          /* 802.1ad Service VLAN         */
 #define ETH_P_802_EX1  0x88B5          /* 802.1 Local Experimental 1.  */
+#define ETH_P_MXLGSW   0x88C3          /* MaxLinear GSW DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_PREAUTH  0x88C7          /* 802.11 Preauthentication */
 #define ETH_P_TIPC     0x88CA          /* TIPC                         */
 #define ETH_P_LLDP     0x88CC          /* Link Layer Discovery Protocol */
@@ -114,6 +115,7 @@
 #define ETH_P_QINQ1    0x9100          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_QINQ2    0x9200          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_QINQ3    0x9300          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
+#define ETH_P_YT921X   0x9988          /* Motorcomm YT921x DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_EDSA     0xDADA          /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_DSA_8021Q        0xDADB          /* Fake VLAN Header for DSA [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_DSA_A5PSW        0xE001          /* A5PSW Tag Value [ NOT AN OFFICIALLY REGISTERED ID ] */

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index ac193ef707c59840accc4d08836649f164a7b072..9f214ab917d0feddd855fe3de96869ab7e4a24df 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -68,7 +68,8 @@ struct mptcp_info {
        __u64   mptcpi_bytes_acked;
        __u8    mptcpi_subflows_total;
        __u8    mptcpi_endp_laminar_max;
-       __u8    reserved[2];
+       __u8    mptcpi_endp_fullmesh_max;
+       __u8    reserved;
        __u32   mptcpi_last_data_sent;
        __u32   mptcpi_last_data_recv;
        __u32   mptcpi_last_ack_recv;

diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h
index dd7dea898f23779a092020e6e5069ec79ab71c17..59ae50be83d21d7ef51d199239ce43b50d351eb8 100644 (file)
--- a/include/uapi/linux/tls.h
+++ b/include/uapi/linux/tls.h
@@ -41,6 +41,7 @@
 #define TLS_RX                 2       /* Set receive parameters */
 #define TLS_TX_ZEROCOPY_RO     3       /* TX zerocopy (only sendfile now) */
 #define TLS_RX_EXPECT_NO_PAD   4       /* Attempt opportunistic zero-copy */
+#define TLS_TX_MAX_PAYLOAD_LEN 5       /* Maximum plaintext size */
 
 /* Supported versions */
 #define TLS_VERSION_MINOR(ver) ((ver) & 0xFF)
@@ -194,6 +195,7 @@ enum {
        TLS_INFO_RXCONF,
        TLS_INFO_ZC_RO_TX,
        TLS_INFO_RX_NO_PAD,
+       TLS_INFO_TX_MAX_PAYLOAD_LEN,
        __TLS_INFO_MAX,
 };
 #define TLS_INFO_MAX (__TLS_INFO_MAX - 1)

diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index 05748dd32cc45b11cf78ddf606bf50c296d2d74d..c73cc2845d4b1f02934d9c29ef37f3776003b3e3 100644 (file)
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
@@ -193,7 +193,8 @@ struct virtio_net_hdr_v1 {
 
 struct virtio_net_hdr_v1_hash {
        struct virtio_net_hdr_v1 hdr;
-       __le32 hash_value;
+       __le16 hash_value_lo;
+       __le16 hash_value_hi;
 #define VIRTIO_NET_HASH_REPORT_NONE            0
 #define VIRTIO_NET_HASH_REPORT_IPv4            1
 #define VIRTIO_NET_HASH_REPORT_TCPv4           2