inet: add struct net argument to inet_ehashfn

[pandora-kernel.git] / include / net / inet_sock.h

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 9fabe5b..85bb420 100644 (file)
--- 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);
 }