diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.h')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h index f361f784965e..3f7cfa9b7da5 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h | |||
@@ -204,18 +204,22 @@ struct txdone_entry_desc { | |||
204 | * | 204 | * |
205 | * @ENTRY_TXD_RTS_FRAME: This frame is a RTS frame. | 205 | * @ENTRY_TXD_RTS_FRAME: This frame is a RTS frame. |
206 | * @ENTRY_TXD_OFDM_RATE: This frame is send out with an OFDM rate. | 206 | * @ENTRY_TXD_OFDM_RATE: This frame is send out with an OFDM rate. |
207 | * @ENTRY_TXD_FIRST_FRAGMENT: This is the first frame. | ||
207 | * @ENTRY_TXD_MORE_FRAG: This frame is followed by another fragment. | 208 | * @ENTRY_TXD_MORE_FRAG: This frame is followed by another fragment. |
208 | * @ENTRY_TXD_REQ_TIMESTAMP: Require timestamp to be inserted. | 209 | * @ENTRY_TXD_REQ_TIMESTAMP: Require timestamp to be inserted. |
209 | * @ENTRY_TXD_BURST: This frame belongs to the same burst event. | 210 | * @ENTRY_TXD_BURST: This frame belongs to the same burst event. |
210 | * @ENTRY_TXD_ACK: An ACK is required for this frame. | 211 | * @ENTRY_TXD_ACK: An ACK is required for this frame. |
212 | * @ENTRY_TXD_RETRY_MODE: When set, the long retry count is used. | ||
211 | */ | 213 | */ |
212 | enum txentry_desc_flags { | 214 | enum txentry_desc_flags { |
213 | ENTRY_TXD_RTS_FRAME, | 215 | ENTRY_TXD_RTS_FRAME, |
214 | ENTRY_TXD_OFDM_RATE, | 216 | ENTRY_TXD_OFDM_RATE, |
217 | ENTRY_TXD_FIRST_FRAGMENT, | ||
215 | ENTRY_TXD_MORE_FRAG, | 218 | ENTRY_TXD_MORE_FRAG, |
216 | ENTRY_TXD_REQ_TIMESTAMP, | 219 | ENTRY_TXD_REQ_TIMESTAMP, |
217 | ENTRY_TXD_BURST, | 220 | ENTRY_TXD_BURST, |
218 | ENTRY_TXD_ACK, | 221 | ENTRY_TXD_ACK, |
222 | ENTRY_TXD_RETRY_MODE, | ||
219 | }; | 223 | }; |
220 | 224 | ||
221 | /** | 225 | /** |
@@ -229,6 +233,7 @@ enum txentry_desc_flags { | |||
229 | * @length_low: PLCP length low word. | 233 | * @length_low: PLCP length low word. |
230 | * @signal: PLCP signal. | 234 | * @signal: PLCP signal. |
231 | * @service: PLCP service. | 235 | * @service: PLCP service. |
236 | * @retry_limit: Max number of retries. | ||
232 | * @aifs: AIFS value. | 237 | * @aifs: AIFS value. |
233 | * @ifs: IFS value. | 238 | * @ifs: IFS value. |
234 | * @cw_min: cwmin value. | 239 | * @cw_min: cwmin value. |
@@ -244,10 +249,11 @@ struct txentry_desc { | |||
244 | u16 signal; | 249 | u16 signal; |
245 | u16 service; | 250 | u16 service; |
246 | 251 | ||
247 | int aifs; | 252 | short retry_limit; |
248 | int ifs; | 253 | short aifs; |
249 | int cw_min; | 254 | short ifs; |
250 | int cw_max; | 255 | short cw_min; |
256 | short cw_max; | ||
251 | }; | 257 | }; |
252 | 258 | ||
253 | /** | 259 | /** |