Merge carl9170fw

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

diff --cc carlfw/src/wlan.c
index 0e0b1dd144b27c4254b0f8fbd0d53278e296c849,b680822e5e054dcccb16a6a18c71cedec217ee4c..b81b74f687941c330d872dc7f8974f7eccd6fbf2
--- 1/carlfw/src/wlan.c
--- 2/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)