From d3705e44467fc8170fada5fe41fe1acf76d05c1f Mon Sep 17 00:00:00 2001
From: Ido Yariv <ido@wizery.com>
Date: Mon, 18 Apr 2011 16:44:11 +0300
Subject: [PATCH] --- yaml --- r: 247503 b: refs/heads/master c:
 ef2e3004855e90d2919105e4a91d7df6ab9845a9 h: refs/heads/master i:   247501:
 864eec6bf3efba9d1f304798286ce5abb4d6c71d   247499:
 be98eb106cd76ef17444b7b0397fc32af5ac4289   247495:
 ba694eb6e498388b8a584fdb0225b372a15fcaf3   247487:
 a9e66ff60366fbbf4a45bf67716add3a93706ced v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/wireless/wl12xx/tx.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fc0b8dc86792..5bc5a9147e33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae825e4ba81203e1b3d3159f24327cdc2629dbd8
+refs/heads/master: ef2e3004855e90d2919105e4a91d7df6ab9845a9
diff --git a/trunk/drivers/net/wireless/wl12xx/tx.c b/trunk/drivers/net/wireless/wl12xx/tx.c
index c83665964467..cc837bba5468 100644
--- a/trunk/drivers/net/wireless/wl12xx/tx.c
+++ b/trunk/drivers/net/wireless/wl12xx/tx.c
@@ -65,6 +65,9 @@ static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb)
 static void wl1271_free_tx_id(struct wl1271 *wl, int id)
 {
 	if (__test_and_clear_bit(id, wl->tx_frames_map)) {
+		if (unlikely(wl->tx_frames_cnt == ACX_TX_DESCRIPTORS))
+			clear_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags);
+
 		wl->tx_frames[id] = NULL;
 		wl->tx_frames_cnt--;
 	}