From: Christian Lamparter <chunkeey@googlemail.com>
Date: Fri, 11 Mar 2011 00:42:35 +0000 (+0100)
Subject: Merge carl9170fw
X-Git-Tag: 1.9.4~26
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=bf38ae52cd2ec91f5abeadc00c4e17fc647c2bc0;p=carl9170fw.git

Merge carl9170fw

Conflicts:
	carlfw/Kconfig
	carlfw/include/wl.h
	carlfw/src/wlan.c
---

bf38ae52cd2ec91f5abeadc00c4e17fc647c2bc0
diff --cc carlfw/src/wlan.c
index 0e0b1dd,b680822..b81b74f
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@@ -479,10 -477,9 +477,8 @@@ static void handle_tx_completion(void
  
  		wlan_tx_ampdu_end(i);
  		if (!queue_empty(&fw.wlan.tx_queue[i]))
- 			map |= BIT(i);
- 
+ 			wlan_trigger(BIT(i));
 -
  	}
- 	wlan_trigger(map);
  }
  
  void __hot wlan_tx(struct dma_desc *desc)