diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-31 19:41:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-31 19:41:46 -0700 |
| commit | c29a0bc4dfc4d833eb702b1929cec96a3eeb9f7a (patch) | |
| tree | 4917ad0bd8979dcae34f626032b28e62b9e358fd /net/ipv6/inet6_hashtables.c | |
| parent | 8efa6e93cb2666dceafc4844057fdcb9aa324fb7 (diff) | |
| download | op-kernel-dev-c29a0bc4dfc4d833eb702b1929cec96a3eeb9f7a.zip op-kernel-dev-c29a0bc4dfc4d833eb702b1929cec96a3eeb9f7a.tar.gz | |
[SOCK][NETNS]: Add a struct net argument to sock_prot_inuse_add and _get.
This counter is about to become per-proto-and-per-net, so we'll need
two arguments to determine which cell in this "table" to work with.
All the places, but proc already pass proper net to it - proc will be
tuned a bit later.
Some indentation with spaces in proc files is done to keep the file
coding style consistent.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/inet6_hashtables.c')
| -rw-r--r-- | net/ipv6/inet6_hashtables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 340c7d4..580014a 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c @@ -43,7 +43,7 @@ void __inet6_hash(struct sock *sk) } __sk_add_node(sk, list); - sock_prot_inuse_add(sk->sk_prot, 1); + sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); write_unlock(lock); } EXPORT_SYMBOL(__inet6_hash); @@ -204,7 +204,7 @@ unique: BUG_TRAP(sk_unhashed(sk)); __sk_add_node(sk, &head->chain); sk->sk_hash = hash; - sock_prot_inuse_add(sk->sk_prot, 1); + sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); write_unlock(lock); if (twp != NULL) { |
