---

yaml --- r: 6407 b: refs/heads/master c: 012e13e h: refs/heads/master i: 6405: ef797c7 6403: a30f076 6399: 254824d v: v3
git-mirror · Aug 29, 2005 · 1d22310 · 1d22310
1 parent e3f96ed
commit 1d22310
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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);
 }