From: Pavel Emelyanov <xemul@openvz.org>
Date: Tue, 20 Nov 2007 06:37:58 +0000 (-0800)
Subject: [RAW]: Consolidate proto->unhash callback
X-Git-Tag: v2.6.25-rc1~1162^2~1383
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=ab70768ec78c6784958bab3b58fbe3f4150006df;p=~andy%2Flinux

[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>
---

diff --git a/include/net/raw.h b/include/net/raw.h
index 43f1e3c0738..81a1773b58b 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 28b95ae5d2d..d24501a342a 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 70db6f49453..422d27cfbe1 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);
 }