summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2006-02-27 13:30:43 -0800
committerDavid S. Miller <davem@davemloft.net>2006-02-27 13:30:43 -0800
commitba13c98405ba44d37d148376c6615e6c8babbfdc (patch)
tree34bab6d3ae89637192fea5a7e2a59925804840ee
parentbafac2a512bf4fd2ce7520f3976ce8aab4435f74 (diff)
downloadlinux-3.10-ba13c98405ba44d37d148376c6615e6c8babbfdc.tar.gz
linux-3.10-ba13c98405ba44d37d148376c6615e6c8babbfdc.tar.bz2
linux-3.10-ba13c98405ba44d37d148376c6615e6c8babbfdc.zip
[REQSK]: Don't reset rskq_defer_accept in reqsk_queue_alloc
In 295f7324ff8d9ea58b4d3ec93b1aaa1d80e048a9 I moved defer_accept from tcp_sock to request_queue and mistakingly reset it at reqsl_queue_alloc, causing calls to setsockopt(TCP_DEFER_ACCEPT ) to be lost after bind, the fix is to remove the zeroing of rskq_defer_accept from reqsl_queue_alloc. Thanks to Alexandra N. Kossovsky <Alexandra.Kossovsky@oktetlabs.ru> for reporting and testing the suggested fix. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/request_sock.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/request_sock.c b/net/core/request_sock.c
index b8203de5ff0..98f0fc923f9 100644
--- a/net/core/request_sock.c
+++ b/net/core/request_sock.c
@@ -52,7 +52,6 @@ int reqsk_queue_alloc(struct request_sock_queue *queue,
get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd));
rwlock_init(&queue->syn_wait_lock);
queue->rskq_accept_head = queue->rskq_accept_head = NULL;
- queue->rskq_defer_accept = 0;
lopt->nr_table_entries = nr_table_entries;
write_lock_bh(&queue->syn_wait_lock);