diff options
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 f7dfb5f67b87..f083daf4200c 100644 --- a/net/dccp/ackvec.h +++ b/net/dccp/ackvec.h | |||
@@ -49,7 +49,6 @@ | |||
49 | * (HC-Sender seqno) | 49 | * (HC-Sender seqno) |
50 | * @dccpav_ack_nonce - the one-bit sum of the ECN Nonces for all State 0. | 50 | * @dccpav_ack_nonce - the one-bit sum of the ECN Nonces for all State 0. |
51 | * | 51 | * |
52 | * @dccpav_buf_len - circular buffer length | ||
53 | * @dccpav_time - the time in usecs | 52 | * @dccpav_time - the time in usecs |
54 | * @dccpav_buf - circular buffer of acknowledgeable packets | 53 | * @dccpav_buf - circular buffer of acknowledgeable packets |
55 | */ | 54 | */ |
@@ -63,18 +62,16 @@ struct dccp_ackvec { | |||
63 | u8 dccpav_ack_ptr; | 62 | u8 dccpav_ack_ptr; |
64 | u8 dccpav_sent_len; | 63 | u8 dccpav_sent_len; |
65 | u8 dccpav_vec_len; | 64 | u8 dccpav_vec_len; |
66 | u8 dccpav_buf_len; | ||
67 | u8 dccpav_buf_nonce; | 65 | u8 dccpav_buf_nonce; |
68 | u8 dccpav_ack_nonce; | 66 | u8 dccpav_ack_nonce; |
69 | u8 dccpav_buf[0]; | 67 | u8 dccpav_buf[DCCP_MAX_ACKVEC_LEN]; |
70 | }; | 68 | }; |
71 | 69 | ||
72 | struct sock; | 70 | struct sock; |
73 | struct sk_buff; | 71 | struct sk_buff; |
74 | 72 | ||
75 | #ifdef CONFIG_IP_DCCP_ACKVEC | 73 | #ifdef CONFIG_IP_DCCP_ACKVEC |
76 | extern struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len, | 74 | extern struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority); |
77 | const gfp_t priority); | ||
78 | extern void dccp_ackvec_free(struct dccp_ackvec *av); | 75 | extern void dccp_ackvec_free(struct dccp_ackvec *av); |
79 | 76 | ||
80 | extern int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk, | 77 | 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) | |||
92 | return av->dccpav_sent_len != av->dccpav_vec_len; | 89 | return av->dccpav_sent_len != av->dccpav_vec_len; |
93 | } | 90 | } |
94 | #else /* CONFIG_IP_DCCP_ACKVEC */ | 91 | #else /* CONFIG_IP_DCCP_ACKVEC */ |
95 | static inline struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len, | 92 | static inline struct dccp_ackvec *dccp_ackvec_alloc(const gfp_t priority) |
96 | const gfp_t priority) | ||
97 | { | 93 | { |
98 | return NULL; | 94 | return NULL; |
99 | } | 95 | } |