diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:47:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 11:47:29 -0500 |
| commit | fdccffc6b711d1bfcd1e1b569537686dcad423e2 (patch) | |
| tree | 51a4cdfad5ed6ea0fcec697f0f8e53a1d33ef326 /net/core | |
| parent | 4fa639123d9e6e8dfaa3d116368f4b2478da31af (diff) | |
| parent | 3eb4801d7bde42b82f05137392a1ee0ece090bad (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: drop duplicate assignment in request_sock
[IPSEC]: Fix tunnel error handling in ipcomp6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/request_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/request_sock.c b/net/core/request_sock.c index 98f0fc923f91..1e44eda1fda9 100644 --- a/net/core/request_sock.c +++ b/net/core/request_sock.c | |||
| @@ -51,7 +51,7 @@ int reqsk_queue_alloc(struct request_sock_queue *queue, | |||
| 51 | 51 | ||
| 52 | get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd)); | 52 | get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd)); |
| 53 | rwlock_init(&queue->syn_wait_lock); | 53 | rwlock_init(&queue->syn_wait_lock); |
| 54 | queue->rskq_accept_head = queue->rskq_accept_head = NULL; | 54 | queue->rskq_accept_head = NULL; |
| 55 | lopt->nr_table_entries = nr_table_entries; | 55 | lopt->nr_table_entries = nr_table_entries; |
| 56 | 56 | ||
| 57 | write_lock_bh(&queue->syn_wait_lock); | 57 | write_lock_bh(&queue->syn_wait_lock); |