diff options
author | Yogesh Ashok Powar <yogeshp@marvell.com> | 2011-12-20 01:07:08 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-12-21 15:06:11 -0500 |
commit | eca107ff8a25e0528d6e6225ac6ce59bd498136f (patch) | |
tree | 38e099b9b407eaa4f04fe53afb0daf906451614f | |
parent | ec9a5705476e4b8c1b02de15c199a783d87ca3e2 (diff) |
mwl8k: Call ieee80211_stop_tx_ba_cb_irqsafe for already deleted BA stream
When stack calls ampdu_action with action = IEEE80211_AMPDU_TX_STOP
for a stream that has already been removed from the driver, call
ieee80211_tx_ba_stop_irqsafe to clear the stream in the stack.
Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: Nishant Sarmukadam <nishants@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 995695c28d5c..901cd79a061e 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -5044,14 +5044,14 @@ mwl8k_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, | |||
5044 | ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid); | 5044 | ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid); |
5045 | break; | 5045 | break; |
5046 | case IEEE80211_AMPDU_TX_STOP: | 5046 | case IEEE80211_AMPDU_TX_STOP: |
5047 | if (stream == NULL) | 5047 | if (stream) { |
5048 | break; | 5048 | if (stream->state == AMPDU_STREAM_ACTIVE) { |
5049 | if (stream->state == AMPDU_STREAM_ACTIVE) { | 5049 | spin_unlock(&priv->stream_lock); |
5050 | spin_unlock(&priv->stream_lock); | 5050 | mwl8k_destroy_ba(hw, stream); |
5051 | mwl8k_destroy_ba(hw, stream); | 5051 | spin_lock(&priv->stream_lock); |
5052 | spin_lock(&priv->stream_lock); | 5052 | } |
5053 | mwl8k_remove_stream(hw, stream); | ||
5053 | } | 5054 | } |
5054 | mwl8k_remove_stream(hw, stream); | ||
5055 | ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid); | 5055 | ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid); |
5056 | break; | 5056 | break; |
5057 | case IEEE80211_AMPDU_TX_OPERATIONAL: | 5057 | case IEEE80211_AMPDU_TX_OPERATIONAL: |