diff options
Diffstat (limited to 'net/ipv4/inet_connection_sock.c')
-rw-r--r-- | net/ipv4/inet_connection_sock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index bac205136e1c..ba2f90d90cb5 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c | |||
@@ -685,20 +685,20 @@ void reqsk_queue_hash_req(struct request_sock_queue *queue, | |||
685 | req->num_timeout = 0; | 685 | req->num_timeout = 0; |
686 | req->sk = NULL; | 686 | req->sk = NULL; |
687 | 687 | ||
688 | setup_timer(&req->rsk_timer, reqsk_timer_handler, (unsigned long)req); | ||
689 | mod_timer_pinned(&req->rsk_timer, jiffies + timeout); | ||
690 | req->rsk_hash = hash; | ||
691 | |||
688 | /* before letting lookups find us, make sure all req fields | 692 | /* before letting lookups find us, make sure all req fields |
689 | * are committed to memory and refcnt initialized. | 693 | * are committed to memory and refcnt initialized. |
690 | */ | 694 | */ |
691 | smp_wmb(); | 695 | smp_wmb(); |
692 | atomic_set(&req->rsk_refcnt, 2); | 696 | atomic_set(&req->rsk_refcnt, 2); |
693 | setup_timer(&req->rsk_timer, reqsk_timer_handler, (unsigned long)req); | ||
694 | req->rsk_hash = hash; | ||
695 | 697 | ||
696 | spin_lock(&queue->syn_wait_lock); | 698 | spin_lock(&queue->syn_wait_lock); |
697 | req->dl_next = lopt->syn_table[hash]; | 699 | req->dl_next = lopt->syn_table[hash]; |
698 | lopt->syn_table[hash] = req; | 700 | lopt->syn_table[hash] = req; |
699 | spin_unlock(&queue->syn_wait_lock); | 701 | spin_unlock(&queue->syn_wait_lock); |
700 | |||
701 | mod_timer_pinned(&req->rsk_timer, jiffies + timeout); | ||
702 | } | 702 | } |
703 | EXPORT_SYMBOL(reqsk_queue_hash_req); | 703 | EXPORT_SYMBOL(reqsk_queue_hash_req); |
704 | 704 | ||