178 lines
5.3 KiB
Diff
178 lines
5.3 KiB
Diff
From 93f77d1e57c84093b91bc9227929cfb4a24534e9 Mon Sep 17 00:00:00 2001
|
|
From: Andrea Claudi <aclaudi@redhat.com>
|
|
Date: Thu, 4 Jun 2020 19:25:47 +0200
|
|
Subject: [PATCH] Update kernel headers and import mptcp.h
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1812207
|
|
Upstream Status: iproute2.git commit 02ade5a8ea1c2
|
|
Conflicts: on bpf uapi due to missing commit b5a77cf70116f ("uapi: update bpf.h")
|
|
and on if_bridge uapi due to several unrelated missing changes.
|
|
|
|
commit 02ade5a8ea1c23201a99d8cdf7e02a6ba90d7718
|
|
Author: David Ahern <dsahern@gmail.com>
|
|
Date: Wed Apr 29 16:41:39 2020 +0000
|
|
|
|
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>
|
|
---
|
|
include/uapi/linux/if.h | 1 +
|
|
include/uapi/linux/if_bridge.h | 1 +
|
|
include/uapi/linux/if_ether.h | 1 +
|
|
include/uapi/linux/if_link.h | 1 +
|
|
include/uapi/linux/mptcp.h | 89 ++++++++++++++++++++++++++++++++++
|
|
5 files changed, 93 insertions(+)
|
|
create mode 100644 include/uapi/linux/mptcp.h
|
|
|
|
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
|
|
index 626da393123b6..9a3bc23d0235e 100644
|
|
--- a/include/uapi/linux/if.h
|
|
+++ b/include/uapi/linux/if.h
|
|
@@ -175,6 +175,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 31fc51bdedb3c..53ba8385b022e 100644
|
|
--- 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)
|
|
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
|
|
index 728c42dfd59c1..1a0c7dfe8e38e 100644
|
|
--- 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 d36919fb4024a..4da0768d7a5a3 100644
|
|
--- a/include/uapi/linux/if_link.h
|
|
+++ b/include/uapi/linux/if_link.h
|
|
@@ -338,6 +338,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
|
|
index 0000000000000..009b8f0b0e8be
|
|
--- /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 */
|
|
--
|
|
2.26.2
|
|
|