X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Fdccp%2Fccids%2Fccid3.h;h=0bde4583d09147f5e95a2ea6993e98da7041619c;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=f18b96d4e5a25039e3d15c8ae57c54c49b755524;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h
index f18b96d4e..0bde4583d 100644
--- a/net/dccp/ccids/ccid3.h
+++ b/net/dccp/ccids/ccid3.h
@@ -41,7 +41,6 @@
 #include <linux/time.h>
 #include <linux/types.h>
 #include <linux/tfrc.h>
-#include "../ccid.h"
 
 #define TFRC_MIN_PACKET_SIZE	   16
 #define TFRC_STD_PACKET_SIZE	  256
@@ -136,12 +135,12 @@ struct ccid3_hc_rx_sock {
 
 static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk)
 {
-    return ccid_priv(dccp_sk(sk)->dccps_hc_tx_ccid);
+    return dccp_sk(sk)->dccps_hc_tx_ccid_private;
 }
 
 static inline struct ccid3_hc_rx_sock *ccid3_hc_rx_sk(const struct sock *sk)
 {
-    return ccid_priv(dccp_sk(sk)->dccps_hc_rx_ccid);
+    return dccp_sk(sk)->dccps_hc_rx_ccid_private;
 }
 
 #endif /* _DCCP_CCID3_H_ */