* [PATCH 5/6 net-2.6.25][RAW] Consolidate proto->unhash callback
@ 2007-11-16 14:15 Pavel Emelyanov
2007-11-20 6:38 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Emelyanov @ 2007-11-16 14:15 UTC (permalink / raw)
To: David Miller, Linux Netdev List; +Cc: devel
Same as the ->hash one, this is easily consolidated.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
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 3ed4350..ee01811 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 62b8bc7..07adfcf 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);
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 5/6 net-2.6.25][RAW] Consolidate proto->unhash callback
2007-11-16 14:15 [PATCH 5/6 net-2.6.25][RAW] Consolidate proto->unhash callback Pavel Emelyanov
@ 2007-11-20 6:38 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-11-20 6:38 UTC (permalink / raw)
To: xemul; +Cc: netdev, devel
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 16 Nov 2007 17:15:46 +0300
> Same as the ->hash one, this is easily consolidated.
>
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-20 6:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-16 14:15 [PATCH 5/6 net-2.6.25][RAW] Consolidate proto->unhash callback Pavel Emelyanov
2007-11-20 6:38 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).