Commit d5dfbfa2 authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski

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: 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.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent eeb78df4
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <linux/net.h> #include <linux/net.h>
#include <linux/inet_diag.h> #include <linux/inet_diag.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <uapi/linux/mptcp.h>
#include "protocol.h" #include "protocol.h"
static int subflow_get_info(struct sock *sk, struct sk_buff *skb) static int subflow_get_info(struct sock *sk, struct sk_buff *skb)
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <linux/net.h> #include <linux/net.h>
#include <linux/inet_diag.h> #include <linux/inet_diag.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <uapi/linux/mptcp.h>
#include "protocol.h" #include "protocol.h"
static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, static int sk_diag_dump(struct sock *sk, struct sk_buff *skb,
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
#define pr_fmt(fmt) "MPTCP: " fmt #define pr_fmt(fmt) "MPTCP: " fmt
#include <linux/kernel.h> #include <linux/kernel.h>
#include <net/tcp.h>
#include <net/mptcp.h> #include <net/mptcp.h>
#include "protocol.h" #include "protocol.h"
......
...@@ -8,12 +8,9 @@ ...@@ -8,12 +8,9 @@
#include <linux/inet.h> #include <linux/inet.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <net/tcp.h>
#include <net/inet_common.h> #include <net/inet_common.h>
#include <net/netns/generic.h> #include <net/netns/generic.h>
#include <net/mptcp.h> #include <net/mptcp.h>
#include <net/genetlink.h>
#include <uapi/linux/mptcp.h>
#include "protocol.h" #include "protocol.h"
#include "mib.h" #include "mib.h"
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <net/inet_common.h> #include <net/inet_common.h>
#include <net/inet_hashtables.h> #include <net/inet_hashtables.h>
#include <net/protocol.h> #include <net/protocol.h>
#include <net/tcp.h>
#include <net/tcp_states.h> #include <net/tcp_states.h>
#if IS_ENABLED(CONFIG_MPTCP_IPV6) #if IS_ENABLED(CONFIG_MPTCP_IPV6)
#include <net/transp_v6.h> #include <net/transp_v6.h>
......
...@@ -15,13 +15,11 @@ ...@@ -15,13 +15,11 @@
#include <net/inet_common.h> #include <net/inet_common.h>
#include <net/inet_hashtables.h> #include <net/inet_hashtables.h>
#include <net/protocol.h> #include <net/protocol.h>
#include <net/tcp.h>
#if IS_ENABLED(CONFIG_MPTCP_IPV6) #if IS_ENABLED(CONFIG_MPTCP_IPV6)
#include <net/ip6_route.h> #include <net/ip6_route.h>
#include <net/transp_v6.h> #include <net/transp_v6.h>
#endif #endif
#include <net/mptcp.h> #include <net/mptcp.h>
#include <uapi/linux/mptcp.h>
#include "protocol.h" #include "protocol.h"
#include "mib.h" #include "mib.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment