aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-11-19 22:37:24 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 14:54:31 -0800
commit65b4c50b47c4ac3d2b5a82e5553b8e5613fb9585 (patch)
tree7278ca549a04aba218a93e489a44be4410ec3239 /net
parentb673e4dfc8f29e5bfe4d342029b793e9d504f6dd (diff)
[RAW]: Consolidate proto->hash callback
Having the raw_hashinfo it's easy to consolidate the raw[46]_hash functions. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/raw.c17
-rw-r--r--net/ipv6/raw.c8
2 files changed, 13 insertions, 12 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index dd9f00b3ab4..28b95ae5d2d 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -84,15 +84,22 @@ static struct raw_hashinfo raw_v4_hashinfo = {
.lock = __RW_LOCK_UNLOCKED(),
};
-static void raw_v4_hash(struct sock *sk)
+void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h)
{
- struct hlist_head *head = &raw_v4_hashinfo.ht[inet_sk(sk)->num &
- (RAW_HTABLE_SIZE - 1)];
+ struct hlist_head *head;
- write_lock_bh(&raw_v4_hashinfo.lock);
+ head = &h->ht[inet_sk(sk)->num & (RAW_HTABLE_SIZE - 1)];
+
+ write_lock_bh(&h->lock);
sk_add_node(sk, head);
sock_prot_inc_use(sk->sk_prot);
- write_unlock_bh(&raw_v4_hashinfo.lock);
+ write_unlock_bh(&h->lock);
+}
+EXPORT_SYMBOL_GPL(raw_hash_sk);
+
+static void raw_v4_hash(struct sock *sk)
+{
+ raw_hash_sk(sk, &raw_v4_hashinfo);
}
static void raw_v4_unhash(struct sock *sk)
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 15c72a6365a..70db6f49453 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -67,13 +67,7 @@ static struct raw_hashinfo raw_v6_hashinfo = {
static void raw_v6_hash(struct sock *sk)
{
- struct hlist_head *list = &raw_v6_hashinfo.ht[inet_sk(sk)->num &
- (RAW_HTABLE_SIZE - 1)];
-
- write_lock_bh(&raw_v6_hashinfo.lock);
- sk_add_node(sk, list);
- sock_prot_inc_use(sk->sk_prot);
- write_unlock_bh(&raw_v6_hashinfo.lock);
+ raw_hash_sk(sk, &raw_v6_hashinfo);
}
static void raw_v6_unhash(struct sock *sk)