aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/minisocks.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/minisocks.c')
-rw-r--r--net/dccp/minisocks.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index d7041a0963af..b50d5fd3d696 100644
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -60,8 +60,8 @@ void dccp_time_wait(struct sock *sk, int state, int timeo)
60 60
61 tw->tw_ipv6_offset = inet6_tw_offset(sk->sk_prot); 61 tw->tw_ipv6_offset = inet6_tw_offset(sk->sk_prot);
62 tw6 = inet6_twsk((struct sock *)tw); 62 tw6 = inet6_twsk((struct sock *)tw);
63 ipv6_addr_copy(&tw6->tw_v6_daddr, &np->daddr); 63 tw6->tw_v6_daddr = np->daddr;
64 ipv6_addr_copy(&tw6->tw_v6_rcv_saddr, &np->rcv_saddr); 64 tw6->tw_v6_rcv_saddr = np->rcv_saddr;
65 tw->tw_ipv6only = np->ipv6only; 65 tw->tw_ipv6only = np->ipv6only;
66 } 66 }
67#endif 67#endif
@@ -100,7 +100,7 @@ struct sock *dccp_create_openreq_child(struct sock *sk,
100 * (* Generate a new socket and switch to that socket *) 100 * (* Generate a new socket and switch to that socket *)
101 * Set S := new socket for this port pair 101 * Set S := new socket for this port pair
102 */ 102 */
103 struct sock *newsk = inet_csk_clone(sk, req, GFP_ATOMIC); 103 struct sock *newsk = inet_csk_clone_lock(sk, req, GFP_ATOMIC);
104 104
105 if (newsk != NULL) { 105 if (newsk != NULL) {
106 struct dccp_request_sock *dreq = dccp_rsk(req); 106 struct dccp_request_sock *dreq = dccp_rsk(req);