Commit fd8b330c authored by David S. Miller's avatar David S. Miller
Browse files

tcp: fix build... 



Remove accidental dup of tcp_wmem_schedule.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47cfd061

net/ipv4/tcp.c

+0 −16
Original line number Diff line number Diff line
@@ -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)

{