diff options
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
-rw-r--r-- | net/ipv4/inet_hashtables.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 0ce0595d9861..6af375afeeef 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
@@ -120,13 +120,12 @@ int __inet_inherit_port(struct sock *sk, struct sock *child) | |||
120 | * that the listener socket's icsk_bind_hash is the same | 120 | * that the listener socket's icsk_bind_hash is the same |
121 | * as that of the child socket. We have to look up or | 121 | * as that of the child socket. We have to look up or |
122 | * create a new bind bucket for the child here. */ | 122 | * create a new bind bucket for the child here. */ |
123 | struct hlist_node *node; | 123 | inet_bind_bucket_for_each(tb, &head->chain) { |
124 | inet_bind_bucket_for_each(tb, node, &head->chain) { | ||
125 | if (net_eq(ib_net(tb), sock_net(sk)) && | 124 | if (net_eq(ib_net(tb), sock_net(sk)) && |
126 | tb->port == port) | 125 | tb->port == port) |
127 | break; | 126 | break; |
128 | } | 127 | } |
129 | if (!node) { | 128 | if (!tb) { |
130 | tb = inet_bind_bucket_create(table->bind_bucket_cachep, | 129 | tb = inet_bind_bucket_create(table->bind_bucket_cachep, |
131 | sock_net(sk), head, port); | 130 | sock_net(sk), head, port); |
132 | if (!tb) { | 131 | if (!tb) { |
@@ -493,7 +492,6 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, | |||
493 | int i, remaining, low, high, port; | 492 | int i, remaining, low, high, port; |
494 | static u32 hint; | 493 | static u32 hint; |
495 | u32 offset = hint + port_offset; | 494 | u32 offset = hint + port_offset; |
496 | struct hlist_node *node; | ||
497 | struct inet_timewait_sock *tw = NULL; | 495 | struct inet_timewait_sock *tw = NULL; |
498 | 496 | ||
499 | inet_get_local_port_range(&low, &high); | 497 | inet_get_local_port_range(&low, &high); |
@@ -512,7 +510,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, | |||
512 | * because the established check is already | 510 | * because the established check is already |
513 | * unique enough. | 511 | * unique enough. |
514 | */ | 512 | */ |
515 | inet_bind_bucket_for_each(tb, node, &head->chain) { | 513 | inet_bind_bucket_for_each(tb, &head->chain) { |
516 | if (net_eq(ib_net(tb), net) && | 514 | if (net_eq(ib_net(tb), net) && |
517 | tb->port == port) { | 515 | tb->port == port) { |
518 | if (tb->fastreuse >= 0 || | 516 | if (tb->fastreuse >= 0 || |