allow specifying cmd-cnt-name and cmd-max-name in netlink specs, in accordance with Documentation/userspace-api/netlink/c-code-gen.rst. Use cmd-cnt-name and attr-cnt-name in the mptcp yaml spec and in the corresponding uAPI headers, to preserve the #defines we had in the past and avoid adding new ones. v2: - squash modification in mptcp.yaml and MPTCP uAPI headers
Showing the changes to include/uapi (2 of 6 files). Show all
Unified · Split
| @@ -28,10 +28,6 @@ · 27 unmodified lines | |||
| 28 | 28 | ||
| 29 | #include <linux/mptcp_pm.h> | 29 | #include <linux/mptcp_pm.h> |
| 30 | 30 | ||
| 31 | /* for backward compatibility */ | ||
| 32 | #define __MPTCP_PM_CMD_AFTER_LAST __MPTCP_PM_CMD_MAX | ||
| 33 | #define __MPTCP_ATTR_AFTER_LAST __MPTCP_ATTR_MAX | ||
| 34 | |||
| 35 | #define MPTCP_INFO_FLAG_FALLBACK _BITUL(0) | 31 | #define MPTCP_INFO_FLAG_FALLBACK _BITUL(0) |
| 36 | #define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1) | 32 | #define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1) |
| 37 | 33 | ||
| @@ -100,9 +100,9 @@ enum { · 99 unmodified lines | |||
| 100 | MPTCP_PM_ATTR_LOC_ID, | 100 | MPTCP_PM_ATTR_LOC_ID, |
| 101 | MPTCP_PM_ATTR_ADDR_REMOTE, | 101 | MPTCP_PM_ATTR_ADDR_REMOTE, |
| 102 | 102 | ||
| 103 | __MPTCP_PM_ATTR_MAX | 103 | __MPTCP_ATTR_AFTER_LAST |
| 104 | }; | 104 | }; |
| 105 | #define MPTCP_PM_ATTR_MAX (__MPTCP_PM_ATTR_MAX - 1) | 105 | #define MPTCP_PM_ATTR_MAX (__MPTCP_ATTR_AFTER_LAST - 1) |
| 106 | 106 | ||
| 107 | enum mptcp_event_attr { | 107 | enum mptcp_event_attr { |
| 108 | MPTCP_ATTR_UNSPEC, | 108 | MPTCP_ATTR_UNSPEC, |
| @@ -143,8 +143,8 @@ enum { · 34 unmodified lines | |||
| 143 | MPTCP_PM_CMD_SUBFLOW_CREATE, | 143 | MPTCP_PM_CMD_SUBFLOW_CREATE, |
| 144 | MPTCP_PM_CMD_SUBFLOW_DESTROY, | 144 | MPTCP_PM_CMD_SUBFLOW_DESTROY, |
| 145 | 145 | ||
| 146 | __MPTCP_PM_CMD_MAX | 146 | __MPTCP_PM_CMD_AFTER_LAST |
| 147 | }; | 147 | }; |
| 148 | #define MPTCP_PM_CMD_MAX (__MPTCP_PM_CMD_MAX - 1) | 148 | #define MPTCP_PM_CMD_MAX (__MPTCP_PM_CMD_AFTER_LAST - 1) |
| 149 | 149 | ||
| 150 | #endif /* _UAPI_LINUX_MPTCP_PM_H */ | 150 | #endif /* _UAPI_LINUX_MPTCP_PM_H */ |