diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-19 22:37:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:54:31 -0800 |
| commit | ab70768ec78c6784958bab3b58fbe3f4150006df (patch) | |
| tree | 65c09684bb97c028554d6dd7157a6124585f4734 | |
| parent | 65b4c50b47c4ac3d2b5a82e5553b8e5613fb9585 (diff) | |
| download | kernel_samsung_tuna-ab70768ec78c6784958bab3b58fbe3f4150006df.zip kernel_samsung_tuna-ab70768ec78c6784958bab3b58fbe3f4150006df.tar.gz kernel_samsung_tuna-ab70768ec78c6784958bab3b58fbe3f4150006df.tar.bz2 | |
[RAW]: Consolidate proto->unhash callback
Same as the ->hash one, this is easily consolidated.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/raw.h | 1 | ||||
| -rw-r--r-- | net/ipv4/raw.c | 14 | ||||
| -rw-r--r-- | net/ipv6/raw.c | 5 |
3 files changed, 12 insertions, 8 deletions
diff --git a/include/net/raw.h b/include/net/raw.h index 43f1e3c..81a1773 100644 --- a/include/net/raw.h +++ b/include/net/raw.h @@ -40,5 +40,6 @@ extern void raw_proc_exit(void); #endif void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h); +void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h); #endif /* _RAW_H */ diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 28b95ae..d24501a 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -97,6 +97,15 @@ void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h) } EXPORT_SYMBOL_GPL(raw_hash_sk); +void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h) +{ + write_lock_bh(&h->lock); + if (sk_del_node_init(sk)) + sock_prot_dec_use(sk->sk_prot); + write_unlock_bh(&h->lock); +} +EXPORT_SYMBOL_GPL(raw_unhash_sk); + static void raw_v4_hash(struct sock *sk) { raw_hash_sk(sk, &raw_v4_hashinfo); @@ -104,10 +113,7 @@ static void raw_v4_hash(struct sock *sk) static void raw_v4_unhash(struct sock *sk) { - write_lock_bh(&raw_v4_hashinfo.lock); - if (sk_del_node_init(sk)) - sock_prot_dec_use(sk->sk_prot); - write_unlock_bh(&raw_v4_hashinfo.lock); + raw_unhash_sk(sk, &raw_v4_hashinfo); } static struct sock *__raw_v4_lookup(struct sock *sk, unsigned short num, diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 70db6f4..422d27c 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -72,10 +72,7 @@ static void raw_v6_hash(struct sock *sk) static void raw_v6_unhash(struct sock *sk) { - write_lock_bh(&raw_v6_hashinfo.lock); - if (sk_del_node_init(sk)) - sock_prot_dec_use(sk->sk_prot); - write_unlock_bh(&raw_v6_hashinfo.lock); + raw_unhash_sk(sk, &raw_v6_hashinfo); } |