[net-next] tcp: Remove unused function declarations

Message ID 20230729122644.10648-1-yuehaibing@huawei.com
State New
Headers
Series [net-next] tcp: Remove unused function declarations |

Commit Message

Yue Haibing July 29, 2023, 12:26 p.m. UTC
  commit 8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")
left behind tcp_bpf_get_proto() declaration. And tcp_v4_tw_remember_stamp()
function is remove in ccb7c410ddc0 ("timewait_sock: Create and use getpeer op.").
Since commit 686989700cab ("tcp: simplify tcp_mark_skb_lost")
tcp_skb_mark_lost_uncond_verify() declaration is not used anymore.

Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
---
 include/net/tcp.h | 3 ---
 1 file changed, 3 deletions(-)
  

Comments

Simon Horman July 30, 2023, 6:05 p.m. UTC | #1
On Sat, Jul 29, 2023 at 08:26:44PM +0800, Yue Haibing wrote:
> commit 8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")
> left behind tcp_bpf_get_proto() declaration. And tcp_v4_tw_remember_stamp()
> function is remove in ccb7c410ddc0 ("timewait_sock: Create and use getpeer op.").
> Since commit 686989700cab ("tcp: simplify tcp_mark_skb_lost")
> tcp_skb_mark_lost_uncond_verify() declaration is not used anymore.
> 
> Signed-off-by: Yue Haibing <yuehaibing@huawei.com>

Reviewed-by: Simon Horman <horms@kernel.org>
  
Eric Dumazet July 31, 2023, 6:32 a.m. UTC | #2
On Sat, Jul 29, 2023 at 2:27 PM Yue Haibing <yuehaibing@huawei.com> wrote:
>
> commit 8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")
> left behind tcp_bpf_get_proto() declaration. And tcp_v4_tw_remember_stamp()
> function is remove in ccb7c410ddc0 ("timewait_sock: Create and use getpeer op.").
> Since commit 686989700cab ("tcp: simplify tcp_mark_skb_lost")
> tcp_skb_mark_lost_uncond_verify() declaration is not used anymore.
>
> Signed-off-by: Yue Haibing <yuehaibing@huawei.com>

SGTM, thanks.

Reviewed-by: Eric Dumazet <edumazet@google.com>
  
patchwork-bot+netdevbpf@kernel.org July 31, 2023, 9:40 p.m. UTC | #3
Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Sat, 29 Jul 2023 20:26:44 +0800 you wrote:
> commit 8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")
> left behind tcp_bpf_get_proto() declaration. And tcp_v4_tw_remember_stamp()
> function is remove in ccb7c410ddc0 ("timewait_sock: Create and use getpeer op.").
> Since commit 686989700cab ("tcp: simplify tcp_mark_skb_lost")
> tcp_skb_mark_lost_uncond_verify() declaration is not used anymore.
> 
> Signed-off-by: Yue Haibing <yuehaibing@huawei.com>
> 
> [...]

Here is the summary with links:
  - [net-next] tcp: Remove unused function declarations
    https://git.kernel.org/netdev/net-next/c/68223f96997e

You are awesome, thank you!
  

Patch

diff --git a/include/net/tcp.h b/include/net/tcp.h
index cb0d9f4f4fa0..e0ea9b6083bd 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -322,7 +322,6 @@  int tcp_v4_early_demux(struct sk_buff *skb);
 int tcp_v4_rcv(struct sk_buff *skb);
 
 void tcp_remove_empty_skb(struct sock *sk);
-int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);
 int tcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);
 int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size);
 int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, int *copied,
@@ -621,7 +620,6 @@  void tcp_skb_collapse_tstamp(struct sk_buff *skb,
 void tcp_rearm_rto(struct sock *sk);
 void tcp_synack_rtt_meas(struct sock *sk, struct request_sock *req);
 void tcp_reset(struct sock *sk, struct sk_buff *skb);
-void tcp_skb_mark_lost_uncond_verify(struct tcp_sock *tp, struct sk_buff *skb);
 void tcp_fin(struct sock *sk);
 void tcp_check_space(struct sock *sk);
 void tcp_sack_compress_send_ack(struct sock *sk);
@@ -2359,7 +2357,6 @@  struct sk_msg;
 struct sk_psock;
 
 #ifdef CONFIG_BPF_SYSCALL
-struct proto *tcp_bpf_get_proto(struct sock *sk, struct sk_psock *psock);
 int tcp_bpf_update_proto(struct sock *sk, struct sk_psock *psock, bool restore);
 void tcp_bpf_clone(const struct sock *sk, struct sock *newsk);
 #endif /* CONFIG_BPF_SYSCALL */