Commit a47c5104 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller

[ACKVEC]: Reduce length of identifiers

This is reduces the length of the struct ackvec/ackvec_record fields. It is
a purely text-based replacement:

	s#dccpavr_#avr_#g;
	s#dccpav_#av_#g;

and increases readability somewhat.
Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7d0362d
This diff is collapsed.
...@@ -32,54 +32,54 @@ ...@@ -32,54 +32,54 @@
* *
* This data structure is the one defined in RFC 4340, Appendix A. * This data structure is the one defined in RFC 4340, Appendix A.
* *
* @dccpav_buf_head - circular buffer head * @av_buf_head - circular buffer head
* @dccpav_buf_tail - circular buffer tail * @av_buf_tail - circular buffer tail
* @dccpav_buf_ackno - ack # of the most recent packet acknowledgeable in the * @av_buf_ackno - ack # of the most recent packet acknowledgeable in the
* buffer (i.e. %dccpav_buf_head) * buffer (i.e. %av_buf_head)
* @dccpav_buf_nonce - the one-bit sum of the ECN Nonces on all packets acked * @av_buf_nonce - the one-bit sum of the ECN Nonces on all packets acked
* by the buffer with State 0 * by the buffer with State 0
* *
* Additionally, the HC-Receiver must keep some information about the * Additionally, the HC-Receiver must keep some information about the
* Ack Vectors it has recently sent. For each packet sent carrying an * Ack Vectors it has recently sent. For each packet sent carrying an
* Ack Vector, it remembers four variables: * Ack Vector, it remembers four variables:
* *
* @dccpav_records - list of dccp_ackvec_record * @av_records - list of dccp_ackvec_record
* @dccpav_ack_nonce - the one-bit sum of the ECN Nonces for all State 0. * @av_ack_nonce - the one-bit sum of the ECN Nonces for all State 0.
* *
* @dccpav_time - the time in usecs * @av_time - the time in usecs
* @dccpav_buf - circular buffer of acknowledgeable packets * @av_buf - circular buffer of acknowledgeable packets
*/ */
struct dccp_ackvec { struct dccp_ackvec {
u64 dccpav_buf_ackno; u64 av_buf_ackno;
struct list_head dccpav_records; struct list_head av_records;
ktime_t dccpav_time; ktime_t av_time;
u16 dccpav_buf_head; u16 av_buf_head;
u16 dccpav_vec_len; u16 av_vec_len;
u8 dccpav_buf_nonce; u8 av_buf_nonce;
u8 dccpav_ack_nonce; u8 av_ack_nonce;
u8 dccpav_buf[DCCP_MAX_ACKVEC_LEN]; u8 av_buf[DCCP_MAX_ACKVEC_LEN];
}; };
/** struct dccp_ackvec_record - ack vector record /** struct dccp_ackvec_record - ack vector record
* *
* ACK vector record as defined in Appendix A of spec. * ACK vector record as defined in Appendix A of spec.
* *
* The list is sorted by dccpavr_ack_seqno * The list is sorted by avr_ack_seqno
* *
* @dccpavr_node - node in dccpav_records * @avr_node - node in av_records
* @dccpavr_ack_seqno - sequence number of the packet this record was sent on * @avr_ack_seqno - sequence number of the packet this record was sent on
* @dccpavr_ack_ackno - sequence number being acknowledged * @avr_ack_ackno - sequence number being acknowledged
* @dccpavr_ack_ptr - pointer into dccpav_buf where this record starts * @avr_ack_ptr - pointer into av_buf where this record starts
* @dccpavr_ack_nonce - dccpav_ack_nonce at the time this record was sent * @avr_ack_nonce - av_ack_nonce at the time this record was sent
* @dccpavr_sent_len - length of the record in dccpav_buf * @avr_sent_len - lenght of the record in av_buf
*/ */
struct dccp_ackvec_record { struct dccp_ackvec_record {
struct list_head dccpavr_node; struct list_head avr_node;
u64 dccpavr_ack_seqno; u64 avr_ack_seqno;
u64 dccpavr_ack_ackno; u64 avr_ack_ackno;
u16 dccpavr_ack_ptr; u16 avr_ack_ptr;
u16 dccpavr_sent_len; u16 avr_sent_len;
u8 dccpavr_ack_nonce; u8 avr_ack_nonce;
}; };
struct sock; struct sock;
...@@ -105,7 +105,7 @@ extern int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb); ...@@ -105,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) static inline int dccp_ackvec_pending(const struct dccp_ackvec *av)
{ {
return av->dccpav_vec_len; return av->av_vec_len;
} }
#else /* CONFIG_IP_DCCP_ACKVEC */ #else /* CONFIG_IP_DCCP_ACKVEC */
static inline int dccp_ackvec_init(void) static inline int dccp_ackvec_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment