diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-03-31 22:41:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-31 22:41:46 -0400 |
commit | c29a0bc4dfc4d833eb702b1929cec96a3eeb9f7a (patch) | |
tree | 4917ad0bd8979dcae34f626032b28e62b9e358fd /net/ipv4/inet_timewait_sock.c | |
parent | 8efa6e93cb2666dceafc4844057fdcb9aa324fb7 (diff) |
[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/ipv4/inet_timewait_sock.c')
-rw-r--r-- | net/ipv4/inet_timewait_sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c index f12bc24de46f..a74137866fbc 100644 --- a/net/ipv4/inet_timewait_sock.c +++ b/net/ipv4/inet_timewait_sock.c | |||
@@ -91,7 +91,7 @@ void __inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk, | |||
91 | 91 | ||
92 | /* Step 2: Remove SK from established hash. */ | 92 | /* Step 2: Remove SK from established hash. */ |
93 | if (__sk_del_node_init(sk)) | 93 | if (__sk_del_node_init(sk)) |
94 | sock_prot_inuse_add(sk->sk_prot, -1); | 94 | sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1); |
95 | 95 | ||
96 | /* Step 3: Hash TW into TIMEWAIT chain. */ | 96 | /* Step 3: Hash TW into TIMEWAIT chain. */ |
97 | inet_twsk_add_node(tw, &ehead->twchain); | 97 | inet_twsk_add_node(tw, &ehead->twchain); |