: Move dccp_hashinfo from ipv4.c to the core
PATCH 5/7 : Move dccp_hashinfo from ipv4.c to the core
As it is used by both ipv4 and ipv6.
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
net/dccp/ipv4.c | 8 -------- net/dccp/proto.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-)
dd931ecebe9c97b8a75ac0b720c0da5f5c452408
net/dccp/ipv4.c +0 -8
@@ -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
@@ -47,6 +47,14 @@ atomic_t dccp_orphan_count = ATOMIC_INITEXPORT_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,
Signature · 1 line
1.2.2.gd27d