: Move dccp_[un]hash from ipv4.c to the core
PATCH 3/7 : Move dccp_[un]hash from ipv4.c to the core
As this is used by both ipv4 and ipv6 and is not ipv4 specific.
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
net/dccp/dccp.h | 1 + net/dccp/ipv4.c | 14 +------------- net/dccp/ipv6.c | 2 +- net/dccp/proto.c | 14 ++++++++++++++ 4 files changed, 17 insertions(+), 14 deletions(-)
5f50d3a8059644b039b19a43200800783658e130
net/dccp/dccp.h +1 -0
@@ -238,6 +238,7 @@ extern struct sk_buff *dccp_make_responsextern int dccp_connect (struct sock *sk);extern int dccp_disconnect (struct sock *sk,int flags); +extern void dccp_hash (struct sock *sk);extern void dccp_unhash (struct sock *sk);extern int dccp_getsockopt (struct sock *sk,int level,int optname,char __user *optval,int __user *optlen);
net/dccp/ipv4.c +1 -13
@@ -44,18 +44,6 @@ static int dccp_v4_get_port(struct sock inet_csk_bind_conflict); } -static void dccp_v4_hash (struct sock *sk) -{ -inet_hash (&dccp_hashinfo, sk); -} - -void dccp_unhash (struct sock *sk) -{ -inet_unhash (&dccp_hashinfo, sk); -} - -EXPORT_SYMBOL_GPL (dccp_unhash); -int dccp_v4_connect (struct sock *sk,struct sockaddr *uaddr,int addr_len) {struct inet_sock *inet =inet_sk (sk);
@@ -1048,7 +1036,7 @@ struct proto dccp_prot = { .sendmsg = dccp_sendmsg, .recvmsg = dccp_recvmsg, .backlog_rcv = dccp_v4_do_rcv, - .hash = dccp_v4_hash, + .hash = dccp_hash, .unhash = dccp_unhash, .accept = inet_csk_accept, .get_port = dccp_v4_get_port,
net/dccp/ipv6.c +1 -1
@@ -53,7 +53,7 @@ static void dccp_v6_hash(struct sock *sk {if (sk->sk_state !=DCCP_CLOSED ) {if (inet_csk (sk)->icsk_af_ops = &dccp_ipv6_mapped) { - dccp_prot.hash (sk); +dccp_hash (sk);return ; }local_bh_disable ();
net/dccp/proto.c +14 -0
@@ -97,6 +97,20 @@ const char *dccp_state_name(const int stEXPORT_SYMBOL_GPL (dccp_state_name); +void dccp_hash (struct sock *sk) +{ +inet_hash (&dccp_hashinfo, sk); +} + +EXPORT_SYMBOL_GPL (dccp_hash); + +void dccp_unhash (struct sock *sk) +{ +inet_unhash (&dccp_hashinfo, sk); +} + +EXPORT_SYMBOL_GPL (dccp_unhash); +int dccp_init_sock (struct sock *sk) {struct dccp_sock *dp =dccp_sk (sk);
Signature · 1 line
1.2.2.gd27d