Commit a6c5ea4c authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

tcp: rename sk_forced_wmem_schedule() to sk_forced_mem_schedule()

We plan to use sk_forced_wmem_schedule() in input path as well,
so make it non static and rename it.
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a24e04e
...@@ -311,6 +311,8 @@ static inline bool tcp_out_of_memory(struct sock *sk) ...@@ -311,6 +311,8 @@ static inline bool tcp_out_of_memory(struct sock *sk)
return false; return false;
} }
void sk_forced_mem_schedule(struct sock *sk, int size);
static inline bool tcp_too_many_orphans(struct sock *sk, int shift) static inline bool tcp_too_many_orphans(struct sock *sk, int shift)
{ {
struct percpu_counter *ocp = sk->sk_prot->orphan_count; struct percpu_counter *ocp = sk->sk_prot->orphan_count;
......
...@@ -2816,8 +2816,10 @@ void tcp_xmit_retransmit_queue(struct sock *sk) ...@@ -2816,8 +2816,10 @@ void tcp_xmit_retransmit_queue(struct sock *sk)
* connection tear down and (memory) recovery. * connection tear down and (memory) recovery.
* Otherwise tcp_send_fin() could be tempted to either delay FIN * Otherwise tcp_send_fin() could be tempted to either delay FIN
* or even be forced to close flow without any FIN. * or even be forced to close flow without any FIN.
* In general, we want to allow one skb per socket to avoid hangs
* with edge trigger epoll()
*/ */
static void sk_forced_wmem_schedule(struct sock *sk, int size) void sk_forced_mem_schedule(struct sock *sk, int size)
{ {
int amt, status; int amt, status;
...@@ -2864,7 +2866,7 @@ void tcp_send_fin(struct sock *sk) ...@@ -2864,7 +2866,7 @@ void tcp_send_fin(struct sock *sk)
return; return;
} }
skb_reserve(skb, MAX_TCP_HEADER); skb_reserve(skb, MAX_TCP_HEADER);
sk_forced_wmem_schedule(sk, skb->truesize); sk_forced_mem_schedule(sk, skb->truesize);
/* FIN eats a sequence byte, write_seq advanced by tcp_queue_skb(). */ /* FIN eats a sequence byte, write_seq advanced by tcp_queue_skb(). */
tcp_init_nondata_skb(skb, tp->write_seq, tcp_init_nondata_skb(skb, tp->write_seq,
TCPHDR_ACK | TCPHDR_FIN); TCPHDR_ACK | TCPHDR_FIN);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment