aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNorbert Kiesel <nkiesel@tbdnetworks.com>2006-03-26 20:39:55 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-26 20:39:55 -0500
commit3eb4801d7bde42b82f05137392a1ee0ece090bad (patch)
treeb2c77a296de517b8b1c551fd81b1795a9d1204a2
parent6abaaaae6d5ed52422c8caf65f3cdbb95579bb58 (diff)
[NET]: drop duplicate assignment in request_sock
Just noticed that request_sock.[ch] contain a useless assignment of rskq_accept_head to itself. I assume this is a typo and the 2nd one was supposed to be _tail. However, setting _tail to NULL is not needed, so the patch below just drops the 2nd assignment. Signed-off-By: Norbert Kiesel <nkiesel@tbdnetworks.com> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/request_sock.h2
-rw-r--r--net/core/request_sock.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/request_sock.h b/include/net/request_sock.h
index 11641c9384f7..c5d7f920c352 100644
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -145,7 +145,7 @@ static inline struct request_sock *
145{ 145{
146 struct request_sock *req = queue->rskq_accept_head; 146 struct request_sock *req = queue->rskq_accept_head;
147 147
148 queue->rskq_accept_head = queue->rskq_accept_head = NULL; 148 queue->rskq_accept_head = NULL;
149 return req; 149 return req;
150} 150}
151 151
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);