Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65b4c50b authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[RAW]: Consolidate proto->hash callback 



Having the raw_hashinfo it's easy to consolidate the
raw[46]_hash functions.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b673e4df

include/net/raw.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

net/ipv4/raw.c

+12 −5
Original line number Diff line number Diff line
@@ -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)

net/ipv6/raw.c

+1 −7
Original line number Diff line number Diff line
@@ -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)