aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/raw.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-03-31 22:41:46 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-31 22:41:46 -0400
commitc29a0bc4dfc4d833eb702b1929cec96a3eeb9f7a (patch)
tree4917ad0bd8979dcae34f626032b28e62b9e358fd /net/ipv4/raw.c
parent8efa6e93cb2666dceafc4844057fdcb9aa324fb7 (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/raw.c')
-rw-r--r--net/ipv4/raw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 349205048557..11d7f753a820 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -93,7 +93,7 @@ void raw_hash_sk(struct sock *sk)
93 93
94 write_lock_bh(&h->lock); 94 write_lock_bh(&h->lock);
95 sk_add_node(sk, head); 95 sk_add_node(sk, head);
96 sock_prot_inuse_add(sk->sk_prot, 1); 96 sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
97 write_unlock_bh(&h->lock); 97 write_unlock_bh(&h->lock);
98} 98}
99EXPORT_SYMBOL_GPL(raw_hash_sk); 99EXPORT_SYMBOL_GPL(raw_hash_sk);
@@ -104,7 +104,7 @@ void raw_unhash_sk(struct sock *sk)
104 104
105 write_lock_bh(&h->lock); 105 write_lock_bh(&h->lock);
106 if (sk_del_node_init(sk)) 106 if (sk_del_node_init(sk))
107 sock_prot_inuse_add(sk->sk_prot, -1); 107 sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
108 write_unlock_bh(&h->lock); 108 write_unlock_bh(&h->lock);
109} 109}
110EXPORT_SYMBOL_GPL(raw_unhash_sk); 110EXPORT_SYMBOL_GPL(raw_unhash_sk);