compat_blkdev_driver_ioctl: Remove unused variable warning

[linux-2.6-omap-h63xx.git] / net / dccp / ccids / ccid2.h

diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h
index 907deed255b4869b048a27ad144e11b69fffc19f..2c94ca0290107b1d464cb9938101969d4b135763 100644 (file)
--- a/net/dccp/ccids/ccid2.h
+++ b/net/dccp/ccids/ccid2.h
@@ -42,36 +42,34 @@ struct ccid2_seq {
 
 /** struct ccid2_hc_tx_sock - CCID2 TX half connection
  *
- * @{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
- * @packets_acked: Ack counter for deriving cwnd growth (RFC 3465)
- * @lastrtt: time RTT was last measured
- * @rpseq: last consecutive seqno
- * @rpdupack: dupacks since rpseq
- * @av_chunks: list of Ack Vectors received on current skb
- */
+ * @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
+*/
 struct ccid2_hc_tx_sock {
-       u32                     cwnd;
-       u32                     ssthresh;
-       u32                     pipe;
-       u32                     packets_acked;
-       struct ccid2_seq        *seqbuf[CCID2_SEQBUF_MAX];
-       int                     seqbufc;
-       struct ccid2_seq        *seqh;
-       struct ccid2_seq        *seqt;
-       long                    rto;
-       long                    srtt;
-       long                    rttvar;
-       unsigned long           lastrtt;
-       struct timer_list       rtotimer;
-       u64                     rpseq;
-       int                     rpdupack;
-       unsigned long           last_cong;
-       u64                     high_ack;
-       struct list_head        av_chunks;
+       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;
 };
 
 struct ccid2_hc_rx_sock {
-       int                     data;
+       int     ccid2hcrx_data;
 };
 
 static inline struct ccid2_hc_tx_sock *ccid2_hc_tx_sk(const struct sock *sk)