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

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

[RAW]: Consolidate proto->unhash callback 



Same as the ->hash one, this is easily consolidated.

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

include/net/raw.h

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

net/ipv4/raw.c

+10 −4
Original line number Diff line number Diff line
@@ -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,

net/ipv6/raw.c

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

}