OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Pavel Emelyanov 2007-11-19 22:37:24 -08:00 committed by David S. Miller
parent b673e4dfc8
commit 65b4c50b47
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/raw.h
View File

@ -39,4 +39,6 @@ extern int raw_proc_init(void);
extern void raw_proc_exit(void);
#endif
void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h);
#endif /* _RAW_H */

17
net/ipv4/raw.c
View File

@ -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)

8
net/ipv6/raw.c
View File

@ -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)