diff options
Diffstat (limited to 'net/ipv4/tcp_timer.c')
-rw-r--r-- | net/ipv4/tcp_timer.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 15505936511d..3daa6b5d766d 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -539,16 +539,6 @@ static void tcp_write_timer(unsigned long data) | |||
539 | sock_put(sk); | 539 | sock_put(sk); |
540 | } | 540 | } |
541 | 541 | ||
542 | /* | ||
543 | * Timer for listening sockets | ||
544 | */ | ||
545 | |||
546 | static void tcp_synack_timer(struct sock *sk) | ||
547 | { | ||
548 | inet_csk_reqsk_queue_prune(sk, TCP_SYNQ_INTERVAL, | ||
549 | TCP_TIMEOUT_INIT, TCP_RTO_MAX); | ||
550 | } | ||
551 | |||
552 | void tcp_syn_ack_timeout(struct sock *sk, struct request_sock *req) | 542 | void tcp_syn_ack_timeout(struct sock *sk, struct request_sock *req) |
553 | { | 543 | { |
554 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPTIMEOUTS); | 544 | NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPTIMEOUTS); |
@@ -583,7 +573,7 @@ static void tcp_keepalive_timer (unsigned long data) | |||
583 | } | 573 | } |
584 | 574 | ||
585 | if (sk->sk_state == TCP_LISTEN) { | 575 | if (sk->sk_state == TCP_LISTEN) { |
586 | tcp_synack_timer(sk); | 576 | pr_err("Hmm... keepalive on a LISTEN ???\n"); |
587 | goto out; | 577 | goto out; |
588 | } | 578 | } |
589 | 579 | ||