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

tcp: tcp_prequeue() cleanup

Small cleanup patch to reduce line lengths, before a change in
tcp_prequeue().
Signed-off-by: default avatarEric Dumazet <dada1@cosmosbay.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d5b78c0
...@@ -890,30 +890,31 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb) ...@@ -890,30 +890,31 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb)
{ {
struct tcp_sock *tp = tcp_sk(sk); struct tcp_sock *tp = tcp_sk(sk);
if (!sysctl_tcp_low_latency && tp->ucopy.task) { if (sysctl_tcp_low_latency || !tp->ucopy.task)
__skb_queue_tail(&tp->ucopy.prequeue, skb); return 0;
tp->ucopy.memory += skb->truesize;
if (tp->ucopy.memory > sk->sk_rcvbuf) { __skb_queue_tail(&tp->ucopy.prequeue, skb);
struct sk_buff *skb1; tp->ucopy.memory += skb->truesize;
if (tp->ucopy.memory > sk->sk_rcvbuf) {
BUG_ON(sock_owned_by_user(sk)); struct sk_buff *skb1;
while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) { BUG_ON(sock_owned_by_user(sk));
sk_backlog_rcv(sk, skb1);
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPPREQUEUEDROPPED); while ((skb1 = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) {
} sk_backlog_rcv(sk, skb1);
NET_INC_STATS_BH(sock_net(sk),
tp->ucopy.memory = 0; LINUX_MIB_TCPPREQUEUEDROPPED);
} else if (skb_queue_len(&tp->ucopy.prequeue) == 1) {
wake_up_interruptible(sk->sk_sleep);
if (!inet_csk_ack_scheduled(sk))
inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
(3 * TCP_RTO_MIN) / 4,
TCP_RTO_MAX);
} }
return 1;
tp->ucopy.memory = 0;
} else if (skb_queue_len(&tp->ucopy.prequeue) == 1) {
wake_up_interruptible(sk->sk_sleep);
if (!inet_csk_ack_scheduled(sk))
inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK,
(3 * TCP_RTO_MIN) / 4,
TCP_RTO_MAX);
} }
return 0; return 1;
} }
......
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