diff options
author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2011-08-13 00:58:12 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-24 13:59:45 -0400 |
commit | 479c68927af8735597505320032c249e894f6b6c (patch) | |
tree | c90302ae7256fb7ac99288dd0d3fdc686e948993 /drivers | |
parent | 3de2111697ffca5b9b2fba452bced812725524de (diff) |
ath9k: qinfo never be NULL in setuptxqueue
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mac.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c index 7ddca67db66d..7ce9b320f0d9 100644 --- a/drivers/net/wireless/ath/ath9k/mac.c +++ b/drivers/net/wireless/ath/ath9k/mac.c | |||
@@ -345,21 +345,8 @@ int ath9k_hw_setuptxqueue(struct ath_hw *ah, enum ath9k_tx_queue type, | |||
345 | } | 345 | } |
346 | memset(qi, 0, sizeof(struct ath9k_tx_queue_info)); | 346 | memset(qi, 0, sizeof(struct ath9k_tx_queue_info)); |
347 | qi->tqi_type = type; | 347 | qi->tqi_type = type; |
348 | if (qinfo == NULL) { | 348 | qi->tqi_physCompBuf = qinfo->tqi_physCompBuf; |
349 | qi->tqi_qflags = | 349 | (void) ath9k_hw_set_txq_props(ah, q, qinfo); |
350 | TXQ_FLAG_TXOKINT_ENABLE | ||
351 | | TXQ_FLAG_TXERRINT_ENABLE | ||
352 | | TXQ_FLAG_TXDESCINT_ENABLE | TXQ_FLAG_TXURNINT_ENABLE; | ||
353 | qi->tqi_aifs = INIT_AIFS; | ||
354 | qi->tqi_cwmin = ATH9K_TXQ_USEDEFAULT; | ||
355 | qi->tqi_cwmax = INIT_CWMAX; | ||
356 | qi->tqi_shretry = INIT_SH_RETRY; | ||
357 | qi->tqi_lgretry = INIT_LG_RETRY; | ||
358 | qi->tqi_physCompBuf = 0; | ||
359 | } else { | ||
360 | qi->tqi_physCompBuf = qinfo->tqi_physCompBuf; | ||
361 | (void) ath9k_hw_set_txq_props(ah, q, qinfo); | ||
362 | } | ||
363 | 350 | ||
364 | return q; | 351 | return q; |
365 | } | 352 | } |