---

yaml --- r: 247503 b: refs/heads/master c: ef2e300 h: refs/heads/master i: 247501: 864eec6 247499: be98eb1 247495: ba694eb 247487: a9e66ff v: v3
git-mirror · May 2, 2011 · d3705e4 · d3705e4
1 parent 8410331
commit d3705e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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--;
 	}