Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc19336c authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

[DCCP] Only call the HC _exit() routines in dccp_v4_destroy_sock 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent d7e0fb98

net/dccp/ipv4.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

net/dccp/output.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

}