diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-02-05 03:14:44 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-05 03:14:44 -0800 |
commit | 5d8c0aa9433b09387d9021358baef7939f9b32c4 (patch) | |
tree | 839a532abef00a33e3b2357340ad52cec92bce5f /include/net | |
parent | 2bfc79de2b6482955f0e352da7e53787dd8167c0 (diff) | |
download | linux-5d8c0aa9433b09387d9021358baef7939f9b32c4.tar.gz linux-5d8c0aa9433b09387d9021358baef7939f9b32c4.tar.bz2 linux-5d8c0aa9433b09387d9021358baef7939f9b32c4.zip |
[INET]: Fix accidentally broken inet(6)_hash_connect's port offset calculations.
The port offset calculations depend on the protocol family, but, as
Adrian noticed, I broke this logic with the commit
5ee31fc1ecdcbc234c8c56dcacef87c8e09909d8
[INET]: Consolidate inet(6)_hash_connect.
Return this logic back, by passing the port offset directly into the
consolidated function.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Noticed-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/inet_hashtables.h | 2 |
1 files changed, 1 insertions, 1 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, } extern int __inet_hash_connect(struct inet_timewait_death_row *death_row, - struct sock *sk, + struct sock *sk, u32 port_offset, int (*check_established)(struct inet_timewait_death_row *, struct sock *, __u16, struct inet_timewait_sock **), void (*hash)(struct sock *sk)); |