[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200623223115.152832-3-edumazet@google.com>
Date: Tue, 23 Jun 2020 15:31:12 -0700
From: Eric Dumazet <edumazet@...gle.com>
To: "David S . Miller" <davem@...emloft.net>
Cc: netdev <netdev@...r.kernel.org>,
Eric Dumazet <edumazet@...gle.com>,
Eric Dumazet <eric.dumazet@...il.com>
Subject: [PATCH net-next 2/5] tcp: move ipv6_specific declaration to remove a warning
ipv6_specific should be declared in tcp include files,
not mptcp.
This removes the following warning :
CHECK net/ipv6/tcp_ipv6.c
net/ipv6/tcp_ipv6.c:78:42: warning: symbol 'ipv6_specific' was not declared. Should it be static?
Signed-off-by: Eric Dumazet <edumazet@...gle.com>
---
include/net/tcp.h | 2 ++
net/mptcp/protocol.h | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/net/tcp.h b/include/net/tcp.h
index a8c36fa886a48bb3a242d0360a581b2aba49756b..e6920ae0765cc54570059d0a1aa43dba4e74c511 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -933,6 +933,8 @@ static inline int tcp_v6_sdif(const struct sk_buff *skb)
return 0;
}
+extern const struct inet_connection_sock_af_ops ipv6_specific;
+
INDIRECT_CALLABLE_DECLARE(void tcp_v6_send_check(struct sock *sk, struct sk_buff *skb));
INDIRECT_CALLABLE_DECLARE(int tcp_v6_rcv(struct sk_buff *skb));
INDIRECT_CALLABLE_DECLARE(void tcp_v6_early_demux(struct sk_buff *skb));
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index db56535dfc29c7011d94ac5c2cede985b8fc063c..d4294b6d23e4de3ac5551f8b9ec781cf07c8081d 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -355,9 +355,6 @@ static inline void mptcp_subflow_tcp_fallback(struct sock *sk,
}
extern const struct inet_connection_sock_af_ops ipv4_specific;
-#if IS_ENABLED(CONFIG_MPTCP_IPV6)
-extern const struct inet_connection_sock_af_ops ipv6_specific;
-#endif
void mptcp_proto_init(void);
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
--
2.27.0.111.gc72c7da667-goog
Powered by blists - more mailing lists