From: Arnaldo Carvalho de Melo Date: Fri, 9 Sep 2005 22:59:26 +0000 (-0300) Subject: [DCCP] Only call the HC _exit() routines in dccp_v4_destroy_sock X-Git-Tag: v2.6.14-rc1~125^2~1^2~2^2~1 X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=dc19336c76d213fd9ae7b6a352e837f509418012;p=linux-2.6-omap-h63xx.git [DCCP] Only call the HC _exit() routines in dccp_v4_destroy_sock Signed-off-by: Arnaldo Carvalho de Melo --- diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index fee9a8c3777..2afaa464e7f 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) skb = dccp_make_reset(sk, sk->sk_dst_cache, code); if (skb != NULL) { - const struct dccp_sock *dp = dccp_sk(sk); const struct inet_sock *inet = inet_sk(sk); err = ip_build_and_send_pkt(skb, sk, inet->saddr, inet->daddr, NULL); if (err == NET_XMIT_CN) err = 0; - - ccid_hc_rx_exit(dp->dccps_hc_rx_ccid, sk); - ccid_hc_tx_exit(dp->dccps_hc_tx_ccid, sk); } return err; diff --git a/net/dccp/output.c b/net/dccp/output.c index 28de157a432..ea6d0e91e51 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) dccp_transmit_skb(sk, skb_clone(skb, prio)); } else dccp_transmit_skb(sk, skb); - - ccid_hc_rx_exit(dp->dccps_hc_rx_ccid, sk); - ccid_hc_tx_exit(dp->dccps_hc_tx_ccid, sk); }