1 files changed, 24 insertions, 24 deletions
diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h
index 2c94ca029010..d7815804bceb 100644
--- a/net/dccp/ccids/ccid2.h
+++ b/net/dccp/ccids/ccid2.h
@@ -42,34 +42,34 @@ struct ccid2_seq {
 /** struct ccid2_hc_tx_sock - CCID2 TX half connection
 *
- * @ccid2hctx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
+ * @{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
- * @ccid2hctx_packets_acked - Ack counter for deriving cwnd growth (RFC 3465)
+ * @packets_acked: Ack counter for deriving cwnd growth (RFC 3465)
- * @ccid2hctx_lastrtt -time RTT was last measured
+ * @lastrtt: time RTT was last measured
- * @ccid2hctx_rpseq - last consecutive seqno
+ * @rpseq: last consecutive seqno
- * @ccid2hctx_rpdupack - dupacks since rpseq
+ * @rpdupack: dupacks since rpseq
-*/
+ */
 struct ccid2_hc_tx_sock {
-        u32                     ccid2hctx_cwnd;
+        u32                     cwnd;
-        u32                     ccid2hctx_ssthresh;
+        u32                     ssthresh;
-        u32                     ccid2hctx_pipe;
+        u32                     pipe;
-        u32                     ccid2hctx_packets_acked;
+        u32                     packets_acked;
-        struct ccid2_seq        *ccid2hctx_seqbuf[CCID2_SEQBUF_MAX];
+        struct ccid2_seq        *seqbuf[CCID2_SEQBUF_MAX];
-        int                     ccid2hctx_seqbufc;
+        int                     seqbufc;
-        struct ccid2_seq        *ccid2hctx_seqh;
+        struct ccid2_seq        *seqh;
-        struct ccid2_seq        *ccid2hctx_seqt;
+        struct ccid2_seq        *seqt;
-        long                    ccid2hctx_rto;
+        long                    rto;
-        long                    ccid2hctx_srtt;
+        long                    srtt;
-        long                    ccid2hctx_rttvar;
+        long                    rttvar;
-        unsigned long           ccid2hctx_lastrtt;
+        unsigned long           lastrtt;
-        struct timer_list       ccid2hctx_rtotimer;
+        struct timer_list       rtotimer;
-        u64                     ccid2hctx_rpseq;
+        u64                     rpseq;
-        int                     ccid2hctx_rpdupack;
+        int                     rpdupack;
-        unsigned long           ccid2hctx_last_cong;
+        unsigned long           last_cong;
-        u64                     ccid2hctx_high_ack;
+        u64                     high_ack;
 };
 struct ccid2_hc_rx_sock {
-        int     ccid2hcrx_data;
+        int                     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 2c94ca029010..d7815804bceb 100644 --- a/net/dccp/ccids/ccid2.h +++ b/net/dccp/ccids/ccid2.h
@@ -42,34 +42,34 @@ struct ccid2_seq {
42		42
43	/** struct ccid2_hc_tx_sock - CCID2 TX half connection	43	/** struct ccid2_hc_tx_sock - CCID2 TX half connection
44	*	44	*
45	* @ccid2hctx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5	45	* @{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
46	* @ccid2hctx_packets_acked - Ack counter for deriving cwnd growth (RFC 3465)	46	* @packets_acked: Ack counter for deriving cwnd growth (RFC 3465)
47	* @ccid2hctx_lastrtt -time RTT was last measured	47	* @lastrtt: time RTT was last measured
48	* @ccid2hctx_rpseq - last consecutive seqno	48	* @rpseq: last consecutive seqno
49	* @ccid2hctx_rpdupack - dupacks since rpseq	49	* @rpdupack: dupacks since rpseq
50	*/	50	*/
51	struct ccid2_hc_tx_sock {	51	struct ccid2_hc_tx_sock {
52	u32 ccid2hctx_cwnd;	52	u32 cwnd;
53	u32 ccid2hctx_ssthresh;	53	u32 ssthresh;
54	u32 ccid2hctx_pipe;	54	u32 pipe;
55	u32 ccid2hctx_packets_acked;	55	u32 packets_acked;
56	struct ccid2_seq *ccid2hctx_seqbuf[CCID2_SEQBUF_MAX];	56	struct ccid2_seq *seqbuf[CCID2_SEQBUF_MAX];
57	int ccid2hctx_seqbufc;	57	int seqbufc;
58	struct ccid2_seq *ccid2hctx_seqh;	58	struct ccid2_seq *seqh;
59	struct ccid2_seq *ccid2hctx_seqt;	59	struct ccid2_seq *seqt;
60	long ccid2hctx_rto;	60	long rto;
61	long ccid2hctx_srtt;	61	long srtt;
62	long ccid2hctx_rttvar;	62	long rttvar;
63	unsigned long ccid2hctx_lastrtt;	63	unsigned long lastrtt;
64	struct timer_list ccid2hctx_rtotimer;	64	struct timer_list rtotimer;
65	u64 ccid2hctx_rpseq;	65	u64 rpseq;
66	int ccid2hctx_rpdupack;	66	int rpdupack;
67	unsigned long ccid2hctx_last_cong;	67	unsigned long last_cong;
68	u64 ccid2hctx_high_ack;	68	u64 high_ack;
69	};	69	};
70		70
71	struct ccid2_hc_rx_sock {	71	struct ccid2_hc_rx_sock {
72	int ccid2hcrx_data;	72	int data;
73	};	73	};
74		74
75	static inline struct ccid2_hc_tx_sock ccid2_hc_tx_sk(const struct sock sk)	75	static inline struct ccid2_hc_tx_sock ccid2_hc_tx_sk(const struct sock sk)