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

Commit 012e13ea authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[CCID]: Make ccid_hc_[rt]x_exit accept NULL arguments 



Just like kfree, etc it will just not call the CCID exit
routines when the private data area is set to NULL.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a4beb1b6

net/dccp/ccid.h

+4 −2
Original line number Diff line number Diff line
@@ -97,13 +97,15 @@ static inline int ccid_hc_tx_init(struct ccid *ccid, struct sock *sk) 


static inline void ccid_hc_rx_exit(struct ccid *ccid, struct sock *sk)

{

	if (ccid->ccid_hc_rx_exit != NULL)

	if (ccid->ccid_hc_rx_exit != NULL &&

	    dccp_sk(sk)->dccps_hc_rx_ccid_private != NULL)

		ccid->ccid_hc_rx_exit(sk);

}



static inline void ccid_hc_tx_exit(struct ccid *ccid, struct sock *sk)

{

	if (ccid->ccid_hc_tx_exit != NULL)

	if (ccid->ccid_hc_tx_exit != NULL &&

	    dccp_sk(sk)->dccps_hc_tx_ccid_private != NULL)

		ccid->ccid_hc_tx_exit(sk);

}