ath9k: qinfo never be NULL in setuptxqueue
authorRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Sat, 13 Aug 2011 04:58:12 +0000 (10:28 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 24 Aug 2011 17:59:45 +0000 (13:59 -0400)
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/mac.c

index 7ddca67db66d8b3df252756add9b8f01fa74143c..7ce9b320f0d9758a7c8c6c393e98e9546f9078bd 100644 (file)
@@ -345,21 +345,8 @@ int ath9k_hw_setuptxqueue(struct ath_hw *ah, enum ath9k_tx_queue type,
        }
        memset(qi, 0, sizeof(struct ath9k_tx_queue_info));
        qi->tqi_type = type;
-       if (qinfo == NULL) {
-               qi->tqi_qflags =
-                       TXQ_FLAG_TXOKINT_ENABLE
-                       | TXQ_FLAG_TXERRINT_ENABLE
-                       | TXQ_FLAG_TXDESCINT_ENABLE | TXQ_FLAG_TXURNINT_ENABLE;
-               qi->tqi_aifs = INIT_AIFS;
-               qi->tqi_cwmin = ATH9K_TXQ_USEDEFAULT;
-               qi->tqi_cwmax = INIT_CWMAX;
-               qi->tqi_shretry = INIT_SH_RETRY;
-               qi->tqi_lgretry = INIT_LG_RETRY;
-               qi->tqi_physCompBuf = 0;
-       } else {
-               qi->tqi_physCompBuf = qinfo->tqi_physCompBuf;
-               (void) ath9k_hw_set_txq_props(ah, q, qinfo);
-       }
+       qi->tqi_physCompBuf = qinfo->tqi_physCompBuf;
+       (void) ath9k_hw_set_txq_props(ah, q, qinfo);
 
        return q;
 }