Commit 38dc0708 authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Jakub Kicinski
Browse files

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: default avatarGeliang Tang <geliang@kernel.org>
Signed-off-by: default avatarMatthieu 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: default avatarJakub Kicinski <kuba@kernel.org>
parent 0e2b4584

tools/testing/selftests/net/mptcp/pm_nl_ctl.c

+2 −8
Original line number Diff line number Diff line
@@ -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);