Merge carl9170fw

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

diff --git a/carlfw/src/wlan.c b/carlfw/src/wlan.c
index b680822e5e054dcccb16a6a18c71cedec217ee4c..b81b74f687941c330d872dc7f8974f7eccd6fbf2 100644 (file)
--- a/carlfw/src/wlan.c
+++ b/carlfw/src/wlan.c
@@ -478,7 +478,6 @@ static void handle_tx_completion(void)
                wlan_tx_ampdu_end(i);
                if (!queue_empty(&fw.wlan.tx_queue[i]))
                        wlan_trigger(BIT(i));
-
        }
 }