diff options
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 2b79377b468d..fb7ad5a21ff3 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
| @@ -99,7 +99,6 @@ void inet_put_port(struct sock *sk) | |||
| 99 | __inet_put_port(sk); | 99 | __inet_put_port(sk); |
| 100 | local_bh_enable(); | 100 | local_bh_enable(); |
| 101 | } | 101 | } |
| 102 | |||
| 103 | EXPORT_SYMBOL(inet_put_port); | 102 | EXPORT_SYMBOL(inet_put_port); |
| 104 | 103 | ||
| 105 | void __inet_inherit_port(struct sock *sk, struct sock *child) | 104 | void __inet_inherit_port(struct sock *sk, struct sock *child) |
| @@ -116,7 +115,6 @@ void __inet_inherit_port(struct sock *sk, struct sock *child) | |||
| 116 | inet_csk(child)->icsk_bind_hash = tb; | 115 | inet_csk(child)->icsk_bind_hash = tb; |
| 117 | spin_unlock(&head->lock); | 116 | spin_unlock(&head->lock); |
| 118 | } | 117 | } |
| 119 | |||
| 120 | EXPORT_SYMBOL_GPL(__inet_inherit_port); | 118 | EXPORT_SYMBOL_GPL(__inet_inherit_port); |
| 121 | 119 | ||
| 122 | static inline int compute_score(struct sock *sk, struct net *net, | 120 | static inline int compute_score(struct sock *sk, struct net *net, |
| @@ -456,6 +454,8 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, | |||
| 456 | local_bh_disable(); | 454 | local_bh_disable(); |
| 457 | for (i = 1; i <= remaining; i++) { | 455 | for (i = 1; i <= remaining; i++) { |
| 458 | port = low + (i + offset) % remaining; | 456 | port = low + (i + offset) % remaining; |
| 457 | if (inet_is_reserved_local_port(port)) | ||
| 458 | continue; | ||
| 459 | head = &hinfo->bhash[inet_bhashfn(net, port, | 459 | head = &hinfo->bhash[inet_bhashfn(net, port, |
| 460 | hinfo->bhash_size)]; | 460 | hinfo->bhash_size)]; |
| 461 | spin_lock(&head->lock); | 461 | spin_lock(&head->lock); |
| @@ -544,7 +544,6 @@ int inet_hash_connect(struct inet_timewait_death_row *death_row, | |||
| 544 | return __inet_hash_connect(death_row, sk, inet_sk_port_offset(sk), | 544 | return __inet_hash_connect(death_row, sk, inet_sk_port_offset(sk), |
| 545 | __inet_check_established, __inet_hash_nolisten); | 545 | __inet_check_established, __inet_hash_nolisten); |
| 546 | } | 546 | } |
| 547 | |||
| 548 | EXPORT_SYMBOL_GPL(inet_hash_connect); | 547 | EXPORT_SYMBOL_GPL(inet_hash_connect); |
| 549 | 548 | ||
| 550 | void inet_hashinfo_init(struct inet_hashinfo *h) | 549 | void inet_hashinfo_init(struct inet_hashinfo *h) |
| @@ -558,5 +557,4 @@ void inet_hashinfo_init(struct inet_hashinfo *h) | |||
| 558 | i + LISTENING_NULLS_BASE); | 557 | i + LISTENING_NULLS_BASE); |
| 559 | } | 558 | } |
| 560 | } | 559 | } |
| 561 | |||
| 562 | EXPORT_SYMBOL_GPL(inet_hashinfo_init); | 560 | EXPORT_SYMBOL_GPL(inet_hashinfo_init); |
