diff options
| -rw-r--r-- | Documentation/netlink/genetlink-c.yaml | 6 | ||||
| -rw-r--r-- | Documentation/netlink/genetlink-legacy.yaml | 6 | ||||
| -rw-r--r-- | Documentation/netlink/netlink-raw.yaml | 6 | ||||
| -rw-r--r-- | Documentation/netlink/specs/mptcp.yaml | 2 | ||||
| -rw-r--r-- | include/uapi/linux/mptcp.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/mptcp_pm.h | 8 |
6 files changed, 24 insertions, 8 deletions
diff --git a/Documentation/netlink/genetlink-c.yaml b/Documentation/netlink/genetlink-c.yaml index 9d13bbb7ae47..c58f7153fcf8 100644 --- a/Documentation/netlink/genetlink-c.yaml +++ b/Documentation/netlink/genetlink-c.yaml @@ -47,6 +47,12 @@ properties: max-by-define: description: Makes the number of attributes and commands be specified by a define, not an enum value. type: boolean + cmd-max-name: + description: Name of the define for the last operation in the list. + type: string + cmd-cnt-name: + description: The explicit name for constant holding the count of operations (last operation + 1). + type: string # End genetlink-c definitions: diff --git a/Documentation/netlink/genetlink-legacy.yaml b/Documentation/netlink/genetlink-legacy.yaml index 0daf40402a29..938703088306 100644 --- a/Documentation/netlink/genetlink-legacy.yaml +++ b/Documentation/netlink/genetlink-legacy.yaml @@ -47,6 +47,12 @@ properties: max-by-define: description: Makes the number of attributes and commands be specified by a define, not an enum value. type: boolean + cmd-max-name: + description: Name of the define for the last operation in the list. + type: string + cmd-cnt-name: + description: The explicit name for constant holding the count of operations (last operation + 1). + type: string # End genetlink-c # Start genetlink-legacy kernel-policy: diff --git a/Documentation/netlink/netlink-raw.yaml b/Documentation/netlink/netlink-raw.yaml index 48db31f1d059..775cce8c548a 100644 --- a/Documentation/netlink/netlink-raw.yaml +++ b/Documentation/netlink/netlink-raw.yaml @@ -47,6 +47,12 @@ properties: max-by-define: description: Makes the number of attributes and commands be specified by a define, not an enum value. type: boolean + cmd-max-name: + description: Name of the define for the last operation in the list. + type: string + cmd-cnt-name: + description: The explicit name for constant holding the count of operations (last operation + 1). + type: string # End genetlink-c # Start genetlink-legacy kernel-policy: diff --git a/Documentation/netlink/specs/mptcp.yaml b/Documentation/netlink/specs/mptcp.yaml index ec5c454a87ea..49f90cfb4698 100644 --- a/Documentation/netlink/specs/mptcp.yaml +++ b/Documentation/netlink/specs/mptcp.yaml @@ -8,6 +8,7 @@ c-family-name: mptcp-pm-name c-version-name: mptcp-pm-ver max-by-define: true kernel-policy: per-op +cmd-cnt-name: --mptcp-pm-cmd-after-last definitions: - @@ -167,6 +168,7 @@ attribute-sets: - name: attr name-prefix: mptcp-pm-attr- + attr-cnt-name: --mptcp-attr-after-last attributes: - name: unspec diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 64ecc8a3f9f2..a6451561f3f8 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -28,10 +28,6 @@ #include <linux/mptcp_pm.h> -/* 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 0ad598fe940b..b5d11aece408 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 */ |