[IPV4] fib_trie.c: trivial annotations

[pandora-kernel.git] / net / dccp / ackvec.h

diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h
index 470bae8..2424eff 100644 (file)
--- a/net/dccp/ackvec.h
+++ b/net/dccp/ackvec.h
@@ -11,8 +11,8 @@
  *     published by the Free Software Foundation.
  */
 
-#include <linux/config.h>
 #include <linux/compiler.h>
+#include <linux/list.h>
 #include <linux/time.h>
 #include <linux/types.h>
 
@@ -42,11 +42,8 @@
  * Ack Vectors it has recently sent. For each packet sent carrying an
  * Ack Vector, it remembers four variables:
  *
- * @dccpav_ack_seqno - the Sequence Number used for the packet
- *                    (HC-Receiver seqno)
  * @dccpav_ack_ptr - the value of buf_head at the time of acknowledgement.
- * @dccpav_ack_ackno - the Acknowledgement Number used for the packet
- *                    (HC-Sender seqno)
+ * @dccpav_records - list of dccp_ackvec_record
  * @dccpav_ack_nonce - the one-bit sum of the ECN Nonces for all State 0.
  *
  * @dccpav_time                - the time in usecs
@@ -54,19 +51,38 @@
  */
 struct dccp_ackvec {
        u64             dccpav_buf_ackno;
-       u64             dccpav_ack_seqno;
-       u64             dccpav_ack_ackno;
+       struct list_head dccpav_records;
        struct timeval  dccpav_time;
        u8              dccpav_buf_head;
-       u8              dccpav_buf_tail;
        u8              dccpav_ack_ptr;
-       u8              dccpav_sent_len;
        u8              dccpav_vec_len;
        u8              dccpav_buf_nonce;
        u8              dccpav_ack_nonce;
        u8              dccpav_buf[DCCP_MAX_ACKVEC_LEN];
 };
 
+/** struct dccp_ackvec_record - ack vector record
+ *
+ * ACK vector record as defined in Appendix A of spec.
+ *
+ * The list is sorted by dccpavr_ack_seqno
+ *
+ * @dccpavr_node - node in dccpav_records
+ * @dccpavr_ack_seqno - sequence number of the packet this record was sent on
+ * @dccpavr_ack_ackno - sequence number being acknowledged
+ * @dccpavr_ack_ptr - pointer into dccpav_buf where this record starts
+ * @dccpavr_ack_nonce - dccpav_ack_nonce at the time this record was sent
+ * @dccpavr_sent_len - lenght of the record in dccpav_buf
+ */
+struct dccp_ackvec_record {
+       struct list_head dccpavr_node;
+       u64              dccpavr_ack_seqno;
+       u64              dccpavr_ack_ackno;
+       u8               dccpavr_ack_ptr;
+       u8               dccpavr_ack_nonce;
+       u8               dccpavr_sent_len;
+};
+
 struct sock;
 struct sk_buff;
 
@@ -89,7 +105,7 @@ extern int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb);
 
 static inline int dccp_ackvec_pending(const struct dccp_ackvec *av)
 {
-       return av->dccpav_sent_len != av->dccpav_vec_len;
+       return av->dccpav_vec_len;
 }
 #else /* CONFIG_IP_DCCP_ACKVEC */
 static inline int dccp_ackvec_init(void)