diff options
| author | Jens Axboe <axboe@fb.com> | 2015-10-09 18:40:29 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-10-09 18:40:29 +0200 |
| commit | 54ef2b96879334caf8803fdd93b4c556d709d6fd (patch) | |
| tree | 05cfeb36feeb4451f8f4c7069a86ae3490027daf /net/ipv4/inet_connection_sock.c | |
| parent | cdrom: Random writing support for BD-RE media (diff) | |
| parent | Merge tag 'v4.3-rc4' into for-4.4/core (diff) | |
| download | linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.tar.xz linux-54ef2b96879334caf8803fdd93b4c556d709d6fd.zip | |
Merge branch 'for-4.4/core' into for-4.4/drivers
Signed-off-by: Jens Axboe <axboe@fb.com>
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 134957159c27..7bb9c39e0a4d 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, req->num_timeout = 0; req->sk = NULL; + setup_timer(&req->rsk_timer, reqsk_timer_handler, (unsigned long)req); + mod_timer_pinned(&req->rsk_timer, jiffies + timeout); + req->rsk_hash = hash; + /* before letting lookups find us, make sure all req fields * are committed to memory and refcnt initialized. */ smp_wmb(); atomic_set(&req->rsk_refcnt, 2); - setup_timer(&req->rsk_timer, reqsk_timer_handler, (unsigned long)req); - req->rsk_hash = hash; spin_lock(&queue->syn_wait_lock); req->dl_next = lopt->syn_table[hash]; lopt->syn_table[hash] = req; spin_unlock(&queue->syn_wait_lock); - - mod_timer_pinned(&req->rsk_timer, jiffies + timeout); } EXPORT_SYMBOL(reqsk_queue_hash_req); |