From 1d223105d454b1e0efbdfc41cdf0fd8e3f199eee Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Tue, 23 Aug 2005 21:51:13 -0700 Subject: [PATCH] --- yaml --- r: 6407 b: refs/heads/master c: 012e13eac7579fcc7618df4ca1d5af3cdc03748c h: refs/heads/master i: 6405: ef797c7581d07dbc06ea78320a18e467019adfef 6403: a30f076555edb82c0ac5cdc32beac956ea7a450f 6399: 254824d9fcffdd6ec5602390be681920dd6cb092 v: v3 --- [refs] | 2 +- trunk/net/dccp/ccid.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5d2b00eb24f3..6ac90be8c4a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4beb1b64f5846e216bf2c439022df480151902a +refs/heads/master: 012e13eac7579fcc7618df4ca1d5af3cdc03748c diff --git a/trunk/net/dccp/ccid.h b/trunk/net/dccp/ccid.h index 95eb47d85517..c6767b282244 100644 --- a/trunk/net/dccp/ccid.h +++ b/trunk/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); }