aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv6.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/ipv6.c')
-rw-r--r--net/dccp/ipv6.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 9216d173dd5f..c655de5f67c9 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -40,19 +40,6 @@
40static const struct inet_connection_sock_af_ops dccp_ipv6_mapped; 40static const struct inet_connection_sock_af_ops dccp_ipv6_mapped;
41static const struct inet_connection_sock_af_ops dccp_ipv6_af_ops; 41static const struct inet_connection_sock_af_ops dccp_ipv6_af_ops;
42 42
43static void dccp_v6_hash(struct sock *sk)
44{
45 if (sk->sk_state != DCCP_CLOSED) {
46 if (inet_csk(sk)->icsk_af_ops == &dccp_ipv6_mapped) {
47 inet_hash(sk);
48 return;
49 }
50 local_bh_disable();
51 __inet6_hash(sk, NULL);
52 local_bh_enable();
53 }
54}
55
56/* add pseudo-header to DCCP checksum stored in skb->csum */ 43/* add pseudo-header to DCCP checksum stored in skb->csum */
57static inline __sum16 dccp_v6_csum_finish(struct sk_buff *skb, 44static inline __sum16 dccp_v6_csum_finish(struct sk_buff *skb,
58 const struct in6_addr *saddr, 45 const struct in6_addr *saddr,
@@ -588,7 +575,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk,
588 dccp_done(newsk); 575 dccp_done(newsk);
589 goto out; 576 goto out;
590 } 577 }
591 __inet6_hash(newsk, NULL); 578 __inet_hash(newsk, NULL);
592 579
593 return newsk; 580 return newsk;
594 581
@@ -1056,7 +1043,7 @@ static struct proto dccp_v6_prot = {
1056 .sendmsg = dccp_sendmsg, 1043 .sendmsg = dccp_sendmsg,
1057 .recvmsg = dccp_recvmsg, 1044 .recvmsg = dccp_recvmsg,
1058 .backlog_rcv = dccp_v6_do_rcv, 1045 .backlog_rcv = dccp_v6_do_rcv,
1059 .hash = dccp_v6_hash, 1046 .hash = inet_hash,
1060 .unhash = inet_unhash, 1047 .unhash = inet_unhash,
1061 .accept = inet_csk_accept, 1048 .accept = inet_csk_accept,
1062 .get_port = inet_csk_get_port, 1049 .get_port = inet_csk_get_port,