carl9170 firmware: checkpatch/style fixes
[carl9170fw.git] / carlfw / src / wlan.c
index 9eb336a267eee7c4858d1e057e18358cede4b7c8..50b1f2bb8b77c773903ed871ede9337bd5e25d95 100644 (file)
@@ -6,7 +6,7 @@
  * Copyright (c) 2000-2005 ZyDAS Technology Corporation
  * Copyright (c) 2007-2009 Atheros Communications, Inc.
  * Copyright   2009    Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,6 @@
 #include "printf.h"
 #include "rf.h"
 #include "linux/ieee80211.h"
-#include "rom.h"
 
 static void wlan_txunstuck(unsigned int queue)
 {
@@ -156,8 +155,8 @@ static struct carl9170_tx_status *wlan_get_tx_status_buffer(void)
 }
 
 /* generate _aggregated_ tx_status for the host */
-static void wlan_tx_complete(struct carl9170_tx_superframe *super,
-                            bool txs)
+void wlan_tx_complete(struct carl9170_tx_superframe *super,
+                     bool txs)
 {
        struct carl9170_tx_status *status;
 
@@ -169,6 +168,7 @@ static void wlan_tx_complete(struct carl9170_tx_superframe *super,
         */
        status->cookie = super->s.cookie;
        status->queue = super->s.queue;
+       super->s.cookie = 0;
 
        /*
         * This field holds the number of tries of the rate in
@@ -213,7 +213,7 @@ static bool wlan_tx_consume_retry(struct carl9170_tx_superframe *super)
 
 static inline u16 get_tid(struct ieee80211_hdr *hdr)
 {
-        return (ieee80211_get_qos_ctl(hdr))[0] & IEEE80211_QOS_CTL_TID_MASK;
+       return (ieee80211_get_qos_ctl(hdr))[0] & IEEE80211_QOS_CTL_TID_MASK;
 }
 
 /* This function will only work on uint32_t-aligned pointers! */
@@ -226,28 +226,50 @@ static inline bool compare_ether_address(const void *_d0, const void *_d1)
        return !((d0[0] ^ d1[0]) | (unsigned short)(d0[1] ^ d1[1]));
 }
 
-#ifdef CONFIG_CARL9170FW_TX_AMPDU
+/* This function will only work on uint32_t-aligned pointers! */
+static bool same_hdr(const void *_d0, const void *_d1)
+{
+       const uint32_t *d0 = _d0;
+       const uint32_t *d1 = _d1;
+
+       /* BUG_ON((unsigned long)d0 & 3 || (unsigned long)d1 & 3)) */
+       return !((d0[0] ^ d1[0]) |                      /* FC + DU */
+                (d0[1] ^ d1[1]) |                      /* addr1 */
+                (d0[2] ^ d1[2]) | (d0[3] ^ d1[3]) |    /* addr2 + addr3 */
+                (d0[4] ^ d1[4]));                      /* addr3 */
+}
+
+static inline bool same_aggr(struct ieee80211_hdr *a, struct ieee80211_hdr *b)
+{
+       return (get_tid(a) == get_tid(b)) || same_hdr(a, b);
+}
+
+static void wlan_tx_ampdu_end(unsigned int qidx)
+{
+       struct carl9170_tx_superframe *ht_prev = fw.wlan.ampdu_prev[qidx];
+
+       fw.wlan.ampdu_prev[qidx] = NULL;
+       if (ht_prev)
+               ht_prev->f.hdr.mac.ba_end = 1;
+}
+
 static void wlan_tx_ampdu(struct carl9170_tx_superframe *super)
 {
        unsigned int qidx = super->s.queue;
        struct carl9170_tx_superframe *ht_prev = fw.wlan.ampdu_prev[qidx];
 
        if (!super->f.hdr.mac.ampdu) {
-               fw.wlan.ampdu_prev[qidx] = NULL;
-
-               if (ht_prev)
-                       ht_prev->f.hdr.mac.ba_end = 1;
+               wlan_tx_ampdu_end(qidx);
        } else {
                fw.wlan.ampdu_prev[qidx] = super;
 
-               if (ht_prev && (get_tid(&super->f.data.i3e) != get_tid(&ht_prev->f.data.i3e) ||
-                   !compare_ether_address(super->f.data.i3e.addr1, ht_prev->f.data.i3e.addr1)))
+               if (ht_prev &&
+                   !same_aggr(&super->f.data.i3e, &ht_prev->f.data.i3e))
                        ht_prev->f.hdr.mac.ba_end = 1;
                else
                        super->f.hdr.mac.ba_end = 0;
        }
 }
-#endif /* CONFIG_CARL9170FW_TX_AMPDU */
 
 /* for all tries */
 static void __wlan_tx(struct dma_desc *desc)
@@ -271,9 +293,7 @@ static void __wlan_tx(struct dma_desc *desc)
                read_tsf(tsf);
        }
 
-#ifdef CONFIG_CARL9170FW_TX_AMPDU
        wlan_tx_ampdu(super);
-#endif /* CONFIG_CARL9170FW_TX_AMPDU */
 
 #if (defined CONFIG_CARL9170FW_LOOPBACK) || (defined CONFIG_CARL9170FW_DISCARD)
        wlan_tx_complete(super, true);
@@ -287,20 +307,32 @@ static void __wlan_tx(struct dma_desc *desc)
 # endif
 #else /* CONFIG_CARL9170FW_LOOPBACK */
 
-# if ((defined CONFIG_CARL9170FW_DEBUG) && (defined CONFIG_CARL9170FW_PSM))
+# ifdef CONFIG_CARL9170FW_DEBUG
        BUG_ON(fw.phy.psm.state != CARL9170_PSM_WAKE);
-# endif /* CONFIG_CARL9170FW_DEBUG && CONFIG_CARL9170FW_PSM */
+# endif /* CONFIG_CARL9170FW_DEBUG */
 
        /* insert desc into the right queue */
        dma_put(&fw.wlan.tx_queue[super->s.queue], desc);
 #endif /* CONFIG_CARL9170FW_LOOPBACK */
 }
 
+static void wlan_assign_seq(struct ieee80211_hdr *hdr, unsigned int vif)
+{
+       hdr->seq_ctrl &= cpu_to_le16(~IEEE80211_SCTL_SEQ);
+       hdr->seq_ctrl |= cpu_to_le16(fw.wlan.sequence[vif]);
+
+       if (!(hdr->seq_ctrl & cpu_to_le16(IEEE80211_SCTL_FRAG)))
+               fw.wlan.sequence[vif] += 0x10;
+}
+
 /* prepares frame for the first transmission */
 static void _wlan_tx(struct dma_desc *desc)
 {
        struct carl9170_tx_superframe *super = get_super(desc);
 
+       if (unlikely(super->s.assign_seq))
+               wlan_assign_seq(&super->f.data.i3e, super->s.vif_id);
+
        if (unlikely(super->s.ampdu_commit_density)) {
                set(AR9170_MAC_REG_AMPDU_DENSITY,
                    MOD_VAL(AR9170_MAC_AMPDU_DENSITY,
@@ -322,16 +354,14 @@ static void _wlan_tx(struct dma_desc *desc)
 static bool wlan_tx_status(struct dma_queue *queue,
                           struct dma_desc *desc)
 {
-       struct ar9170_tx_frame *frame = DESC_PAYLOAD(desc);
        struct carl9170_tx_superframe *super = get_super(desc);
-       struct ieee80211_hdr *hdr = &super->f.data.i3e;
        unsigned int qidx = super->s.queue;
-       bool txfail, success;
+       bool txfail = false, success;
 
        success = true;
 
        /* update hangcheck */
-       fw.wlan.last_tx_desc_num[qidx] = 0;
+       fw.wlan.last_super_num[qidx] = 0;
 
        if (!!(desc->ctrl & AR9170_CTRL_FAIL)) {
                txfail = !!(desc->ctrl & AR9170_CTRL_TXFAIL);
@@ -347,7 +377,7 @@ static bool wlan_tx_status(struct dma_queue *queue,
                         * order.
                         */
 
-                       if (!frame->hdr.mac.ampdu) {
+                       if (!super->f.hdr.mac.ampdu) {
                                /*
                                 * 802.11 - 7.1.3.1.5.
                                 * set "Retry Field" for consecutive attempts
@@ -355,8 +385,8 @@ static bool wlan_tx_status(struct dma_queue *queue,
                                 * Note: For AMPDU see:
                                 * 802.11n 9.9.1.6 "Retransmit Procedures"
                                 */
-
-                               hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_RETRY);
+                               super->f.data.i3e.frame_control |=
+                                       cpu_to_le16(IEEE80211_FCTL_RETRY);
                        }
 
                        if (txfail) {
@@ -384,11 +414,7 @@ static bool wlan_tx_status(struct dma_queue *queue,
                                 */
 
                                dma_unlink_head(queue);
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
                                dma_put(&fw.wlan.tx_retry, desc);
-#else
-                               __wlan_tx(desc);
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
                                return true;
                        }
                } else {
@@ -410,21 +436,23 @@ static bool wlan_tx_status(struct dma_queue *queue,
 
        unhide_super(desc);
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
-       if (unlikely(super == (void *) &dma_mem.reserved.ba)) {
-               fw.wlan.ba_desc = desc;
-               fw.wlan.ba_desc_available = 1;
+       if (unlikely(super == fw.wlan.fw_desc_data)) {
+               fw.wlan.fw_desc = desc;
+               fw.wlan.fw_desc_available = 1;
+
+               if (fw.wlan.fw_desc_callback)
+                       fw.wlan.fw_desc_callback(super, success);
+
                return true;
        }
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
-
-       wlan_tx_complete(super, success);
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
        if (unlikely(super->s.cab))
                fw.wlan.cab_queue_len[super->s.vif_id]--;
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
+       wlan_tx_complete(super, success);
+
        /* recycle freed descriptors */
        dma_reclaim(&fw.pta.down_queue, desc);
        down_trigger();
@@ -434,9 +462,9 @@ static bool wlan_tx_status(struct dma_queue *queue,
 static void handle_tx_completion(void)
 {
        struct dma_desc *desc;
-       unsigned int i;
+       int i;
 
-       for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) {
+       for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) {
                __while_desc_bits(desc, &fw.wlan.tx_queue[i], AR9170_OWN_BITS_SW) {
                        if (!wlan_tx_status(&fw.wlan.tx_queue[i], desc)) {
                                /* termination requested. */
@@ -444,14 +472,12 @@ static void handle_tx_completion(void)
                        }
                }
 
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
                for_each_desc(desc, &fw.wlan.tx_retry)
                        __wlan_tx(desc);
 
-               for_each_desc(desc, &fw.wlan.tx_delay[i])
-                       _wlan_tx(desc);
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
-               wlan_trigger(BIT(i));
+               wlan_tx_ampdu_end(i);
+               if (!queue_empty(&fw.wlan.tx_queue[i]))
+                       wlan_trigger(BIT(i));
        }
 }
 
@@ -472,18 +498,29 @@ void __hot wlan_tx(struct dma_desc *desc)
        }
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
-       if (!queue_empty(&fw.wlan.tx_queue[super->s.queue])) {
-               dma_put(&fw.wlan.tx_delay[super->s.queue], desc);
-               return;
-       }
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
-
        _wlan_tx(desc);
        wlan_trigger(BIT(super->s.queue));
 }
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
+static void wlan_tx_fw(struct carl9170_tx_superdesc *super, fw_desc_callback_t cb)
+{
+       if (!fw.wlan.fw_desc_available)
+               return;
+
+       fw.wlan.fw_desc_available = 0;
+
+       /* Format BlockAck */
+       fw.wlan.fw_desc->ctrl = AR9170_CTRL_FS_BIT | AR9170_CTRL_LS_BIT;
+       fw.wlan.fw_desc->status = AR9170_OWN_BITS_SW;
+
+       fw.wlan.fw_desc->totalLen = fw.wlan.fw_desc->dataSize = super->len;
+       fw.wlan.fw_desc_data = fw.wlan.fw_desc->dataAddr = super;
+       fw.wlan.fw_desc->nextAddr = fw.wlan.fw_desc->lastAddr =
+               fw.wlan.fw_desc;
+       fw.wlan.fw_desc_callback = cb;
+       wlan_tx(fw.wlan.fw_desc);
+}
+
 static void wlan_send_buffered_ba(void)
 {
        struct carl9170_tx_ba_superframe *baf = &dma_mem.reserved.ba.ba;
@@ -494,26 +531,19 @@ static void wlan_send_buffered_ba(void)
                return;
 
        /* there's no point to continue when the ba_desc is not available. */
-       if (!fw.wlan.ba_desc_available)
+       if (!fw.wlan.fw_desc_available)
                return;
 
-       ctx = &fw.wlan.ba_cache[fw.wlan.ba_head_idx % CONFIG_CARL9170FW_BACK_REQS_NUM];
+       ctx = &fw.wlan.ba_cache[fw.wlan.ba_head_idx];
        fw.wlan.ba_head_idx++;
-
-       /* Format BlockAck */
-       fw.wlan.ba_desc->status = 0;
-       fw.wlan.ba_desc->ctrl = AR9170_CTRL_FS_BIT | AR9170_CTRL_LS_BIT;
-       fw.wlan.ba_desc_available = 0;
-       fw.wlan.ba_desc->nextAddr = fw.wlan.ba_desc->lastAddr =
-               fw.wlan.ba_desc;
-
-       baf->s.len = fw.wlan.ba_desc->totalLen = fw.wlan.ba_desc->dataSize =
-               sizeof(struct carl9170_tx_superdesc) +
-               sizeof(struct ar9170_tx_hwdesc) +
-               sizeof(struct ieee80211_ba);
-
-       baf->s.ri[0].tries = 3;
-       baf->s.queue = 0;
+       fw.wlan.ba_head_idx %= CONFIG_CARL9170FW_BACK_REQS_NUM;
+
+       baf->s.len = sizeof(struct carl9170_tx_superdesc) +
+                    sizeof(struct ar9170_tx_hwdesc) +
+                    sizeof(struct ieee80211_ba);
+       baf->s.ri[0].tries = 1;
+       baf->s.cookie = 0;
+       baf->s.queue = AR9170_TXQ_VO;
        baf->f.hdr.length = sizeof(struct ieee80211_ba) + FCS_LEN;
 
        /* HW Duration / Backoff */
@@ -525,7 +555,7 @@ static void wlan_send_buffered_ba(void)
        baf->f.hdr.phy.tx_power = 29; /* 14.5 dBm */
 
        /* format outgoing BA */
-       ba->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_BACK);
+       ba->frame_control = cpu_to_le16(IEEE80211_FTYPE_CTL | IEEE80211_STYPE_NULLFUNC);
        ba->duration = cpu_to_le16(0);
        memcpy(ba->ta, ctx->ta, 6);
        memcpy(ba->ra, ctx->ra, 6);
@@ -543,20 +573,16 @@ static void wlan_send_buffered_ba(void)
         */
        ba->control = ctx->control | cpu_to_le16(1);
        ba->start_seq_num = ctx->start_seq_num;
-
-       wlan_tx(fw.wlan.ba_desc);
+       wlan_tx_fw(&baf->s, NULL);
 }
 
 static struct carl9170_bar_ctx *wlan_get_bar_cache_buffer(void)
 {
        struct carl9170_bar_ctx *tmp;
 
-       /* expire oldest entry, if we ran out of ba_ctx' */
-       if (fw.wlan.ba_head_idx + CONFIG_CARL9170FW_BACK_REQS_NUM < fw.wlan.ba_tail_idx)
-               fw.wlan.ba_head_idx++;
-
-       tmp = &fw.wlan.ba_cache[fw.wlan.ba_tail_idx % CONFIG_CARL9170FW_BACK_REQS_NUM];
+       tmp = &fw.wlan.ba_cache[fw.wlan.ba_tail_idx];
        fw.wlan.ba_tail_idx++;
+       fw.wlan.ba_tail_idx %= CONFIG_CARL9170FW_BACK_REQS_NUM;
 
        return tmp;
 }
@@ -612,14 +638,13 @@ static void handle_bar(struct dma_desc *desc, struct ieee80211_hdr *hdr,
                ctx->phy = cpu_to_le32(0x2cc301);
        }
 }
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
 
 static void wlan_check_rx_overrun(void)
 {
        uint32_t overruns, total;
 
-       fw.wlan.rx_total += total = get(AR9170_MAC_REG_RX_TOTAL);
-       fw.wlan.rx_overruns += overruns = get(AR9170_MAC_REG_RX_OVERRUN);
+       fw.tally.rx_total += total = get(AR9170_MAC_REG_RX_TOTAL);
+       fw.tally.rx_overrun += overruns = get(AR9170_MAC_REG_RX_OVERRUN);
        if (unlikely(overruns)) {
                if (overruns == total) {
                        DBG("RX Overrun");
@@ -631,7 +656,25 @@ static void wlan_check_rx_overrun(void)
 }
 
 #ifdef CONFIG_CARL9170FW_WOL
-static void wlan_rx_wol(struct ieee80211_hdr *hdr, unsigned int len)
+void wlan_prepare_wol(void)
+{
+       /* set MAC filter */
+       memcpy((void *)AR9170_MAC_REG_MAC_ADDR_L, fw.wlan.wol.cmd.mac, 6);
+       memcpy((void *)AR9170_MAC_REG_BSSID_L, fw.wlan.wol.cmd.bssid, 6);
+       set(AR9170_MAC_REG_RX_CONTROL, AR9170_MAC_RX_CTRL_DEAGG);
+
+       /* set filter policy to: discard everything */
+       fw.wlan.rx_filter = CARL9170_RX_FILTER_EVERYTHING;
+
+       /* reenable rx dma */
+       wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
+
+       /* initialize the last_beacon timer */
+       fw.wlan.wol.last_null = fw.wlan.wol.last_beacon = get_clock_counter();
+}
+
+#ifdef CONFIG_CARL9170FW_WOL_NL80211_TRIGGERS
+static bool wlan_rx_wol_magic_packet(struct ieee80211_hdr *hdr, unsigned int len)
 {
        const unsigned char *data, *end, *mac;
        unsigned int found = 0;
@@ -642,16 +685,7 @@ static void wlan_rx_wol(struct ieee80211_hdr *hdr, unsigned int len)
         * for MAGIC patterns!
         */
 
-       /*
-        * TODO:
-        * Currently, the MAGIC MAC Address is fixed to the EEPROM default.
-        * It's possible to make it fully configurable, e.g:
-        *
-        * mac = (const unsigned char *) AR9170_MAC_REG_MAC_ADDR_L;
-        * But this will clash with the driver's suspend path, because it
-        * needs to reset the registers.
-        */
-       mac = rom.sys.mac_address;
+       mac = (const unsigned char *) AR9170_MAC_REG_MAC_ADDR_L;
 
        data = (u8 *)((unsigned long)hdr + ieee80211_hdrlen(hdr->frame_control));
        end = (u8 *)((unsigned long)hdr + len);
@@ -695,15 +729,176 @@ static void wlan_rx_wol(struct ieee80211_hdr *hdr, unsigned int len)
                                found = 0;
                }
 
-               if (found == (6 + 16 * 6)) {
-                       fw.suspend_mode = CARL9170_AWAKE_HOST;
-                       return;
-               }
+               if (found == (6 + 16 * 6))
+                       return true;
 
                data++;
        }
 
-       return;
+       return false;
+}
+
+static void wlan_wol_connect_callback(void __unused *dummy, bool success)
+{
+       if (success)
+               fw.wlan.wol.lost_null = 0;
+       else
+               fw.wlan.wol.lost_null++;
+}
+
+static void wlan_wol_connection_monitor(void)
+{
+       struct carl9170_tx_null_superframe *nullf = &dma_mem.reserved.cmd.null;
+       struct ieee80211_hdr *null = (struct ieee80211_hdr *) &nullf->f.null;
+
+       if (!fw.wlan.fw_desc_available)
+               return;
+
+       memset(nullf, 0, sizeof(*nullf));
+
+       nullf->s.len = sizeof(struct carl9170_tx_superdesc) +
+                    sizeof(struct ar9170_tx_hwdesc) +
+                    sizeof(struct ieee80211_hdr);
+       nullf->s.ri[0].tries = 3;
+       nullf->s.assign_seq = true;
+       nullf->s.queue = AR9170_TXQ_VO;
+       nullf->f.hdr.length = sizeof(struct ieee80211_hdr) + FCS_LEN;
+
+       nullf->f.hdr.mac.backoff = 1;
+       nullf->f.hdr.mac.hw_duration = 1;
+       nullf->f.hdr.mac.erp_prot = AR9170_TX_MAC_PROT_RTS;
+
+       nullf->f.hdr.phy.modulation = AR9170_TX_PHY_MOD_OFDM;
+       nullf->f.hdr.phy.bandwidth = AR9170_TX_PHY_BW_20MHZ;
+       nullf->f.hdr.phy.chains = AR9170_TX_PHY_TXCHAIN_2;
+       nullf->f.hdr.phy.tx_power = 29; /* 14.5 dBm */
+       nullf->f.hdr.phy.mcs = AR9170_TXRX_PHY_RATE_OFDM_6M;
+
+       /* format outgoing nullfunc */
+       null->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |
+               IEEE80211_STYPE_NULLFUNC | IEEE80211_FCTL_TODS);
+
+       memcpy(null->addr1, fw.wlan.wol.cmd.bssid, 6);
+       memcpy(null->addr2, fw.wlan.wol.cmd.mac, 6);
+       memcpy(null->addr3, fw.wlan.wol.cmd.bssid, 6);
+
+       wlan_tx_fw(&nullf->s, wlan_wol_connect_callback);
+}
+
+static bool wlan_rx_wol_disconnect(const unsigned int rx_filter,
+                                  struct ieee80211_hdr *hdr,
+                                  unsigned int __unused len)
+{
+       const unsigned char *bssid;
+       bssid = (const unsigned char *) AR9170_MAC_REG_BSSID_L;
+
+       /* should catch both broadcast and unicast MLMEs */
+       if (!(rx_filter & CARL9170_RX_FILTER_OTHER_RA)) {
+               if (ieee80211_is_deauth(hdr->frame_control) ||
+                   ieee80211_is_disassoc(hdr->frame_control))
+                       return true;
+       }
+
+       if (ieee80211_is_beacon(hdr->frame_control) &&
+           compare_ether_address(hdr->addr3, bssid)) {
+               fw.wlan.wol.last_beacon = get_clock_counter();
+       }
+
+       return false;
+}
+
+#endif /* CARL9170FW_WOL_NL80211_TRIGGERS */
+
+#ifdef CONFIG_CARL9170FW_WOL_PROBE_REQUEST
+
+/*
+ * Note: CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID is not a real
+ * string. We have to be careful not to add a \0 at the end.
+ */
+static const struct {
+       u8 ssid_ie;
+       u8 ssid_len;
+       u8 ssid[sizeof(CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID) - 1];
+} __packed probe_req = {
+       .ssid_ie = WLAN_EID_SSID,
+       .ssid_len = sizeof(CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID) - 1,
+       .ssid = CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID,
+};
+
+static bool wlan_rx_wol_probe_ssid(struct ieee80211_hdr *hdr, unsigned int len)
+{
+       const unsigned char *data, *end, *scan = (void *) &probe_req;
+
+       /*
+        * IEEE 802.11-2007 7.3.2.1 specifies that the SSID is no
+        * longer than 32 octets.
+        */
+       BUILD_BUG_ON((sizeof(CONFIG_CARL9170FW_WOL_PROBE_REQUEST_SSID) - 1) > 32);
+
+       if (ieee80211_is_probe_req(hdr->frame_control)) {
+               unsigned int i;
+               end = (u8 *)((unsigned long)hdr + len);
+
+               /*
+                * The position of the SSID information element inside
+                * a probe request frame is more or less "fixed".
+                */
+               data = (u8 *)((struct ieee80211_mgmt *)hdr)->u.probe_req.variable;
+               for (i = 0; i < (unsigned int)(probe_req.ssid_len + 1); i++) {
+                       if (scan[i] != data[i])
+                               return false;
+               }
+
+               return true;
+       }
+
+       return false;
+}
+#endif /* CONFIG_CARL9170FW_WOL_PROBE_REQUEST */
+
+static void wlan_rx_wol(unsigned int rx_filter __unused, struct ieee80211_hdr *hdr __unused, unsigned int len __unused)
+{
+#ifdef CONFIG_CARL9170FW_WOL_NL80211_TRIGGERS
+       /* Disconnect is always enabled */
+       if (fw.wlan.wol.cmd.flags & CARL9170_WOL_DISCONNECT &&
+           rx_filter & CARL9170_RX_FILTER_MGMT)
+               fw.wlan.wol.wake_up |= wlan_rx_wol_disconnect(rx_filter, hdr, len);
+
+       if (fw.wlan.wol.cmd.flags & CARL9170_WOL_MAGIC_PKT &&
+           rx_filter & CARL9170_RX_FILTER_DATA)
+               fw.wlan.wol.wake_up |= wlan_rx_wol_magic_packet(hdr, len);
+#endif /* CONFIG_CARL9170FW_WOL_NL80211_TRIGGERS */
+
+#ifdef CONFIG_CARL9170FW_WOL_PROBE_REQUEST
+       if (rx_filter & CARL9170_RX_FILTER_MGMT)
+               fw.wlan.wol.wake_up |= wlan_rx_wol_probe_ssid(hdr, len);
+#endif /* CONFIG_CARL9170FW_WOL_PROBE_REQUEST */
+}
+
+static void wlan_wol_janitor(void)
+{
+       if (unlikely(fw.suspend_mode == CARL9170_HOST_SUSPENDED)) {
+               if (fw.wlan.wol.cmd.flags & CARL9170_WOL_DISCONNECT) {
+                       /*
+                        * connection lost after 10sec without receiving
+                        * a beacon
+                         */
+                       if (is_after_msecs(fw.wlan.wol.last_beacon, 10000))
+                               fw.wlan.wol.wake_up |= true;
+
+                       if (fw.wlan.wol.cmd.null_interval &&
+                           is_after_msecs(fw.wlan.wol.last_null, fw.wlan.wol.cmd.null_interval))
+                               wlan_wol_connection_monitor();
+
+                       if (fw.wlan.wol.lost_null >= 5)
+                               fw.wlan.wol.wake_up |= true;
+               }
+
+               if (fw.wlan.wol.wake_up) {
+                       fw.suspend_mode = CARL9170_AWAKE_HOST;
+                       set(AR9170_USB_REG_WAKE_UP, AR9170_USB_WAKE_UP_WAKE);
+               }
+       }
 }
 #endif /* CONFIG_CARL9170FW_WOL */
 
@@ -743,9 +938,7 @@ static unsigned int wlan_rx_filter(struct dma_desc *desc)
        } else if (ieee80211_is_ctl(hdr->frame_control)) {
                switch (le16_to_cpu(hdr->frame_control) & IEEE80211_FCTL_STYPE) {
                case IEEE80211_STYPE_BACK_REQ:
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
                        handle_bar(desc, hdr, data_len, mac_err);
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
                        /* fallthrough */
                        rx_filter |= CARL9170_RX_FILTER_CTL_BACKR;
                        break;
@@ -763,9 +956,8 @@ static unsigned int wlan_rx_filter(struct dma_desc *desc)
 
 #ifdef CONFIG_CARL9170FW_WOL
        if (unlikely(fw.suspend_mode == CARL9170_HOST_SUSPENDED)) {
-               if (rx_filter & CARL9170_RX_FILTER_DATA)
-                       wlan_rx_wol(hdr, min(data_len,
-                                   (unsigned int)AR9170_BLOCK_SIZE));
+               wlan_rx_wol(rx_filter, hdr, min(data_len,
+                              (unsigned int)AR9170_BLOCK_SIZE));
        }
 #endif /* CONFIG_CARL9170FW_WOL */
 
@@ -784,7 +976,7 @@ static void handle_rx(void)
                        up_trigger();
                } else {
                        dma_reclaim(&fw.wlan.rx_queue, desc);
-                       _wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
+                       wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
                }
        }
 }
@@ -842,7 +1034,7 @@ static uint8_t *beacon_find_ie(uint8_t ie, void *addr,
        return NULL;
 }
 
-void wlan_cab_modify_dtim_beacon(const unsigned int vif,
+void wlan_modify_beacon(const unsigned int vif,
        const unsigned int addr, const unsigned int len)
 {
        uint8_t *_ie;
@@ -867,6 +1059,47 @@ void wlan_cab_modify_dtim_beacon(const unsigned int vif,
                        ie->bitmap_ctrl |= 0x1;
                }
        }
+
+       /*
+        * Ideally, the sequence number should be assigned by the TX arbiter
+        * hardware. But AFAIK that's not possible, so we have to go for the
+        * next best thing and write it into the beacon fifo during the open
+        * beacon update window.
+        */
+
+       wlan_assign_seq((struct ieee80211_hdr *)addr, vif);
+}
+
+static void wlan_send_buffered_cab(void)
+{
+       unsigned int i;
+
+       for (i = 0; i < CARL9170_INTF_NUM; i++) {
+               if (unlikely(fw.wlan.cab_flush_trigger[i] == CARL9170_CAB_TRIGGER_ARMED)) {
+                       /*
+                        * This is hardcoded into carl9170usb driver.
+                        *
+                        * The driver must set the PRETBTT event to beacon_interval -
+                        * CARL9170_PRETBTT_KUS (usually 6) Kus.
+                        *
+                        * But still, we can only do so much about 802.11-2007 9.3.2.1 &
+                        * 11.2.1.6. Let's hope the current solution is adequate enough.
+                        */
+
+                       if (is_after_msecs(fw.wlan.cab_flush_time, (CARL9170_TBTT_DELTA))) {
+                               wlan_cab_flush_queue(i);
+
+                               /*
+                                * This prevents the code from sending new BC/MC frames
+                                * which were queued after the previous buffered traffic
+                                * has been sent out... They will have to wait until the
+                                * next DTIM beacon comes along.
+                                */
+                               fw.wlan.cab_flush_trigger[i] = CARL9170_CAB_TRIGGER_DEFER;
+                       }
+               }
+
+       }
 }
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
@@ -877,8 +1110,6 @@ static void handle_beacon_config(void)
        bcn_count = get(AR9170_MAC_REG_BCN_COUNT);
        send_cmd_to_host(4, CARL9170_RSP_BEACON_CONFIG, 0x00,
                         (uint8_t *) &bcn_count);
-
-       set(AR9170_MAC_REG_BCN_CTRL, AR9170_BCN_CTRL_READY);
 }
 
 static void handle_pretbtt(void)
@@ -887,14 +1118,12 @@ static void handle_pretbtt(void)
        fw.wlan.cab_flush_time = get_clock_counter();
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
-#ifdef CONFIG_CARL9170FW_PSM
+#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
        rf_psm();
 
        send_cmd_to_host(4, CARL9170_RSP_PRETBTT, 0x00,
                         (uint8_t *) &fw.phy.psm.state);
-#else
-       send_cmd_to_host(0, CARL9170_RSP_PRETBTT, 0x00, NULL);
-#endif /* CONFIG_CARL9170FW_PSM */
+#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 }
 
 static void handle_atim(void)
@@ -921,48 +1150,16 @@ static void handle_radar(void)
 static void wlan_janitor(void)
 {
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
-       unsigned int i;
-
-       for (i = 0; i < CARL9170_INTF_NUM; i++) {
-               if (unlikely(fw.wlan.cab_flush_trigger[i] == CARL9170_CAB_TRIGGER_ARMED)) {
-                       /*
-                        * This is hardcoded into carl9170usb driver.
-                        *
-                        * The driver must set the PRETBTT event to beacon_interval -
-                        * CARL9170_PRETBTT_KUS (usually 6) Kus.
-                        *
-                        * But still, we can only do so much about 802.11-2007 9.3.2.1 &
-                        * 11.2.1.6. Let's hope the current solution is adequate enough.
-                        */
-
-                       if (is_after_msecs(fw.wlan.cab_flush_time, (CARL9170_TBTT_DELTA))) {
-                               wlan_cab_flush_queue(i);
-
-                               /*
-                                * This prevents the code from sending new BC/MC frames
-                                * which were queued after the previous buffered traffic
-                                * has been sent out... They will have to wait until the
-                                * next DTIM beacon comes along.
-                                */
-                               fw.wlan.cab_flush_trigger[i] = CARL9170_CAB_TRIGGER_DEFER;
-                       }
-               }
-
-       }
+       wlan_send_buffered_cab();
 #endif /* CONFIG_CARL9170FW_CAB_QUEUE */
 
-#ifdef CONFIG_CARL9170FW_DELAYED_TX
-       if (fw.wlan.tx_trigger) {
-               _wlan_trigger(fw.wlan.tx_trigger);
-               fw.wlan.tx_trigger = 0;
-       }
-#endif /* CONFIG_CARL9170FW_DELAYED_TX */
-
        wlan_send_buffered_tx_status();
 
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
        wlan_send_buffered_ba();
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
+
+#ifdef CONFIG_CARL9170FW_WOL
+       wlan_wol_janitor();
+#endif /* CONFIG_CARL9170FW_WOL */
 }
 
 void handle_wlan(void)
@@ -1008,25 +1205,31 @@ void handle_wlan(void)
 #undef HANDLER
 }
 
+enum {
+       CARL9170FW_TX_MAC_BUMP = 4,
+       CARL9170FW_TX_MAC_DEBUG = 6,
+       CARL9170FW_TX_MAC_RESET = 7,
+};
+
 static void wlan_check_hang(void)
 {
        struct dma_desc *desc;
-       unsigned int i;
+       int i;
 
-       for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) {
+       for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) {
                if (queue_empty(&fw.wlan.tx_queue[i])) {
                        /* Nothing to do here... move along */
                        continue;
                }
 
                /* fetch the current DMA queue position */
-               desc = get_wlan_txq_addr(i);
+               desc = (struct dma_desc *)get_wlan_txq_addr(i);
 
                /* Stuck frame detection */
-               if (unlikely(desc == fw.wlan.last_tx_desc[i])) {
-                       fw.wlan.last_tx_desc_num[i]++;
+               if (unlikely(DESC_PAYLOAD(desc) == fw.wlan.last_super[i])) {
+                       fw.wlan.last_super_num[i]++;
 
-                       if (unlikely(fw.wlan.last_tx_desc_num[i] > 6)) {
+                       if (unlikely(fw.wlan.last_super_num[i] >= CARL9170FW_TX_MAC_RESET)) {
                                /*
                                 * schedule MAC reset (aka OFF/ON => dead)
                                 *
@@ -1039,7 +1242,7 @@ static void wlan_check_hang(void)
                        }
 
 #ifdef CONFIG_CARL9170FW_DEBUG
-                       if (unlikely(fw.wlan.last_tx_desc_num[i] > 5)) {
+                       if (unlikely(fw.wlan.last_super_num[i] >= CARL9170FW_TX_MAC_DEBUG)) {
                                /*
                                 * Sigh, the queue is almost certainly
                                 * dead. Dump the queue content to the
@@ -1052,7 +1255,7 @@ static void wlan_check_hang(void)
 #endif /* CONFIG_CARL9170FW_DEBUG */
 
 #ifdef CONFIG_CARL9170FW_DMA_QUEUE_BUMP
-                       if (unlikely(fw.wlan.last_tx_desc_num[i] > 3)) {
+                       if (unlikely(fw.wlan.last_super_num[i] >= CARL9170FW_TX_MAC_BUMP)) {
                                /*
                                 * Hrrm, bump the queue a bit.
                                 * maybe this will get it going again.
@@ -1064,8 +1267,8 @@ static void wlan_check_hang(void)
 #endif /* CONFIG_CARL9170FW_DMA_QUEUE_BUMP */
                } else {
                        /* Nothing stuck */
-                       fw.wlan.last_tx_desc[i] = desc;
-                       fw.wlan.last_tx_desc_num[i] = 0;
+                       fw.wlan.last_super[i] = DESC_PAYLOAD(desc);
+                       fw.wlan.last_super_num[i] = 0;
                }
        }
 }
@@ -1088,13 +1291,15 @@ static void wlan_mac_reset(void)
        uint32_t ack_power;
        uint32_t rts_cts_tpc;
        uint32_t rts_cts_rate;
-       unsigned int i;
+       int i;
 
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
        uint32_t rx_BB;
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 
+#ifdef CONFIG_CARL9170FW_NOISY_MAC_RESET
        INFO("MAC RESET");
+#endif /* CONFIG_CARL9170FW_NOISY_MAC_RESET */
 
        /* Save aggregation parameters */
        agg_wait_counter = get(AR9170_MAC_REG_AMPDU_FACTOR);
@@ -1162,15 +1367,39 @@ static void wlan_mac_reset(void)
         * set(AR9170_PHY_REG_CCA_THRESHOLD, 0x0);
         */
 
+       val = AR9170_DMA_TRIGGER_RXQ;
        /* Reinitialize all WLAN TX DMA queues. */
-       for (i = 0; i < __AR9170_NUM_TX_QUEUES; i++) {
+       for (i = AR9170_TXQ_SPECIAL; i >= AR9170_TXQ0; i--) {
                struct dma_desc *iter;
 
                __for_each_desc_bits(iter, &fw.wlan.tx_queue[i], AR9170_OWN_BITS_SW);
 
+               /* kill the stuck frame */
+               if (!is_terminator(&fw.wlan.tx_queue[i], iter) &&
+                   fw.wlan.last_super_num[i] >= CARL9170FW_TX_MAC_RESET &&
+                   fw.wlan.last_super[i] == DESC_PAYLOAD(iter)) {
+                       struct carl9170_tx_superframe *super = get_super(iter);
+
+                       iter->status = AR9170_OWN_BITS_SW;
+                       /*
+                        * Mark the frame as failed.
+                        * The BAFAIL flag allows the frame to sail through
+                        * wlan_tx_status without much "unstuck" trouble.
+                        */
+                       iter->ctrl &= ~(AR9170_CTRL_FAIL);
+                       iter->ctrl |= AR9170_CTRL_BAFAIL;
+
+                       super->s.cnt = CARL9170_TX_MAX_RATE_TRIES;
+                       super->s.rix = CARL9170_TX_MAX_RETRY_RATES;
+
+                       fw.wlan.last_super_num[i] = 0;
+                       fw.wlan.last_super[i] = NULL;
+                       iter = iter->lastAddr->nextAddr;
+               }
+
                set_wlan_txq_dma_addr(i, (uint32_t) iter);
                if (!is_terminator(&fw.wlan.tx_queue[i], iter))
-                       wlan_trigger(BIT(i));
+                       val |= BIT(i);
 
                DBG("Q:%d l:%d h:%p t:%p cu:%p it:%p ct:%x st:%x\n", i, queue_len(&fw.wlan.tx_queue[i]),
                     fw.wlan.tx_queue[i].head, fw.wlan.tx_queue[i].terminator,
@@ -1181,7 +1410,7 @@ static void wlan_mac_reset(void)
                            AR9170_MAC_INT_RETRY_FAIL;
 
        set(AR9170_MAC_REG_DMA_RXQ_ADDR, (uint32_t) fw.wlan.rx_queue.head);
-       wlan_trigger(AR9170_DMA_TRIGGER_RXQ);
+       wlan_trigger(val);
 }
 #else
 static void wlan_mac_reset(void)