diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800.h')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h index 9ea09612c878..4c55e8525cad 100644 --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h | |||
@@ -213,10 +213,10 @@ | |||
213 | 213 | ||
214 | /* | 214 | /* |
215 | * WMM_AIFSN_CFG: Aifsn for each EDCA AC | 215 | * WMM_AIFSN_CFG: Aifsn for each EDCA AC |
216 | * AIFSN0: AC_BE | 216 | * AIFSN0: AC_VO |
217 | * AIFSN1: AC_BK | 217 | * AIFSN1: AC_VI |
218 | * AIFSN2: AC_VI | 218 | * AIFSN2: AC_BE |
219 | * AIFSN3: AC_VO | 219 | * AIFSN3: AC_BK |
220 | */ | 220 | */ |
221 | #define WMM_AIFSN_CFG 0x0214 | 221 | #define WMM_AIFSN_CFG 0x0214 |
222 | #define WMM_AIFSN_CFG_AIFSN0 FIELD32(0x0000000f) | 222 | #define WMM_AIFSN_CFG_AIFSN0 FIELD32(0x0000000f) |
@@ -226,10 +226,10 @@ | |||
226 | 226 | ||
227 | /* | 227 | /* |
228 | * WMM_CWMIN_CSR: CWmin for each EDCA AC | 228 | * WMM_CWMIN_CSR: CWmin for each EDCA AC |
229 | * CWMIN0: AC_BE | 229 | * CWMIN0: AC_VO |
230 | * CWMIN1: AC_BK | 230 | * CWMIN1: AC_VI |
231 | * CWMIN2: AC_VI | 231 | * CWMIN2: AC_BE |
232 | * CWMIN3: AC_VO | 232 | * CWMIN3: AC_BK |
233 | */ | 233 | */ |
234 | #define WMM_CWMIN_CFG 0x0218 | 234 | #define WMM_CWMIN_CFG 0x0218 |
235 | #define WMM_CWMIN_CFG_CWMIN0 FIELD32(0x0000000f) | 235 | #define WMM_CWMIN_CFG_CWMIN0 FIELD32(0x0000000f) |
@@ -239,10 +239,10 @@ | |||
239 | 239 | ||
240 | /* | 240 | /* |
241 | * WMM_CWMAX_CSR: CWmax for each EDCA AC | 241 | * WMM_CWMAX_CSR: CWmax for each EDCA AC |
242 | * CWMAX0: AC_BE | 242 | * CWMAX0: AC_VO |
243 | * CWMAX1: AC_BK | 243 | * CWMAX1: AC_VI |
244 | * CWMAX2: AC_VI | 244 | * CWMAX2: AC_BE |
245 | * CWMAX3: AC_VO | 245 | * CWMAX3: AC_BK |
246 | */ | 246 | */ |
247 | #define WMM_CWMAX_CFG 0x021c | 247 | #define WMM_CWMAX_CFG 0x021c |
248 | #define WMM_CWMAX_CFG_CWMAX0 FIELD32(0x0000000f) | 248 | #define WMM_CWMAX_CFG_CWMAX0 FIELD32(0x0000000f) |
@@ -251,18 +251,18 @@ | |||
251 | #define WMM_CWMAX_CFG_CWMAX3 FIELD32(0x0000f000) | 251 | #define WMM_CWMAX_CFG_CWMAX3 FIELD32(0x0000f000) |
252 | 252 | ||
253 | /* | 253 | /* |
254 | * AC_TXOP0: AC_BK/AC_BE TXOP register | 254 | * AC_TXOP0: AC_VO/AC_VI TXOP register |
255 | * AC0TXOP: AC_BK in unit of 32us | 255 | * AC0TXOP: AC_VO in unit of 32us |
256 | * AC1TXOP: AC_BE in unit of 32us | 256 | * AC1TXOP: AC_VI in unit of 32us |
257 | */ | 257 | */ |
258 | #define WMM_TXOP0_CFG 0x0220 | 258 | #define WMM_TXOP0_CFG 0x0220 |
259 | #define WMM_TXOP0_CFG_AC0TXOP FIELD32(0x0000ffff) | 259 | #define WMM_TXOP0_CFG_AC0TXOP FIELD32(0x0000ffff) |
260 | #define WMM_TXOP0_CFG_AC1TXOP FIELD32(0xffff0000) | 260 | #define WMM_TXOP0_CFG_AC1TXOP FIELD32(0xffff0000) |
261 | 261 | ||
262 | /* | 262 | /* |
263 | * AC_TXOP1: AC_VO/AC_VI TXOP register | 263 | * AC_TXOP1: AC_BE/AC_BK TXOP register |
264 | * AC2TXOP: AC_VI in unit of 32us | 264 | * AC2TXOP: AC_BE in unit of 32us |
265 | * AC3TXOP: AC_VO in unit of 32us | 265 | * AC3TXOP: AC_BK in unit of 32us |
266 | */ | 266 | */ |
267 | #define WMM_TXOP1_CFG 0x0224 | 267 | #define WMM_TXOP1_CFG 0x0224 |
268 | #define WMM_TXOP1_CFG_AC2TXOP FIELD32(0x0000ffff) | 268 | #define WMM_TXOP1_CFG_AC2TXOP FIELD32(0x0000ffff) |
@@ -288,7 +288,7 @@ | |||
288 | #define MCU_CMD_CFG 0x022c | 288 | #define MCU_CMD_CFG 0x022c |
289 | 289 | ||
290 | /* | 290 | /* |
291 | * AC_BK register offsets | 291 | * AC_VO register offsets |
292 | */ | 292 | */ |
293 | #define TX_BASE_PTR0 0x0230 | 293 | #define TX_BASE_PTR0 0x0230 |
294 | #define TX_MAX_CNT0 0x0234 | 294 | #define TX_MAX_CNT0 0x0234 |
@@ -296,7 +296,7 @@ | |||
296 | #define TX_DTX_IDX0 0x023c | 296 | #define TX_DTX_IDX0 0x023c |
297 | 297 | ||
298 | /* | 298 | /* |
299 | * AC_BE register offsets | 299 | * AC_VI register offsets |
300 | */ | 300 | */ |
301 | #define TX_BASE_PTR1 0x0240 | 301 | #define TX_BASE_PTR1 0x0240 |
302 | #define TX_MAX_CNT1 0x0244 | 302 | #define TX_MAX_CNT1 0x0244 |
@@ -304,7 +304,7 @@ | |||
304 | #define TX_DTX_IDX1 0x024c | 304 | #define TX_DTX_IDX1 0x024c |
305 | 305 | ||
306 | /* | 306 | /* |
307 | * AC_VI register offsets | 307 | * AC_BE register offsets |
308 | */ | 308 | */ |
309 | #define TX_BASE_PTR2 0x0250 | 309 | #define TX_BASE_PTR2 0x0250 |
310 | #define TX_MAX_CNT2 0x0254 | 310 | #define TX_MAX_CNT2 0x0254 |
@@ -312,7 +312,7 @@ | |||
312 | #define TX_DTX_IDX2 0x025c | 312 | #define TX_DTX_IDX2 0x025c |
313 | 313 | ||
314 | /* | 314 | /* |
315 | * AC_VO register offsets | 315 | * AC_BK register offsets |
316 | */ | 316 | */ |
317 | #define TX_BASE_PTR3 0x0260 | 317 | #define TX_BASE_PTR3 0x0260 |
318 | #define TX_MAX_CNT3 0x0264 | 318 | #define TX_MAX_CNT3 0x0264 |