diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-09-09 18:59:26 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-09-09 18:59:26 -0400 |
commit | dc19336c76d213fd9ae7b6a352e837f509418012 (patch) | |
tree | 4a48efb86f200fa0cd9bf7a5f9a95e94ff6d140a /net | |
parent | d7e0fb985cb033e605c3167ff183b5e98b7f7644 (diff) |
[DCCP] Only call the HC _exit() routines in dccp_v4_destroy_sock
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/dccp/ipv4.c | 4 | ||||
-rw-r--r-- | net/dccp/output.c | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index fee9a8c3777b..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; |
diff --git a/net/dccp/output.c b/net/dccp/output.c index 28de157a4326..ea6d0e91e511 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -522,7 +522,4 @@ void dccp_send_close(struct sock *sk, const int active) | |||
522 | dccp_transmit_skb(sk, skb_clone(skb, prio)); | 522 | dccp_transmit_skb(sk, skb_clone(skb, prio)); |
523 | } else | 523 | } else |
524 | dccp_transmit_skb(sk, skb); | 524 | dccp_transmit_skb(sk, skb); |
525 | |||
526 | ccid_hc_rx_exit(dp->dccps_hc_rx_ccid, sk); | ||
527 | ccid_hc_tx_exit(dp->dccps_hc_tx_ccid, sk); | ||
528 | } | 525 | } |