diff options
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r-- | net/dccp/ipv4.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 3fc75dbee4b8..2afaa464e7f0 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -641,16 +641,12 @@ int dccp_v4_send_reset(struct sock *sk, enum dccp_reset_codes code) | |||
641 | 641 | ||
642 | skb = dccp_make_reset(sk, sk->sk_dst_cache, code); | 642 | skb = dccp_make_reset(sk, sk->sk_dst_cache, code); |
643 | if (skb != NULL) { | 643 | if (skb != NULL) { |
644 | const struct dccp_sock *dp = dccp_sk(sk); | ||
645 | const struct inet_sock *inet = inet_sk(sk); | 644 | const struct inet_sock *inet = inet_sk(sk); |
646 | 645 | ||
647 | err = ip_build_and_send_pkt(skb, sk, | 646 | err = ip_build_and_send_pkt(skb, sk, |
648 | inet->saddr, inet->daddr, NULL); | 647 | inet->saddr, inet->daddr, NULL); |
649 | if (err == NET_XMIT_CN) | 648 | if (err == NET_XMIT_CN) |
650 | err = 0; | 649 | err = 0; |
651 | |||
652 | ccid_hc_rx_exit(dp->dccps_hc_rx_ccid, sk); | ||
653 | ccid_hc_tx_exit(dp->dccps_hc_tx_ccid, sk); | ||
654 | } | 650 | } |
655 | 651 | ||
656 | return err; | 652 | return err; |
@@ -1243,6 +1239,7 @@ static int dccp_v4_init_sock(struct sock *sk) | |||
1243 | static int dccp_ctl_socket_init = 1; | 1239 | static int dccp_ctl_socket_init = 1; |
1244 | 1240 | ||
1245 | dccp_options_init(&dp->dccps_options); | 1241 | dccp_options_init(&dp->dccps_options); |
1242 | do_gettimeofday(&dp->dccps_epoch); | ||
1246 | 1243 | ||
1247 | if (dp->dccps_options.dccpo_send_ack_vector) { | 1244 | if (dp->dccps_options.dccpo_send_ack_vector) { |
1248 | dp->dccps_hc_rx_ackpkts = | 1245 | dp->dccps_hc_rx_ackpkts = |