mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
mwl8k: Remove redundant txq_idx
Ampdu stream index can be derived from stream->idx. So we no longer need stream->txq_idx, hence removing it. Signed-off-by: Nishant Sarmukadam <nishants@marvell.com> Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
1a6e5d7c96
commit
96769caf8a
1 changed files with 2 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue