summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorFariya Fatima <fariyaf@gmail.com>2014-04-02 09:29:54 +0530
committerJohn W. Linville <linville@tuxdriver.com>2014-04-09 13:55:54 -0400
commit5156fd24e9aec406ae14f02fc1779e234553fbd3 (patch)
tree58f91159f350ec593cb0ce124326c16bbf81a30b /drivers/net/wireless
parentd50c761aefbd6785fd46ce4f7f387cf2aa749a2a (diff)
downloadop-kernel-dev-5156fd24e9aec406ae14f02fc1779e234553fbd3.zip
op-kernel-dev-5156fd24e9aec406ae14f02fc1779e234553fbd3.tar.gz
rsi: Fixed issue relating to index of q_num.
Signed-off-by: Fariya Fatima <fariyaf@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/rsi/rsi_91x_core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/rsi/rsi_91x_core.c b/drivers/net/wireless/rsi/rsi_91x_core.c
index e89535e..1a8d321 100644
--- a/drivers/net/wireless/rsi/rsi_91x_core.c
+++ b/drivers/net/wireless/rsi/rsi_91x_core.c
@@ -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);
OpenPOWER on IntegriCloud