diff options
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r-- | net/ipv4/tcp_timer.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index c0feeeef962a..f753f9d2fee3 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -239,7 +239,6 @@ static int tcp_write_timeout(struct sock *sk) | |||
239 | /* Called with BH disabled */ | 239 | /* Called with BH disabled */ |
240 | void tcp_delack_timer_handler(struct sock *sk) | 240 | void tcp_delack_timer_handler(struct sock *sk) |
241 | { | 241 | { |
242 | struct tcp_sock *tp = tcp_sk(sk); | ||
243 | struct inet_connection_sock *icsk = inet_csk(sk); | 242 | struct inet_connection_sock *icsk = inet_csk(sk); |
244 | 243 | ||
245 | sk_mem_reclaim_partial(sk); | 244 | sk_mem_reclaim_partial(sk); |
@@ -254,17 +253,6 @@ void tcp_delack_timer_handler(struct sock *sk) | |||
254 | } | 253 | } |
255 | icsk->icsk_ack.pending &= ~ICSK_ACK_TIMER; | 254 | icsk->icsk_ack.pending &= ~ICSK_ACK_TIMER; |
256 | 255 | ||
257 | if (!skb_queue_empty(&tp->ucopy.prequeue)) { | ||
258 | struct sk_buff *skb; | ||
259 | |||
260 | __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPSCHEDULERFAILED); | ||
261 | |||
262 | while ((skb = __skb_dequeue(&tp->ucopy.prequeue)) != NULL) | ||
263 | sk_backlog_rcv(sk, skb); | ||
264 | |||
265 | tp->ucopy.memory = 0; | ||
266 | } | ||
267 | |||
268 | if (inet_csk_ack_scheduled(sk)) { | 256 | if (inet_csk_ack_scheduled(sk)) { |
269 | if (!icsk->icsk_ack.pingpong) { | 257 | if (!icsk->icsk_ack.pingpong) { |
270 | /* Delayed ACK missed: inflate ATO. */ | 258 | /* Delayed ACK missed: inflate ATO. */ |