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

Commit 075ae866 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[DCCP]: Move dccp_hashinfo from ipv4.c to the core 



As it is used by both ipv4 and ipv6.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a1ec676

net/dccp/ipv4.c

+0 −8
Original line number Diff line number Diff line
@@ -30,14 +30,6 @@ 
#include "dccp.h"

#include "feat.h"



struct inet_hashinfo __cacheline_aligned dccp_hashinfo = {

	.lhash_lock	= RW_LOCK_UNLOCKED,

	.lhash_users	= ATOMIC_INIT(0),

	.lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait),

};



EXPORT_SYMBOL_GPL(dccp_hashinfo);



static int dccp_v4_get_port(struct sock *sk, const unsigned short snum)

{

	return inet_csk_get_port(&dccp_hashinfo, sk, snum,

net/dccp/proto.c

+8 −0
Original line number Diff line number Diff line
@@ -47,6 +47,14 @@ atomic_t dccp_orphan_count = ATOMIC_INIT(0); 


EXPORT_SYMBOL_GPL(dccp_orphan_count);



struct inet_hashinfo __cacheline_aligned dccp_hashinfo = {

	.lhash_lock	= RW_LOCK_UNLOCKED,

	.lhash_users	= ATOMIC_INIT(0),

	.lhash_wait = __WAIT_QUEUE_HEAD_INITIALIZER(dccp_hashinfo.lhash_wait),

};



EXPORT_SYMBOL_GPL(dccp_hashinfo);



static struct net_protocol dccp_protocol = {

	.handler	= dccp_v4_rcv,

	.err_handler	= dccp_v4_err,