lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo
2005-08-23 21:51:13 -07:00
committed by David S. Miller
parent a4beb1b64f
commit 012e13eac7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/dccp/ccid.h
View File

@@ -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) 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); ccid->ccid_hc_rx_exit(sk);
} }
static inline void ccid_hc_tx_exit(struct ccid *ccid, struct sock *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); ccid->ccid_hc_tx_exit(sk);
} }