diff options
| author | Eric Dumazet <edumazet@google.com> | 2020-06-23 15:31:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-23 20:10:15 -0700 |
| commit | b03d2142bea8cf7407a0a668ce8f5f115bd226c4 (patch) | |
| tree | a7f309c617dc49a426ac7aafc23204c637fce4c0 | |
| parent | 243600ee660531d2b5b5ef3faab90c5f8ff4c2b6 (diff) | |
| download | linux-b03d2142bea8cf7407a0a668ce8f5f115bd226c4.tar.gz linux-b03d2142bea8cf7407a0a668ce8f5f115bd226c4.tar.bz2 linux-b03d2142bea8cf7407a0a668ce8f5f115bd226c4.zip | |
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@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/tcp.h | 2 | ||||
| -rw-r--r-- | 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 a8c36fa886a4..e6920ae0765c 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 db56535dfc29..d4294b6d23e4 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) |