Merge branch 'upstream-fixes'

2006-03-01 01:58:38 -05:00
parent dbfedbb981 b5b9d6647c
commit 68727fed54
93 changed files with 1434 additions and 1015 deletions
--- 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);