Update kernel headers and import mptcp.h

Update kernel headers to commit
    790ab249b55d ("net: ethernet: fec: Prevent MII event after MII_SPEED write")

and import mptcp.h

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index c7b2ffb2cf1833885536386a03920e0bef8fda18..60684b7be8b20d0fb543a33c68d7f8d4893c9f62 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1642,7 +1642,7 @@ union bpf_attr {
  *             ifindex, but doesn't require a map to do so.
  *     Return
  *             **XDP_REDIRECT** on success, or the value of the two lower bits
- *             of the **flags* argument on error.
+ *             of the *flags* argument on error.
  *
  * int bpf_sk_redirect_map(struct sk_buff *skb, struct bpf_map *map, u32 key, u64 flags)
  *     Description

diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
index 074b14e3844a9c7be0299fb2c20858af6fe9c91f..b287b2a0bb7761a597165ed17666b5d846fcd1b5 100644 (file)
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
@@ -176,6 +176,7 @@ enum {
 enum {
        IF_LINK_MODE_DEFAULT,
        IF_LINK_MODE_DORMANT,   /* limit upward transition to dormant */
+       IF_LINK_MODE_TESTING,   /* limit upward transition to testing */
 };
 
 /*

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index cb581cc03a41215804a5d06edffaaae9cc7f8f8f..a4ac9f5563dd8ba75416586df436cbd5000b7aa0 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -120,6 +120,7 @@ enum {
        IFLA_BRIDGE_MODE,
        IFLA_BRIDGE_VLAN_INFO,
        IFLA_BRIDGE_VLAN_TUNNEL_INFO,
+       IFLA_BRIDGE_MRP,
        __IFLA_BRIDGE_MAX,
 };
 #define IFLA_BRIDGE_MAX (__IFLA_BRIDGE_MAX - 1)
@@ -157,6 +158,47 @@ struct bridge_vlan_xstats {
        __u32 pad2;
 };
 
+enum {
+       IFLA_BRIDGE_MRP_UNSPEC,
+       IFLA_BRIDGE_MRP_INSTANCE,
+       IFLA_BRIDGE_MRP_PORT_STATE,
+       IFLA_BRIDGE_MRP_PORT_ROLE,
+       IFLA_BRIDGE_MRP_RING_STATE,
+       IFLA_BRIDGE_MRP_RING_ROLE,
+       IFLA_BRIDGE_MRP_START_TEST,
+       __IFLA_BRIDGE_MRP_MAX,
+};
+
+struct br_mrp_instance {
+       __u32 ring_id;
+       __u32 p_ifindex;
+       __u32 s_ifindex;
+};
+
+struct br_mrp_port_role {
+       __u32 ring_id;
+       __u32 role;
+};
+
+struct br_mrp_ring_state {
+       __u32 ring_id;
+       __u32 ring_state;
+};
+
+struct br_mrp_ring_role {
+       __u32 ring_id;
+       __u32 ring_role;
+};
+
+struct br_mrp_start_test {
+       __u32 ring_id;
+       __u32 interval;
+       __u32 max_miss;
+       __u32 period;
+};
+
+#define IFLA_BRIDGE_MRP_MAX (__IFLA_BRIDGE_MRP_MAX - 1)
+
 struct bridge_stp_xstats {
        __u64 transition_blk;
        __u64 transition_fwd;

diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
index 728c42dfd59c13fa8b12e5991a85440d6d084ad5..1a0c7dfe8e38e071b80cfd229f2f7fae69810d12 100644 (file)
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
@@ -92,6 +92,7 @@
 #define ETH_P_PREAUTH  0x88C7          /* 802.11 Preauthentication */
 #define ETH_P_TIPC     0x88CA          /* TIPC                         */
 #define ETH_P_LLDP     0x88CC          /* Link Layer Discovery Protocol */
+#define ETH_P_MRP      0x88E3          /* Media Redundancy Protocol    */
 #define ETH_P_MACSEC   0x88E5          /* 802.1ae MACsec */
 #define ETH_P_8021AH   0x88E7          /* 802.1ah Backbone Service Tag */
 #define ETH_P_MVRP     0x88F5          /* 802.1Q MVRP                  */

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 978f98c76be17c262ff5347a5af60f0b2fbed8b6..a8901a39a345ecfc951acc35bda3dfdd63277f51 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -341,6 +341,7 @@ enum {
        IFLA_BRPORT_NEIGH_SUPPRESS,
        IFLA_BRPORT_ISOLATED,
        IFLA_BRPORT_BACKUP_PORT,
+       IFLA_BRPORT_MRP_RING_OPEN,
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
new file mode 100644 (file)
index 0000000..009b8f0
--- /dev/null
+++ b/include/uapi/linux/mptcp.h
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
+#ifndef _MPTCP_H
+#define _MPTCP_H
+
+#include <linux/const.h>
+#include <linux/types.h>
+
+#define MPTCP_SUBFLOW_FLAG_MCAP_REM            _BITUL(0)
+#define MPTCP_SUBFLOW_FLAG_MCAP_LOC            _BITUL(1)
+#define MPTCP_SUBFLOW_FLAG_JOIN_REM            _BITUL(2)
+#define MPTCP_SUBFLOW_FLAG_JOIN_LOC            _BITUL(3)
+#define MPTCP_SUBFLOW_FLAG_BKUP_REM            _BITUL(4)
+#define MPTCP_SUBFLOW_FLAG_BKUP_LOC            _BITUL(5)
+#define MPTCP_SUBFLOW_FLAG_FULLY_ESTABLISHED   _BITUL(6)
+#define MPTCP_SUBFLOW_FLAG_CONNECTED           _BITUL(7)
+#define MPTCP_SUBFLOW_FLAG_MAPVALID            _BITUL(8)
+
+enum {
+       MPTCP_SUBFLOW_ATTR_UNSPEC,
+       MPTCP_SUBFLOW_ATTR_TOKEN_REM,
+       MPTCP_SUBFLOW_ATTR_TOKEN_LOC,
+       MPTCP_SUBFLOW_ATTR_RELWRITE_SEQ,
+       MPTCP_SUBFLOW_ATTR_MAP_SEQ,
+       MPTCP_SUBFLOW_ATTR_MAP_SFSEQ,
+       MPTCP_SUBFLOW_ATTR_SSN_OFFSET,
+       MPTCP_SUBFLOW_ATTR_MAP_DATALEN,
+       MPTCP_SUBFLOW_ATTR_FLAGS,
+       MPTCP_SUBFLOW_ATTR_ID_REM,
+       MPTCP_SUBFLOW_ATTR_ID_LOC,
+       MPTCP_SUBFLOW_ATTR_PAD,
+       __MPTCP_SUBFLOW_ATTR_MAX
+};
+
+#define MPTCP_SUBFLOW_ATTR_MAX (__MPTCP_SUBFLOW_ATTR_MAX - 1)
+
+/* netlink interface */
+#define MPTCP_PM_NAME          "mptcp_pm"
+#define MPTCP_PM_CMD_GRP_NAME  "mptcp_pm_cmds"
+#define MPTCP_PM_VER           0x1
+
+/*
+ * ATTR types defined for MPTCP
+ */
+enum {
+       MPTCP_PM_ATTR_UNSPEC,
+
+       MPTCP_PM_ATTR_ADDR,                             /* nested address */
+       MPTCP_PM_ATTR_RCV_ADD_ADDRS,                    /* u32 */
+       MPTCP_PM_ATTR_SUBFLOWS,                         /* u32 */
+
+       __MPTCP_PM_ATTR_MAX
+};
+
+#define MPTCP_PM_ATTR_MAX (__MPTCP_PM_ATTR_MAX - 1)
+
+enum {
+       MPTCP_PM_ADDR_ATTR_UNSPEC,
+
+       MPTCP_PM_ADDR_ATTR_FAMILY,                      /* u16 */
+       MPTCP_PM_ADDR_ATTR_ID,                          /* u8 */
+       MPTCP_PM_ADDR_ATTR_ADDR4,                       /* struct in_addr */
+       MPTCP_PM_ADDR_ATTR_ADDR6,                       /* struct in6_addr */
+       MPTCP_PM_ADDR_ATTR_PORT,                        /* u16 */
+       MPTCP_PM_ADDR_ATTR_FLAGS,                       /* u32 */
+       MPTCP_PM_ADDR_ATTR_IF_IDX,                      /* s32 */
+
+       __MPTCP_PM_ADDR_ATTR_MAX
+};
+
+#define MPTCP_PM_ADDR_ATTR_MAX (__MPTCP_PM_ADDR_ATTR_MAX - 1)
+
+#define MPTCP_PM_ADDR_FLAG_SIGNAL                      (1 << 0)
+#define MPTCP_PM_ADDR_FLAG_SUBFLOW                     (1 << 1)
+#define MPTCP_PM_ADDR_FLAG_BACKUP                      (1 << 2)
+
+enum {
+       MPTCP_PM_CMD_UNSPEC,
+
+       MPTCP_PM_CMD_ADD_ADDR,
+       MPTCP_PM_CMD_DEL_ADDR,
+       MPTCP_PM_CMD_GET_ADDR,
+       MPTCP_PM_CMD_FLUSH_ADDRS,
+       MPTCP_PM_CMD_SET_LIMITS,
+       MPTCP_PM_CMD_GET_LIMITS,
+
+       __MPTCP_PM_CMD_AFTER_LAST
+};
+
+#endif /* _MPTCP_H */