From dc2e21421af1bd1a5667dd5bdc66570331c29432 Mon Sep 17 00:00:00 2001 From: Davide Caratti Date: Fri, 27 Oct 2023 10:33:02 +0200 Subject: [PATCH] Squash-to: "uapi: mptcp: use header file generated from YAML spec" Signed-off-by: Davide Caratti --- include/uapi/linux/mptcp.h | 4 ---- include/uapi/linux/mptcp_pm.h | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 166bb9bad05c5c..74cfe496891e03 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -28,10 +28,6 @@ #include -/* for backward compatibility */ -#define __MPTCP_PM_CMD_AFTER_LAST __MPTCP_PM_CMD_MAX -#define __MPTCP_ATTR_AFTER_LAST __MPTCP_ATTR_MAX - #define MPTCP_INFO_FLAG_FALLBACK _BITUL(0) #define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1) diff --git a/include/uapi/linux/mptcp_pm.h b/include/uapi/linux/mptcp_pm.h index 0ad598fe940b51..b5d11aece4089d 100644 --- a/include/uapi/linux/mptcp_pm.h +++ b/include/uapi/linux/mptcp_pm.h @@ -100,9 +100,9 @@ enum { MPTCP_PM_ATTR_LOC_ID, MPTCP_PM_ATTR_ADDR_REMOTE, - __MPTCP_PM_ATTR_MAX + __MPTCP_ATTR_AFTER_LAST }; -#define MPTCP_PM_ATTR_MAX (__MPTCP_PM_ATTR_MAX - 1) +#define MPTCP_PM_ATTR_MAX (__MPTCP_ATTR_AFTER_LAST - 1) enum mptcp_event_attr { MPTCP_ATTR_UNSPEC, @@ -143,8 +143,8 @@ enum { MPTCP_PM_CMD_SUBFLOW_CREATE, MPTCP_PM_CMD_SUBFLOW_DESTROY, - __MPTCP_PM_CMD_MAX + __MPTCP_PM_CMD_AFTER_LAST }; -#define MPTCP_PM_CMD_MAX (__MPTCP_PM_CMD_MAX - 1) +#define MPTCP_PM_CMD_MAX (__MPTCP_PM_CMD_AFTER_LAST - 1) #endif /* _UAPI_LINUX_MPTCP_PM_H */