dccp ccid-2: Overhaul CCID naming convention 1/2

This patch starts a less problematic naming convention for CCID structs.

The old naming convention used 'hc{tx,rx}->ccid?hc{tx,rx}->...' as
recurring prefixes, which made the code
 * hard to write (not easy to fit into 80 characters);
 * hard to read  (most of the space is occupied by prefixes).

The new naming scheme:
 * struct entries for the TX socket are prefixed by 'tx_';
 * and those for the RX socket are prefixed by 'rx_'.

The identifiers then remain distinguishable when grep-ing through the tree:
 (a) RX/TX sockets are distinguished by the naming scheme,
 (b) individual CCIDs are distinguished by filename (ccid{2,3,4}.{c,h}).

This first patch implements the scheme for CCID-2.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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
- * @ccid2hctx_packets_acked - Ack counter for deriving cwnd growth (RFC 3465)
- * @ccid2hctx_lastrtt -time RTT was last measured
- * @ccid2hctx_rpseq - last consecutive seqno
- * @ccid2hctx_rpdupack - dupacks since rpseq
+ * @tx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
+ * @tx_packets_acked:        Ack counter for deriving cwnd growth (RFC 3465)
+ * @tx_lastrtt:              time RTT was last measured
+ * @tx_rpseq:                last consecutive seqno
+ * @tx_rpdupack:             dupacks since rpseq
  */
 struct ccid2_hc_tx_sock {
-        u32                     ccid2hctx_cwnd;
-        u32                     ccid2hctx_ssthresh;
-        u32                     ccid2hctx_pipe;
-        u32                     ccid2hctx_packets_acked;
-        struct ccid2_seq        *ccid2hctx_seqbuf[CCID2_SEQBUF_MAX];
-        int                     ccid2hctx_seqbufc;
-        struct ccid2_seq        *ccid2hctx_seqh;
-        struct ccid2_seq        *ccid2hctx_seqt;
-        long                    ccid2hctx_rto;
-        long                    ccid2hctx_srtt;
-        long                    ccid2hctx_rttvar;
-        unsigned long           ccid2hctx_lastrtt;
-        struct timer_list       ccid2hctx_rtotimer;
-        u64                     ccid2hctx_rpseq;
-        int                     ccid2hctx_rpdupack;
-        unsigned long           ccid2hctx_last_cong;
-        u64                     ccid2hctx_high_ack;
+        u32                     tx_cwnd;
+        u32                     tx_ssthresh;
+        u32                     tx_pipe;
+        u32                     tx_packets_acked;
+        struct ccid2_seq        *tx_seqbuf[CCID2_SEQBUF_MAX];
+        int                     tx_seqbufc;
+        struct ccid2_seq        *tx_seqh;
+        struct ccid2_seq        *tx_seqt;
+        long                    tx_rto;
+        long                    tx_srtt;
+        long                    tx_rttvar;
+        unsigned long           tx_lastrtt;
+        struct timer_list       tx_rtotimer;
+        u64                     tx_rpseq;
+        int                     tx_rpdupack;
+        unsigned long           tx_last_cong;
+        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)