diff options
Diffstat (limited to 'net/ipv4/inet_timewait_sock.c')
-rw-r--r-- | net/ipv4/inet_timewait_sock.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c index 2784db3155fb..1f27c9f4afd0 100644 --- a/net/ipv4/inet_timewait_sock.c +++ b/net/ipv4/inet_timewait_sock.c | |||
@@ -216,7 +216,6 @@ static int inet_twdr_do_twkill_work(struct inet_timewait_death_row *twdr, | |||
216 | const int slot) | 216 | const int slot) |
217 | { | 217 | { |
218 | struct inet_timewait_sock *tw; | 218 | struct inet_timewait_sock *tw; |
219 | struct hlist_node *node; | ||
220 | unsigned int killed; | 219 | unsigned int killed; |
221 | int ret; | 220 | int ret; |
222 | 221 | ||
@@ -229,7 +228,7 @@ static int inet_twdr_do_twkill_work(struct inet_timewait_death_row *twdr, | |||
229 | killed = 0; | 228 | killed = 0; |
230 | ret = 0; | 229 | ret = 0; |
231 | rescan: | 230 | rescan: |
232 | inet_twsk_for_each_inmate(tw, node, &twdr->cells[slot]) { | 231 | inet_twsk_for_each_inmate(tw, &twdr->cells[slot]) { |
233 | __inet_twsk_del_dead_node(tw); | 232 | __inet_twsk_del_dead_node(tw); |
234 | spin_unlock(&twdr->death_lock); | 233 | spin_unlock(&twdr->death_lock); |
235 | __inet_twsk_kill(tw, twdr->hashinfo); | 234 | __inet_twsk_kill(tw, twdr->hashinfo); |
@@ -438,10 +437,10 @@ void inet_twdr_twcal_tick(unsigned long data) | |||
438 | 437 | ||
439 | for (n = 0; n < INET_TWDR_RECYCLE_SLOTS; n++) { | 438 | for (n = 0; n < INET_TWDR_RECYCLE_SLOTS; n++) { |
440 | if (time_before_eq(j, now)) { | 439 | if (time_before_eq(j, now)) { |
441 | struct hlist_node *node, *safe; | 440 | struct hlist_node *safe; |
442 | struct inet_timewait_sock *tw; | 441 | struct inet_timewait_sock *tw; |
443 | 442 | ||
444 | inet_twsk_for_each_inmate_safe(tw, node, safe, | 443 | inet_twsk_for_each_inmate_safe(tw, safe, |
445 | &twdr->twcal_row[slot]) { | 444 | &twdr->twcal_row[slot]) { |
446 | __inet_twsk_del_dead_node(tw); | 445 | __inet_twsk_del_dead_node(tw); |
447 | __inet_twsk_kill(tw, twdr->hashinfo); | 446 | __inet_twsk_kill(tw, twdr->hashinfo); |