1 files changed, 23 insertions, 23 deletions
diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h
index 326ac90fb909..1ec6a30103bb 100644
--- a/net/dccp/ccids/ccid2.h
+++ b/net/dccp/ccids/ccid2.h
@@ -40,34 +40,34 @@ struct ccid2_seq {
 /**
 * struct ccid2_hc_tx_sock - CCID2 TX half connection
- * @ccid2hctx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
+ * @tx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
- * @ccid2hctx_packets_acked - Ack counter for deriving cwnd growth (RFC 3465)
+ * @tx_packets_acked:        Ack counter for deriving cwnd growth (RFC 3465)
- * @ccid2hctx_lastrtt -time RTT was last measured
+ * @tx_lastrtt:              time RTT was last measured
- * @ccid2hctx_rpseq - last consecutive seqno
+ * @tx_rpseq:                last consecutive seqno
- * @ccid2hctx_rpdupack - dupacks since rpseq
+ * @tx_rpdupack:             dupacks since rpseq
 */
 struct ccid2_hc_tx_sock {
-        u32                     ccid2hctx_cwnd;
+        u32                     tx_cwnd;
-        u32                     ccid2hctx_ssthresh;
+        u32                     tx_ssthresh;
-        u32                     ccid2hctx_pipe;
+        u32                     tx_pipe;
-        u32                     ccid2hctx_packets_acked;
+        u32                     tx_packets_acked;
-        struct ccid2_seq        *ccid2hctx_seqbuf[CCID2_SEQBUF_MAX];
+        struct ccid2_seq        *tx_seqbuf[CCID2_SEQBUF_MAX];
-        int                     ccid2hctx_seqbufc;
+        int                     tx_seqbufc;
-        struct ccid2_seq        *ccid2hctx_seqh;
+        struct ccid2_seq        *tx_seqh;
-        struct ccid2_seq        *ccid2hctx_seqt;
+        struct ccid2_seq        *tx_seqt;
-        long                    ccid2hctx_rto;
+        long                    tx_rto;
-        long                    ccid2hctx_srtt;
+        long                    tx_srtt;
-        long                    ccid2hctx_rttvar;
+        long                    tx_rttvar;
-        unsigned long           ccid2hctx_lastrtt;
+        unsigned long           tx_lastrtt;
-        struct timer_list       ccid2hctx_rtotimer;
+        struct timer_list       tx_rtotimer;
-        u64                     ccid2hctx_rpseq;
+        u64                     tx_rpseq;
-        int                     ccid2hctx_rpdupack;
+        int                     tx_rpdupack;
-        unsigned long           ccid2hctx_last_cong;
+        unsigned long           tx_last_cong;
-        u64                     ccid2hctx_high_ack;
+        u64                     tx_high_ack;
 };
 struct ccid2_hc_rx_sock {
-        int     ccid2hcrx_data;
+        int     rx_data;
 };
 static inline struct ccid2_hc_tx_sock *ccid2_hc_tx_sk(const struct sock *sk)

diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h index 326ac90fb909..1ec6a30103bb 100644 --- a/net/dccp/ccids/ccid2.h +++ b/net/dccp/ccids/ccid2.h
@@ -40,34 +40,34 @@ struct ccid2_seq {
40		40
41	/**	41	/**
42	* struct ccid2_hc_tx_sock - CCID2 TX half connection	42	* struct ccid2_hc_tx_sock - CCID2 TX half connection
43	* @ccid2hctx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5	43	* @tx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
44	* @ccid2hctx_packets_acked - Ack counter for deriving cwnd growth (RFC 3465)	44	* @tx_packets_acked: Ack counter for deriving cwnd growth (RFC 3465)
45	* @ccid2hctx_lastrtt -time RTT was last measured	45	* @tx_lastrtt: time RTT was last measured
46	* @ccid2hctx_rpseq - last consecutive seqno	46	* @tx_rpseq: last consecutive seqno
47	* @ccid2hctx_rpdupack - dupacks since rpseq	47	* @tx_rpdupack: dupacks since rpseq
48	*/	48	*/
49	struct ccid2_hc_tx_sock {	49	struct ccid2_hc_tx_sock {
50	u32 ccid2hctx_cwnd;	50	u32 tx_cwnd;
51	u32 ccid2hctx_ssthresh;	51	u32 tx_ssthresh;
52	u32 ccid2hctx_pipe;	52	u32 tx_pipe;
53	u32 ccid2hctx_packets_acked;	53	u32 tx_packets_acked;
54	struct ccid2_seq *ccid2hctx_seqbuf[CCID2_SEQBUF_MAX];	54	struct ccid2_seq *tx_seqbuf[CCID2_SEQBUF_MAX];
55	int ccid2hctx_seqbufc;	55	int tx_seqbufc;
56	struct ccid2_seq *ccid2hctx_seqh;	56	struct ccid2_seq *tx_seqh;
57	struct ccid2_seq *ccid2hctx_seqt;	57	struct ccid2_seq *tx_seqt;
58	long ccid2hctx_rto;	58	long tx_rto;
59	long ccid2hctx_srtt;	59	long tx_srtt;
60	long ccid2hctx_rttvar;	60	long tx_rttvar;
61	unsigned long ccid2hctx_lastrtt;	61	unsigned long tx_lastrtt;
62	struct timer_list ccid2hctx_rtotimer;	62	struct timer_list tx_rtotimer;
63	u64 ccid2hctx_rpseq;	63	u64 tx_rpseq;
64	int ccid2hctx_rpdupack;	64	int tx_rpdupack;
65	unsigned long ccid2hctx_last_cong;	65	unsigned long tx_last_cong;
66	u64 ccid2hctx_high_ack;	66	u64 tx_high_ack;
67	};	67	};
68		68
69	struct ccid2_hc_rx_sock {	69	struct ccid2_hc_rx_sock {
70	int ccid2hcrx_data;	70	int rx_data;
71	};	71	};
72		72
73	static inline struct ccid2_hc_tx_sock ccid2_hc_tx_sk(const struct sock sk)	73	static inline struct ccid2_hc_tx_sock ccid2_hc_tx_sk(const struct sock sk)