Commit 06fc4b1c authored by Geliang Tang's avatar Geliang Tang
Browse files

mptcp: drop duplicate header inclusions 

mainline inclusion
from mainline-v6.9-rc1
commit d5dfbfa2f88eead230d411d1a58f38d6241e2882
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=d5dfbfa2f88eead230d411d1a58f38d6241e2882



--------------------------------

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: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu 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: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 22b613ee

net/mptcp/diag.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/net.h>

#include <linux/inet_diag.h>

#include <net/netlink.h>

#include <uapi/linux/mptcp.h>

#include "protocol.h"



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

net/mptcp/mptcp_diag.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/net.h>

#include <linux/inet_diag.h>

#include <net/netlink.h>

#include <uapi/linux/mptcp.h>

#include "protocol.h"



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

net/mptcp/pm.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#define pr_fmt(fmt) "MPTCP: " fmt



#include <linux/kernel.h>

#include <net/tcp.h>

#include <net/mptcp.h>

#include "protocol.h"

net/mptcp/pm_netlink.c

+0 −3
Original line number Diff line number Diff line
@@ -8,12 +8,9 @@ 


#include <linux/inet.h>

#include <linux/kernel.h>

#include <net/tcp.h>

#include <net/inet_common.h>

#include <net/netns/generic.h>

#include <net/mptcp.h>

#include <net/genetlink.h>

#include <uapi/linux/mptcp.h>



#include "protocol.h"

#include "mib.h"

net/mptcp/protocol.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <net/inet_common.h>

#include <net/inet_hashtables.h>

#include <net/protocol.h>

#include <net/tcp.h>

#include <net/tcp_states.h>

#if IS_ENABLED(CONFIG_MPTCP_IPV6)

#include <net/transp_v6.h>