From e9cefab2823c8fd05104ee117d838bd3a9e2f8d2 Mon Sep 17 00:00:00 2001 From: Yogesh Ashok Powar Date: Thu, 3 Jan 2013 13:20:47 +0530 Subject: [PATCH] --- yaml --- r: 351827 b: refs/heads/master c: 96769caf8a755c9767b1a5c56fe71e062c2ad7da h: refs/heads/master i: 351825: 5c5c43a0fba1178fec83199587a20cfb1aa051b1 351823: 4ca83aaf2d96706b1a25bc2e0efe75ba2400525a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwl8k.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ff138f113727..78ac572b23f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a6e5d7c96c247ee0d9f446248679cac1bd65dd1 +refs/heads/master: 96769caf8a755c9767b1a5c56fe71e062c2ad7da diff --git a/trunk/drivers/net/wireless/mwl8k.c b/trunk/drivers/net/wireless/mwl8k.c index 19b46fdf9f0f..a13f690f1851 100644 --- a/trunk/drivers/net/wireless/mwl8k.c +++ b/trunk/drivers/net/wireless/mwl8k.c @@ -160,7 +160,6 @@ struct mwl8k_ampdu_stream { u8 tid; u8 state; u8 idx; - u8 txq_idx; /* index of this stream in priv->txq */ }; struct mwl8k_priv { @@ -1741,7 +1740,6 @@ mwl8k_add_stream(struct ieee80211_hw *hw, struct ieee80211_sta *sta, u8 tid) stream->state = AMPDU_STREAM_NEW; stream->tid = tid; stream->idx = i; - stream->txq_idx = MWL8K_TX_WMM_QUEUES + i; wiphy_debug(hw->wiphy, "Added a new stream for %pM %d", sta->addr, tid); return stream; @@ -1928,8 +1926,8 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, stream = mwl8k_lookup_stream(hw, sta->addr, tid); if (stream != NULL) { if (stream->state == AMPDU_STREAM_ACTIVE) { - txpriority = stream->txq_idx; - index = stream->txq_idx; + txpriority = stream->idx + MWL8K_TX_WMM_QUEUES; + index = stream->idx + MWL8K_TX_WMM_QUEUES; } else if (stream->state == AMPDU_STREAM_NEW) { /* We get here if the driver sends us packets * after we've initiated a stream, but before