diff options
| author | Yogesh Ashok Powar | 2011-12-20 07:07:08 +0100 |
|---|---|---|
| committer | John W. Linville | 2011-12-21 21:06:11 +0100 |
| commit | eca107ff8a25e0528d6e6225ac6ce59bd498136f (patch) | |
| tree | 38e099b9b407eaa4f04fe53afb0daf906451614f /drivers/net/wireless/mwl8k.c | |
| parent | ath9k: fix roadkill due to Joe's patch on ath_dbg() changes (diff) | |
| download | kernel-qcow2-linux-eca107ff8a25e0528d6e6225ac6ce59bd498136f.tar.gz kernel-qcow2-linux-eca107ff8a25e0528d6e6225ac6ce59bd498136f.tar.xz kernel-qcow2-linux-eca107ff8a25e0528d6e6225ac6ce59bd498136f.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
| -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, ieee80211_start_tx_ba_cb_irqsafe(vif, addr, tid); break; case IEEE80211_AMPDU_TX_STOP: - if (stream == NULL) - break; - if (stream->state == AMPDU_STREAM_ACTIVE) { - spin_unlock(&priv->stream_lock); - mwl8k_destroy_ba(hw, stream); - spin_lock(&priv->stream_lock); + if (stream) { + if (stream->state == AMPDU_STREAM_ACTIVE) { + spin_unlock(&priv->stream_lock); + mwl8k_destroy_ba(hw, stream); + spin_lock(&priv->stream_lock); + } + mwl8k_remove_stream(hw, stream); } - mwl8k_remove_stream(hw, stream); ieee80211_stop_tx_ba_cb_irqsafe(vif, addr, tid); break; case IEEE80211_AMPDU_TX_OPERATIONAL: |