selftests: mptcp: pm_nl_ctl: remove re-definition

'MPTCP_PM_NAME' is defined in 'linux/mptcp_pm.h', included in
'linux/mptcp.h', no need to re-define it.

'MPTCP_PM_EVENTS' is not defined in 'linux/mptcp.h', but
'MPTCP_PM_EV_GRP_NAME' is, with the same value. We can then use the
latter, and drop the other one.

Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240902-net-next-mptcp-mib-mpjtx-misc-v1-11-d3e0f3773b90@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
index 7ad5a59adff2bf4bcfa21a235bc3d56bfebd8196..994a556f46c15163bae6cb517c371801f0cd6e3b 100644 (file)
--- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
+++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
@@ -19,12 +19,6 @@
 
 #include "linux/mptcp.h"
 
-#ifndef MPTCP_PM_NAME
-#define MPTCP_PM_NAME          "mptcp_pm"
-#endif
-#ifndef MPTCP_PM_EVENTS
-#define MPTCP_PM_EVENTS                "mptcp_pm_events"
-#endif
 #ifndef IPPROTO_MPTCP
 #define IPPROTO_MPTCP 262
 #endif
@@ -116,7 +110,7 @@ static int capture_events(int fd, int event_group)
 
        if (setsockopt(fd, SOL_NETLINK, NETLINK_ADD_MEMBERSHIP,
                       &event_group, sizeof(event_group)) < 0)
-               error(1, errno, "could not join the " MPTCP_PM_EVENTS " mcast group");
+               error(1, errno, "could not join the " MPTCP_PM_EV_GRP_NAME " mcast group");
 
        do {
                FD_ZERO(&rfds);
@@ -288,7 +282,7 @@ static int genl_parse_getfamily(struct nlmsghdr *nlh, int *pm_family,
                                        if (grp->rta_type == CTRL_ATTR_MCAST_GRP_ID)
                                                *events_mcast_grp = *(__u32 *)RTA_DATA(grp);
                                        else if (grp->rta_type == CTRL_ATTR_MCAST_GRP_NAME &&
-                                                !strcmp(RTA_DATA(grp), MPTCP_PM_EVENTS))
+                                                !strcmp(RTA_DATA(grp), MPTCP_PM_EV_GRP_NAME))
                                                got_events_grp = 1;
 
                                        grp = RTA_NEXT(grp, grp_len);