2 files changed, 6 insertions, 8 deletions

diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 622b17f884f0..b7484efc9443 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -219,7 +219,6 @@ struct mwifiex_tid_tbl {
 #define WMM_HIGHEST_PRIORITY            7
 #define HIGH_PRIO_TID                           7
 #define LOW_PRIO_TID                            0
-#define NO_PKT_PRIO_TID                         (-1)
 
 struct mwifiex_wmm_desc {
         struct mwifiex_tid_tbl tid_tbl_ptr[MAX_NUM_TID];
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index c1d848882fe2..75c8e80bb62f 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -916,8 +916,12 @@ mwifiex_wmm_get_highest_priolist_ptr(struct mwifiex_adapter *adapter,
 
                 do {
                         priv_tmp = bssprio_node->priv;
-                        hqp = &priv_tmp->wmm.highest_queued_prio;
 
+                        if (atomic_read(&priv_tmp->wmm.tx_pkts_queued) == 0)
+                                goto skip_bss;
+
+                        /* iterate over the WMM queues of the BSS */
+                        hqp = &priv_tmp->wmm.highest_queued_prio;
                         for (i = atomic_read(hqp); i >= LOW_PRIO_TID; --i) {
 
                                 tid_ptr = &(priv_tmp)->wmm.
@@ -976,12 +980,7 @@ mwifiex_wmm_get_highest_priolist_ptr(struct mwifiex_adapter *adapter,
                                 } while (ptr != head);
                         }
 
-                        /* No packet at any TID for this priv. Mark as such
-                         * to skip checking TIDs for this priv (until pkt is
-                         * added).
-                         */
-                        atomic_set(hqp, NO_PKT_PRIO_TID);
-
+skip_bss:
                         /* Get next bss priority node */
                         bssprio_node = list_first_entry(&bssprio_node->list,
                                                 struct mwifiex_bss_prio_node,