diff options
| author |   Pavel Emelyanov <xemul@openvz.org> | 2008-06-16 17:13:27 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-06-16 17:13:27 -0700 |
| commit | 9f26b3add3783c0af869ea2207871da5dafefffa (patch) | |
| tree | adadfc84d2daf5133c0c536d87242df049daf53e /include/net/inet_sock.h | |
| parent | inet: add struct net argument to inet_lhashfn (diff) | |
| download | linux-dev-9f26b3add3783c0af869ea2207871da5dafefffa.tar.xz linux-dev-9f26b3add3783c0af869ea2207871da5dafefffa.zip | |
inet: add struct net argument to inet_ehashfn
Although this hash takes addresses into account, the ehash chains
can also be too long when, for instance, communications via lo occur.
So, prepare the inet_hashfn to take struct net into account.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_sock.h')
| -rw-r--r-- | include/net/inet_sock.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 9fabe5b38912..85bb420c5d86 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -171,7 +171,8 @@ extern int inet_sk_rebuild_header(struct sock *sk); extern u32 inet_ehash_secret; extern void build_ehash_secret(void); -static inline unsigned int inet_ehashfn(const __be32 laddr, const __u16 lport, +static inline unsigned int inet_ehashfn(struct net *net, + const __be32 laddr, const __u16 lport, const __be32 faddr, const __be16 fport) { return jhash_3words((__force __u32) laddr, @@ -187,8 +188,9 @@ static inline int inet_sk_ehashfn(const struct sock *sk) const __u16 lport = inet->num; const __be32 faddr = inet->daddr; const __be16 fport = inet->dport; + struct net *net = sock_net(sk); - return inet_ehashfn(laddr, lport, faddr, fport); + return inet_ehashfn(net, laddr, lport, faddr, fport); } |