diff options
| -rw-r--r-- | include/net/inet_hashtables.h | 2 | ||||
| -rw-r--r-- | net/ipv4/inet_hashtables.c | 6 | ||||
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 48ac620cb846..97dc35ad09be 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h | |||
| @@ -389,7 +389,7 @@ static inline struct sock *inet_lookup(struct net *net, | |||
| 389 | } | 389 | } |
| 390 | 390 | ||
| 391 | extern int __inet_hash_connect(struct inet_timewait_death_row *death_row, | 391 | extern int __inet_hash_connect(struct inet_timewait_death_row *death_row, |
| 392 | struct sock *sk, | 392 | struct sock *sk, u32 port_offset, |
| 393 | int (*check_established)(struct inet_timewait_death_row *, | 393 | int (*check_established)(struct inet_timewait_death_row *, |
| 394 | struct sock *, __u16, struct inet_timewait_sock **), | 394 | struct sock *, __u16, struct inet_timewait_sock **), |
| 395 | void (*hash)(struct sock *sk)); | 395 | void (*hash)(struct sock *sk)); |
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 90f422c9447b..9cac6c034abd 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
| @@ -398,7 +398,7 @@ out: | |||
| 398 | EXPORT_SYMBOL_GPL(inet_unhash); | 398 | EXPORT_SYMBOL_GPL(inet_unhash); |
| 399 | 399 | ||
| 400 | int __inet_hash_connect(struct inet_timewait_death_row *death_row, | 400 | int __inet_hash_connect(struct inet_timewait_death_row *death_row, |
| 401 | struct sock *sk, | 401 | struct sock *sk, u32 port_offset, |
| 402 | int (*check_established)(struct inet_timewait_death_row *, | 402 | int (*check_established)(struct inet_timewait_death_row *, |
| 403 | struct sock *, __u16, struct inet_timewait_sock **), | 403 | struct sock *, __u16, struct inet_timewait_sock **), |
| 404 | void (*hash)(struct sock *sk)) | 404 | void (*hash)(struct sock *sk)) |
| @@ -413,7 +413,7 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, | |||
| 413 | if (!snum) { | 413 | if (!snum) { |
| 414 | int i, remaining, low, high, port; | 414 | int i, remaining, low, high, port; |
| 415 | static u32 hint; | 415 | static u32 hint; |
| 416 | u32 offset = hint + inet_sk_port_offset(sk); | 416 | u32 offset = hint + port_offset; |
| 417 | struct hlist_node *node; | 417 | struct hlist_node *node; |
| 418 | struct inet_timewait_sock *tw = NULL; | 418 | struct inet_timewait_sock *tw = NULL; |
| 419 | 419 | ||
| @@ -502,7 +502,7 @@ EXPORT_SYMBOL_GPL(__inet_hash_connect); | |||
| 502 | int inet_hash_connect(struct inet_timewait_death_row *death_row, | 502 | int inet_hash_connect(struct inet_timewait_death_row *death_row, |
| 503 | struct sock *sk) | 503 | struct sock *sk) |
| 504 | { | 504 | { |
| 505 | return __inet_hash_connect(death_row, sk, | 505 | return __inet_hash_connect(death_row, sk, inet_sk_port_offset(sk), |
| 506 | __inet_check_established, __inet_hash_nolisten); | 506 | __inet_check_established, __inet_hash_nolisten); |
| 507 | } | 507 | } |
| 508 | 508 | ||
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 43f3993e1f30..99fd25f7f005 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c | |||
| @@ -236,7 +236,7 @@ static inline u32 inet6_sk_port_offset(const struct sock *sk) | |||
| 236 | int inet6_hash_connect(struct inet_timewait_death_row *death_row, | 236 | int inet6_hash_connect(struct inet_timewait_death_row *death_row, |
| 237 | struct sock *sk) | 237 | struct sock *sk) |
| 238 | { | 238 | { |
| 239 | return __inet_hash_connect(death_row, sk, | 239 | return __inet_hash_connect(death_row, sk, inet6_sk_port_offset(sk), |
| 240 | __inet6_check_established, __inet6_hash); | 240 | __inet6_check_established, __inet6_hash); |
| 241 | } | 241 | } |
| 242 | 242 | ||
