From: David S. Miller <davem@davemloft.net>
Date: Fri, 17 Jun 2022 09:57:22 +0000 (+0100)
Subject: tcp: fix build...
X-Git-Tag: block-6.0-2022-08-12~31^2~344
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fd8b330ce1bb79ba00047435cc213b14f886bf1f;p=linux-2.6-block.git

tcp: fix build...

Remove accidental dup of tcp_wmem_schedule.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 6c3eab485249..f7309452bdce 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -951,22 +951,6 @@ static int tcp_downgrade_zcopy_pure(struct sock *sk, struct sk_buff *skb)
 	return 0;
 }
 
-static int tcp_wmem_schedule(struct sock *sk, int copy)
-{
-	int left;
-
-	if (likely(sk_wmem_schedule(sk, copy)))
-		return copy;
-
-	/* We could be in trouble if we have nothing queued.
-	 * Use whatever is left in sk->sk_forward_alloc and tcp_wmem[0]
-	 * to guarantee some progress.
-	 */
-	left = sock_net(sk)->ipv4.sysctl_tcp_wmem[0] - sk->sk_wmem_queued;
-	if (left > 0)
-		sk_forced_mem_schedule(sk, min(left, copy));
-	return min(copy, sk->sk_forward_alloc);
-}
 
 static int tcp_wmem_schedule(struct sock *sk, int copy)
 {