diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-03-20 17:15:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-20 17:15:42 -0800 |
| commit | 7400d781105d18bf5bba89f8b986a413f14144a8 (patch) | |
| tree | 39bba6735fa99c5b2aa755b81c0cebc0ac901931 /net/dccp/ackvec.h | |
| parent | 0af5f6c1eba4a18e6b2ed518b589927d778c6c16 (diff) | |
| download | kernel_samsung_aries-7400d781105d18bf5bba89f8b986a413f14144a8.zip kernel_samsung_aries-7400d781105d18bf5bba89f8b986a413f14144a8.tar.gz kernel_samsung_aries-7400d781105d18bf5bba89f8b986a413f14144a8.tar.bz2 | |
[DCCP] ackvec: Ditch dccpav_buf_len
Simplifying the code a bit as we're always using DCCP_MAX_ACKVEC_LEN.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ackvec.h')
| -rw-r--r-- | net/dccp/ackvec.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/dccp/ackvec.h b/net/dccp/ackvec.h index f7dfb5f..f083daf 100644 --- a/net/dccp/ackvec.h +++ b/net/dccp/ackvec.h @@ -49,7 +49,6 @@ * (HC-Sender seqno) * @dccpav_ack_nonce - the one-bit sum of the ECN Nonces for all State 0. * - * @dccpav_buf_len - circular buffer length * @dccpav_time - the time in usecs * @dccpav_buf - circular buffer of acknowledgeable packets */ @@ -63,18 +62,16 @@ struct dccp_ackvec { u8 dccpav_ack_ptr; u8 dccpav_sent_len; u8 dccpav_vec_len; - u8 dccpav_buf_len; u8 dccpav_buf_nonce; u8 dccpav_ack_nonce; - u8 dccpav_buf[0]; + u8 dccpav_buf[DCCP_MAX_ACKVEC_LEN]; }; struct sock; struct sk_buff; #ifdef CONFIG_IP_DCCP_ACKVEC -extern struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len, - const gfp_t priority); +extern struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority); extern void dccp_ackvec_free(struct dccp_ackvec *av); extern int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk, @@ -92,8 +89,7 @@ static inline int dccp_ackvec_pending(const struct dccp_ackvec *av) return av->dccpav_sent_len != av->dccpav_vec_len; } #else /* CONFIG_IP_DCCP_ACKVEC */ -static inline struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len, - const gfp_t priority) +static inline struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority) { return NULL; } |