[PATCH net-next 7/8] mptcp: move mptcp_pm_gen.h's include

Matthieu Baerts (NGI0)
2024-05-10T11:19:15Z

Nothing from protocol.h depends on mptcp_pm_gen.h, only code from
pm_netlink.c and pm_userspace.c depends on it.

So this include can be moved where it is needed to avoid a "unused
includes" warning.

Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
net/mptcp/pm_netlink.c | 1 +
net/mptcp/pm_userspace.c | 1 +
net/mptcp/protocol.h | 2 --
3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 5c17d39146ea..7f53e022e27e 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -14,6 +14,7 @@

#include "protocol.h"
#include "mib.h"
+#include "mptcp_pm_gen.h"

static int pm_nl_pernet_id;

diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c
index 9f5d422d5ef6..f0a4590506c6 100644
--- a/net/mptcp/pm_userspace.c
+++ b/net/mptcp/pm_userspace.c
@@ -6,6 +6,7 @@

#include "protocol.h"
#include "mib.h"
+#include "mptcp_pm_gen.h"

void mptcp_free_local_addr_list(struct mptcp_sock *msk)
{
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 39fc47e6b88a..7aa47e2dd52b 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -14,8 +14,6 @@
#include <net/genetlink.h>
#include <net/rstreason.h>

-#include "mptcp_pm_gen.h"
-
#define MPTCP_SUPPORTED_VERSION 1

/* MPTCP option bits */

--
2.43.0