rsi: Fixed issue relating to index of q_num.
authorFariya Fatima <fariyaf@gmail.com>
Wed, 2 Apr 2014 03:59:54 +0000 (09:29 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Apr 2014 17:55:54 +0000 (13:55 -0400)
Signed-off-by: Fariya Fatima <fariyaf@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rsi/rsi_91x_core.c

index e89535e86cafc9bc1b9e101d8e653762225f0abf..1a8d32138593637318aeb3022b6e86a48905507a 100644 (file)
@@ -102,10 +102,10 @@ static u8 rsi_core_determine_hal_queue(struct rsi_common *common)
        }
 
 get_queue_num:
-       q_num = 0;
        recontend_queue = false;
 
        q_num = rsi_determine_min_weight_queue(common);
+
        q_len = skb_queue_len(&common->tx_queue[ii]);
        ii = q_num;
 
@@ -118,7 +118,9 @@ get_queue_num:
                }
        }
 
-       common->tx_qinfo[q_num].pkt_contended = 0;
+       if (q_num < NUM_EDCA_QUEUES)
+               common->tx_qinfo[q_num].pkt_contended = 0;
+
        /* Adjust the back off values for all queues again */
        recontend_queue = rsi_recalculate_weights(common);