aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2006-03-21 00:23:39 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-21 00:23:39 -0500
commitc985ed705ffc682ce40d46a5f7bf98db86b27899 (patch)
tree20272a6d8f7b896e9b31397d4c4ff563bfdf16b2 /net/dccp/ipv4.c
parent3e0fadc51f2fde01e0e22f481370a9b5f073bfc3 (diff)
[DCCP]: 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 <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index b26a4f8df4dc..34d1b119b720 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -44,18 +44,6 @@ static int dccp_v4_get_port(struct sock *sk, const unsigned short snum)
44 inet_csk_bind_conflict); 44 inet_csk_bind_conflict);
45} 45}
46 46
47static void dccp_v4_hash(struct sock *sk)
48{
49 inet_hash(&dccp_hashinfo, sk);
50}
51
52void dccp_unhash(struct sock *sk)
53{
54 inet_unhash(&dccp_hashinfo, sk);
55}
56
57EXPORT_SYMBOL_GPL(dccp_unhash);
58
59int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 47int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
60{ 48{
61 struct inet_sock *inet = inet_sk(sk); 49 struct inet_sock *inet = inet_sk(sk);
@@ -1048,7 +1036,7 @@ struct proto dccp_prot = {
1048 .sendmsg = dccp_sendmsg, 1036 .sendmsg = dccp_sendmsg,
1049 .recvmsg = dccp_recvmsg, 1037 .recvmsg = dccp_recvmsg,
1050 .backlog_rcv = dccp_v4_do_rcv, 1038 .backlog_rcv = dccp_v4_do_rcv,
1051 .hash = dccp_v4_hash, 1039 .hash = dccp_hash,
1052 .unhash = dccp_unhash, 1040 .unhash = dccp_unhash,
1053 .accept = inet_csk_accept, 1041 .accept = inet_csk_accept,
1054 .get_port = dccp_v4_get_port, 1042 .get_port = dccp_v4_get_port,