diff options
| author |   Pavel Emelyanov <xemul@openvz.org> | 2008-06-16 17:13:48 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-06-16 17:13:48 -0700 |
| commit | 33de014c63646f69f36f3673e3b4676f931dc878 (patch) | |
| tree | c4f3afa3224fdb887b8606a7327424bf407bff93 /include/net/inet6_hashtables.h | |
| parent | inet: add struct net argument to inet_ehashfn (diff) | |
| download | linux-dev-33de014c63646f69f36f3673e3b4676f931dc878.tar.xz linux-dev-33de014c63646f69f36f3673e3b4676f931dc878.zip | |
inet6: add struct net argument to inet6_ehashfn
Same as for inet_hashfn, prepare its ipv6 incarnation.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet6_hashtables.h')
| -rw-r--r-- | include/net/inet6_hashtables.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h index 62a5b691858e..72f13a9928e4 100644 --- a/include/net/inet6_hashtables.h +++ b/include/net/inet6_hashtables.h @@ -28,7 +28,8 @@ struct inet_hashinfo; /* I have no idea if this is a good hash for v6 or not. -DaveM */ -static inline unsigned int inet6_ehashfn(const struct in6_addr *laddr, const u16 lport, +static inline unsigned int inet6_ehashfn(struct net *net, + const struct in6_addr *laddr, const u16 lport, const struct in6_addr *faddr, const __be16 fport) { u32 ports = (lport ^ (__force u16)fport); @@ -46,7 +47,9 @@ static inline int inet6_sk_ehashfn(const struct sock *sk) const struct in6_addr *faddr = &np->daddr; const __u16 lport = inet->num; const __be16 fport = inet->dport; - return inet6_ehashfn(laddr, lport, faddr, fport); + struct net *net = sock_net(sk); + + return inet6_ehashfn(net, laddr, lport, faddr, fport); } extern void __inet6_hash(struct sock *sk); |