summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishant Sarmukadam <nishants@marvell.com>2013-01-08 10:16:05 +0530
committerJohn W. Linville <linville@tuxdriver.com>2013-01-09 14:37:10 -0500
commit9b0b11fb1e286e03ce911b94844952edd05f554e (patch)
tree7831c59482ea25887bc75143e0780a44acff91e2
parent96da6fdd5ae28568be63ccf1f70b14a72135d493 (diff)
downloadblackbird-op-linux-9b0b11fb1e286e03ce911b94844952edd05f554e.tar.gz
blackbird-op-linux-9b0b11fb1e286e03ce911b94844952edd05f554e.zip
mwl8k: Disable tx_wait completion
Whenever TX ring is drained, priv->tx_wait still points to a valid completion. Making sure that it points to NULL before returning from the mwl8k_tx_wait_empty check. 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>
-rw-r--r--drivers/net/wireless/mwl8k.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index c4d287b48e64..04442c6290a6 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -1588,6 +1588,7 @@ static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw)
rc = -ETIMEDOUT;
}
+ priv->tx_wait = NULL;
spin_unlock_bh(&priv->tx_lock);
return rc;
OpenPOWER on IntegriCloud