diff options
| author |   Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-08-23 21:51:13 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 16:04:48 -0700 |
| commit | 012e13eac7579fcc7618df4ca1d5af3cdc03748c (patch) | |
| tree | 934c71228174d0da4a324afc1b7b001db9978911 | |
| parent | [DCCP]: Send a DATAACK packet when we have a TIMESTAMP_ECHO pending (diff) | |
| download | linux-dev-012e13eac7579fcc7618df4ca1d5af3cdc03748c.tar.xz linux-dev-012e13eac7579fcc7618df4ca1d5af3cdc03748c.zip | |
[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: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dccp/ccid.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h index 95eb47d85517..c6767b282244 100644 --- a/net/dccp/ccid.h +++ b/net/dccp/ccid.h @@ -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); } |