Skip to content

Commit d5dfbfa

Browse files
Geliang Tangkuba-moo
authored andcommitted
mptcp: drop duplicate header inclusions
The headers net/tcp.h, net/genetlink.h and uapi/linux/mptcp.h are included in protocol.h already, no need to include them again directly. This patch removes these duplicate header inclusions. Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Link: https://lore.kernel.org/r/20240305-upstream-net-next-20240304-mptcp-misc-cleanup-v1-1-c436ba5e569b@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent eeb78df commit d5dfbfa

File tree

6 files changed

+0
-9
lines changed

6 files changed

+0
-9
lines changed

net/mptcp/diag.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <linux/net.h>
1111
#include <linux/inet_diag.h>
1212
#include <net/netlink.h>
13-
#include <uapi/linux/mptcp.h>
1413
#include "protocol.h"
1514

1615
static int subflow_get_info(struct sock *sk, struct sk_buff *skb)

net/mptcp/mptcp_diag.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <linux/net.h>
1111
#include <linux/inet_diag.h>
1212
#include <net/netlink.h>
13-
#include <uapi/linux/mptcp.h>
1413
#include "protocol.h"
1514

1615
static int sk_diag_dump(struct sock *sk, struct sk_buff *skb,

net/mptcp/pm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#define pr_fmt(fmt) "MPTCP: " fmt
77

88
#include <linux/kernel.h>
9-
#include <net/tcp.h>
109
#include <net/mptcp.h>
1110
#include "protocol.h"
1211

net/mptcp/pm_netlink.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88

99
#include <linux/inet.h>
1010
#include <linux/kernel.h>
11-
#include <net/tcp.h>
1211
#include <net/inet_common.h>
1312
#include <net/netns/generic.h>
1413
#include <net/mptcp.h>
15-
#include <net/genetlink.h>
16-
#include <uapi/linux/mptcp.h>
1714

1815
#include "protocol.h"
1916
#include "mib.h"

net/mptcp/protocol.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <net/inet_common.h>
1616
#include <net/inet_hashtables.h>
1717
#include <net/protocol.h>
18-
#include <net/tcp.h>
1918
#include <net/tcp_states.h>
2019
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
2120
#include <net/transp_v6.h>

net/mptcp/subflow.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@
1515
#include <net/inet_common.h>
1616
#include <net/inet_hashtables.h>
1717
#include <net/protocol.h>
18-
#include <net/tcp.h>
1918
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
2019
#include <net/ip6_route.h>
2120
#include <net/transp_v6.h>
2221
#endif
2322
#include <net/mptcp.h>
24-
#include <uapi/linux/mptcp.h>
2523
#include "protocol.h"
2624
#include "mib.h"
2725

0 commit comments

Comments
 (0)