167 files changed, 6478 insertions, 6908 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 5095340716cf..d350dae2ce1c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1595,6 +1595,7 @@ M:	Arend van Spriel <arend@broadcom.com>
 M:      Franky (Zhenhui) Lin <frankyl@broadcom.com>
 M:      Kan Yan <kanyan@broadcom.com>
 L:      linux-wireless@vger.kernel.org
+L:      brcm80211-dev-list@broadcom.com
 S:      Supported
 F:      drivers/net/wireless/brcm80211/
 
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 5ed0718fc660..a3420585d942 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -28,6 +28,12 @@ static const struct bcma_device_id_name bcma_arm_device_names[] = {
 
 static const struct bcma_device_id_name bcma_bcm_device_names[] = {
         { BCMA_CORE_OOB_ROUTER, "OOB Router" },
+        { BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" },
+        { BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" },
+        { BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" },
+        { BCMA_CORE_AMEMC, "AMEMC (DDR)" },
+        { BCMA_CORE_ALTA, "ALTA (I2S)" },
+        { BCMA_CORE_4706_MAC_GBIT_COMMON, "BCM4706 GBit MAC Common" },
         { BCMA_CORE_INVALID, "Invalid" },
         { BCMA_CORE_CHIPCOMMON, "ChipCommon" },
         { BCMA_CORE_ILINE20, "ILine 20" },
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index f27e9732951d..fd7dbd4609df 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -53,6 +53,11 @@
 
 #define DEFAULT_BG_SCAN_PERIOD 60
 
+struct ath6kl_cfg80211_match_probe_ssid {
+        struct cfg80211_ssid ssid;
+        u8 flag;
+};
+
 static struct ieee80211_rate ath6kl_rates[] = {
         RATETAB_ENT(10, 0x1, 0),
         RATETAB_ENT(20, 0x2, 0),
@@ -576,6 +581,9 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
 
         vif->nw_type = vif->next_mode;
 
+        /* enable enhanced bmiss detection if applicable */
+        ath6kl_cfg80211_sta_bmiss_enhance(vif, true);
+
         if (vif->wdev.iftype == NL80211_IFTYPE_P2P_CLIENT)
                 nw_subtype = SUBTYPE_P2PCLIENT;
 
@@ -852,20 +860,6 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason,
                 }
         }
 
-        /*
-         * Send a disconnect command to target when a disconnect event is
-         * received with reason code other than 3 (DISCONNECT_CMD - disconnect
-         * request from host) to make the firmware stop trying to connect even
-         * after giving disconnect event. There will be one more disconnect
-         * event for this disconnect command with reason code DISCONNECT_CMD
-         * which will be notified to cfg80211.
-         */
-
-        if (reason != DISCONNECT_CMD) {
-                ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx);
-                return;
-        }
-
         clear_bit(CONNECT_PEND, &vif->flags);
 
         if (vif->sme_state == SME_CONNECTING) {
@@ -875,32 +869,96 @@ void ath6kl_cfg80211_disconnect_event(struct ath6kl_vif *vif, u8 reason,
                                         WLAN_STATUS_UNSPECIFIED_FAILURE,
                                         GFP_KERNEL);
         } else if (vif->sme_state == SME_CONNECTED) {
-                cfg80211_disconnected(vif->ndev, reason,
+                cfg80211_disconnected(vif->ndev, proto_reason,
                                       NULL, 0, GFP_KERNEL);
         }
 
         vif->sme_state = SME_DISCONNECTED;
+
+        /*
+         * Send a disconnect command to target when a disconnect event is
+         * received with reason code other than 3 (DISCONNECT_CMD - disconnect
+         * request from host) to make the firmware stop trying to connect even
+         * after giving disconnect event. There will be one more disconnect
+         * event for this disconnect command with reason code DISCONNECT_CMD
+         * which won't be notified to cfg80211.
+         */
+        if (reason != DISCONNECT_CMD)
+                ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx);
 }
 
 static int ath6kl_set_probed_ssids(struct ath6kl *ar,
                                    struct ath6kl_vif *vif,
-                                   struct cfg80211_ssid *ssids, int n_ssids)
+                                   struct cfg80211_ssid *ssids, int n_ssids,
+                                   struct cfg80211_match_set *match_set,
+                                   int n_match_ssid)
 {
-        u8 i;
+        u8 i, j, index_to_add, ssid_found = false;
+        struct ath6kl_cfg80211_match_probe_ssid ssid_list[MAX_PROBED_SSIDS];
+
+        memset(ssid_list, 0, sizeof(ssid_list));
 
-        if (n_ssids > MAX_PROBED_SSID_INDEX)
+        if (n_ssids > MAX_PROBED_SSIDS ||
+            n_match_ssid > MAX_PROBED_SSIDS)
                 return -EINVAL;
 
         for (i = 0; i < n_ssids; i++) {
+                memcpy(ssid_list[i].ssid.ssid,
+                       ssids[i].ssid,
+                       ssids[i].ssid_len);
+                ssid_list[i].ssid.ssid_len = ssids[i].ssid_len;
+
+                if (ssids[i].ssid_len)
+                        ssid_list[i].flag = SPECIFIC_SSID_FLAG;
+                else
+                        ssid_list[i].flag = ANY_SSID_FLAG;
+
+                if (n_match_ssid == 0)
+                        ssid_list[i].flag |= MATCH_SSID_FLAG;
+        }
+
+        index_to_add = i;
+
+        for (i = 0; i < n_match_ssid; i++) {
+                ssid_found = false;
+
+                for (j = 0; j < n_ssids; j++) {
+                        if ((match_set[i].ssid.ssid_len ==
+                             ssid_list[j].ssid.ssid_len) &&
+                            (!memcmp(ssid_list[j].ssid.ssid,
+                                     match_set[i].ssid.ssid,
+                                     match_set[i].ssid.ssid_len))) {
+                                ssid_list[j].flag |= MATCH_SSID_FLAG;
+                                ssid_found = true;
+                                break;
+                        }
+                }
+
+                if (ssid_found)
+                        continue;
+
+                if (index_to_add >= MAX_PROBED_SSIDS)
+                        continue;
+
+                ssid_list[index_to_add].ssid.ssid_len =
+                        match_set[i].ssid.ssid_len;
+                memcpy(ssid_list[index_to_add].ssid.ssid,
+                       match_set[i].ssid.ssid,
+                       match_set[i].ssid.ssid_len);
+                ssid_list[index_to_add].flag |= MATCH_SSID_FLAG;
+                index_to_add++;
+        }
+
+        for (i = 0; i < index_to_add; i++) {
                 ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx, i,
-                                          ssids[i].ssid_len ?
-                                          SPECIFIC_SSID_FLAG : ANY_SSID_FLAG,
-                                          ssids[i].ssid_len,
-                                          ssids[i].ssid);
+                                          ssid_list[i].flag,
+                                          ssid_list[i].ssid.ssid_len,
+                                          ssid_list[i].ssid.ssid);
+
         }
 
         /* Make sure no old entries are left behind */
-        for (i = n_ssids; i < MAX_PROBED_SSID_INDEX; i++) {
+        for (i = index_to_add; i < MAX_PROBED_SSIDS; i++) {
                 ath6kl_wmi_probedssid_cmd(ar->wmi, vif->fw_vif_idx, i,
                                           DISABLE_SSID_FLAG, 0, NULL);
         }
@@ -934,7 +992,7 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
         }
 
         ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
-                                      request->n_ssids);
+                                      request->n_ssids, NULL, 0);
         if (ret < 0)
                 return ret;
 
@@ -943,7 +1001,7 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
                                        WMI_FRAME_PROBE_REQ,
                                        request->ie, request->ie_len);
         if (ret) {
-                ath6kl_err("failed to set Probe Request appie for scan");
+                ath6kl_err("failed to set Probe Request appie for scan\n");
                 return ret;
         }
 
@@ -1512,6 +1570,9 @@ static int ath6kl_cfg80211_change_iface(struct wiphy *wiphy,
                 }
         }
 
+        /* need to clean up enhanced bmiss detection fw state */
+        ath6kl_cfg80211_sta_bmiss_enhance(vif, false);
+
 set_iface_type:
         switch (type) {
         case NL80211_IFTYPE_STATION:
@@ -2074,7 +2135,9 @@ static int ath6kl_wow_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow)
         if (wow && (wow->n_patterns > WOW_MAX_FILTERS_PER_LIST))
                 return -EINVAL;
 
-        if (!test_bit(NETDEV_MCAST_ALL_ON, &vif->flags)) {
+        if (!test_bit(NETDEV_MCAST_ALL_ON, &vif->flags) &&
+            test_bit(ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER,
+                     ar->fw_capabilities)) {
                 ret = ath6kl_wmi_mcast_filter_cmd(vif->ar->wmi,
                                                 vif->fw_vif_idx, false);
                 if (ret)
@@ -2209,7 +2272,9 @@ static int ath6kl_wow_resume(struct ath6kl *ar)
 
         ar->state = ATH6KL_STATE_ON;
 
-        if (!test_bit(NETDEV_MCAST_ALL_OFF, &vif->flags)) {
+        if (!test_bit(NETDEV_MCAST_ALL_OFF, &vif->flags) &&
+            test_bit(ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER,
+                     ar->fw_capabilities)) {
                 ret = ath6kl_wmi_mcast_filter_cmd(vif->ar->wmi,
                                         vif->fw_vif_idx, true);
                 if (ret)
@@ -2475,7 +2540,7 @@ void ath6kl_check_wow_status(struct ath6kl *ar)
 static int ath6kl_set_htcap(struct ath6kl_vif *vif, enum ieee80211_band band,
                             bool ht_enable)
 {
-        struct ath6kl_htcap *htcap = &vif->htcap;
+        struct ath6kl_htcap *htcap = &vif->htcap[band];
 
         if (htcap->ht_enable == ht_enable)
                 return 0;
@@ -2585,6 +2650,30 @@ static int ath6kl_set_ies(struct ath6kl_vif *vif,
         return 0;
 }
 
+void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif, bool enable)
+{
+        int err;
+
+        if (WARN_ON(!test_bit(WMI_READY, &vif->ar->flag)))
+                return;
+
+        if (vif->nw_type != INFRA_NETWORK)
+                return;
+
+        if (!test_bit(ATH6KL_FW_CAPABILITY_BMISS_ENHANCE,
+                      vif->ar->fw_capabilities))
+                return;
+
+        ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s fw bmiss enhance\n",
+                   enable ? "enable" : "disable");
+
+        err = ath6kl_wmi_sta_bmiss_enhance_cmd(vif->ar->wmi,
+                                               vif->fw_vif_idx, enable);
+        if (err)
+                ath6kl_err("failed to %s enhanced bmiss detection: %d\n",
+                           enable ? "enable" : "disable", err);
+}
+
 static int ath6kl_get_rsn_capab(struct cfg80211_beacon_data *beacon,
                                 u8 *rsn_capab)
 {
@@ -2665,9 +2754,15 @@ static int ath6kl_start_ap(struct wiphy *wiphy, struct net_device *dev,
 
         /* TODO:
          * info->interval
-         * info->dtim_period
          */
 
+        ret = ath6kl_wmi_ap_set_dtim_cmd(ar->wmi, vif->fw_vif_idx,
+                                         info->dtim_period);
+
+        /* ignore error, just print a warning and continue normally */
+        if (ret)
+                ath6kl_warn("Failed to set dtim_period in beacon: %d\n", ret);
+
         if (info->beacon.head == NULL)
                 return -EINVAL;
         mgmt = (struct ieee80211_mgmt *) info->beacon.head;
@@ -3131,10 +3226,24 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,
         ath6kl_cfg80211_scan_complete_event(vif, true);
 
         ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,
-                                      request->n_ssids);
+                                      request->n_ssids,
+                                      request->match_sets,
+                                      request->n_match_sets);
         if (ret < 0)
                 return ret;
 
+        if (!request->n_match_sets) {
+                ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
+                                               ALL_BSS_FILTER, 0);
+                if (ret < 0)
+                        return ret;
+        } else {
+                 ret = ath6kl_wmi_bssfilter_cmd(ar->wmi, vif->fw_vif_idx,
+                                                MATCHED_SSID_FILTER, 0);
+                if (ret < 0)
+                        return ret;
+        }
+
         /* fw uses seconds, also make sure that it's >0 */
         interval = max_t(u16, 1, request->interval / 1000);
 
@@ -3156,7 +3265,7 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy,
                                        WMI_FRAME_PROBE_REQ,
                                        request->ie, request->ie_len);
         if (ret) {
-                ath6kl_warn("Failed to set probe request IE for scheduled scan: %d",
+                ath6kl_warn("Failed to set probe request IE for scheduled scan: %d\n",
                             ret);
                 return ret;
         }
@@ -3188,6 +3297,18 @@ static int ath6kl_cfg80211_sscan_stop(struct wiphy *wiphy,
         return 0;
 }
 
+static int ath6kl_cfg80211_set_bitrate(struct wiphy *wiphy,
+                                       struct net_device *dev,
+                                       const u8 *addr,
+                                       const struct cfg80211_bitrate_mask *mask)
+{
+        struct ath6kl *ar = ath6kl_priv(dev);
+        struct ath6kl_vif *vif = netdev_priv(dev);
+
+        return ath6kl_wmi_set_bitrate_mask(ar->wmi, vif->fw_vif_idx,
+                                           mask);
+}
+
 static const struct ieee80211_txrx_stypes
 ath6kl_mgmt_stypes[NUM_NL80211_IFTYPES] = {
         [NL80211_IFTYPE_STATION] = {
@@ -3253,6 +3374,7 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
         .mgmt_frame_register = ath6kl_mgmt_frame_register,
         .sched_scan_start = ath6kl_cfg80211_sscan_start,
         .sched_scan_stop = ath6kl_cfg80211_sscan_stop,
+        .set_bitrate_mask = ath6kl_cfg80211_set_bitrate,
 };
 
 void ath6kl_cfg80211_stop(struct ath6kl_vif *vif)
@@ -3380,7 +3502,8 @@ struct net_device *ath6kl_interface_add(struct ath6kl *ar, char *name,
         vif->listen_intvl_t = ATH6KL_DEFAULT_LISTEN_INTVAL;
         vif->bmiss_time_t = ATH6KL_DEFAULT_BMISS_TIME;
         vif->bg_scan_period = 0;
-        vif->htcap.ht_enable = true;
+        vif->htcap[IEEE80211_BAND_2GHZ].ht_enable = true;
+        vif->htcap[IEEE80211_BAND_5GHZ].ht_enable = true;
 
         memcpy(ndev->dev_addr, ar->mac_addr, ETH_ALEN);
         if (fw_vif_idx != 0)
@@ -3440,7 +3563,13 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
         }
 
         /* max num of ssids that can be probed during scanning */
-        wiphy->max_scan_ssids = MAX_PROBED_SSID_INDEX;
+        wiphy->max_scan_ssids = MAX_PROBED_SSIDS;
+
+        /* max num of ssids that can be matched after scan */
+        if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN_MATCH_LIST,
+                     ar->fw_capabilities))
+                wiphy->max_match_sets = MAX_PROBED_SSIDS;
+
         wiphy->max_scan_ie_len = 1000; /* FIX: what is correct limit? */
         switch (ar->hw.cap) {
         case WMI_11AN_CAP:
@@ -3477,6 +3606,17 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
                 ath6kl_band_5ghz.ht_cap.cap = 0;
                 ath6kl_band_5ghz.ht_cap.ht_supported = false;
         }
+
+        if (ar->hw.flags & ATH6KL_HW_FLAG_64BIT_RATES) {
+                ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff;
+                ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;
+                ath6kl_band_2ghz.ht_cap.mcs.rx_mask[1] = 0xff;
+                ath6kl_band_5ghz.ht_cap.mcs.rx_mask[1] = 0xff;
+        } else {
+                ath6kl_band_2ghz.ht_cap.mcs.rx_mask[0] = 0xff;
+                ath6kl_band_5ghz.ht_cap.mcs.rx_mask[0] = 0xff;
+        }
+
         if (band_2gig)
                 wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;
         if (band_5gig)
@@ -3497,7 +3637,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
         wiphy->wowlan.pattern_min_len = 1;
         wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE;
 
-        wiphy->max_sched_scan_ssids = MAX_PROBED_SSID_INDEX;
+        wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS;
 
         ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |
                             WIPHY_FLAG_HAVE_AP_SME |
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.h b/drivers/net/wireless/ath/ath6kl/cfg80211.h
index 5ea8cbb79f43..b992046a1b0e 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.h
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.h
@@ -62,5 +62,7 @@ void ath6kl_cfg80211_cleanup(struct ath6kl *ar);
 
 struct ath6kl *ath6kl_cfg80211_create(void);
 void ath6kl_cfg80211_destroy(struct ath6kl *ar);
+/* TODO: remove this once ath6kl_vif_cleanup() is moved to cfg80211.c */
+void ath6kl_cfg80211_sta_bmiss_enhance(struct ath6kl_vif *vif, bool enable);
 
 #endif /* ATH6KL_CFG80211_H */
diff --git a/drivers/net/wireless/ath/ath6kl/core.h b/drivers/net/wireless/ath/ath6kl/core.h
index 8443b2a4133e..d38a31de344c 100644
--- a/drivers/net/wireless/ath/ath6kl/core.h
+++ b/drivers/net/wireless/ath/ath6kl/core.h
@@ -100,6 +100,21 @@ enum ath6kl_fw_capability {
         /* Firmware has support to override rsn cap of rsn ie */
         ATH6KL_FW_CAPABILITY_RSN_CAP_OVERRIDE,
 
+        /*
+         * Multicast support in WOW and host awake mode.
+         * Allow all multicast in host awake mode.
+         * Apply multicast filter in WOW mode.
+         */
+        ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER,
+
+        /* Firmware supports enhanced bmiss detection */
+        ATH6KL_FW_CAPABILITY_BMISS_ENHANCE,
+
+        /*
+         * FW supports matching of ssid in schedule scan
+         */
+        ATH6KL_FW_CAPABILITY_SCHED_SCAN_MATCH_LIST,
+
         /* this needs to be last */
         ATH6KL_FW_CAPABILITY_MAX,
 };
@@ -112,6 +127,10 @@ struct ath6kl_fw_ie {
         u8 data[0];
 };
 
+enum ath6kl_hw_flags {
+        ATH6KL_HW_FLAG_64BIT_RATES      = BIT(0),
+};
+
 #define ATH6KL_FW_API2_FILE "fw-2.bin"
 #define ATH6KL_FW_API3_FILE "fw-3.bin"
 
@@ -196,7 +215,7 @@ struct ath6kl_fw_ie {
 
 #define AGGR_NUM_OF_FREE_NETBUFS    16
 
-#define AGGR_RX_TIMEOUT     400 /* in ms */
+#define AGGR_RX_TIMEOUT     100 /* in ms */
 
 #define WMI_TIMEOUT (2 * HZ)
 
@@ -245,7 +264,6 @@ struct skb_hold_q {
 
 struct rxtid {
         bool aggr;
-        bool progress;
         bool timer_mon;
         u16 win_sz;
         u16 seq_next;
@@ -254,9 +272,15 @@ struct rxtid {
         struct sk_buff_head q;
 
         /*
-         * FIXME: No clue what this should protect. Apparently it should
-         * protect some of the fields above but they are also accessed
-         * without taking the lock.
+         * lock mainly protects seq_next and hold_q. Movement of seq_next
+         * needs to be protected between aggr_timeout() and
+         * aggr_process_recv_frm(). hold_q will be holding the pending
+         * reorder frames and it's access should also be protected.
+         * Some of the other fields like hold_q_sz, win_sz and aggr are
+         * initialized/reset when receiving addba/delba req, also while
+         * deleting aggr state all the pending buffers are flushed before
+         * resetting these fields, so there should not be any race in accessing
+         * these fields.
          */
         spinlock_t lock;
 };
@@ -541,7 +565,7 @@ struct ath6kl_vif {
         struct ath6kl_wep_key wep_key_list[WMI_MAX_KEY_INDEX + 1];
         struct ath6kl_key keys[WMI_MAX_KEY_INDEX + 1];
         struct aggr_info *aggr_cntxt;
-        struct ath6kl_htcap htcap;
+        struct ath6kl_htcap htcap[IEEE80211_NUM_BANDS];
 
         struct timer_list disconnect_timer;
         struct timer_list sched_scan_timer;
@@ -684,6 +708,8 @@ struct ath6kl {
                 u32 testscript_addr;
                 enum wmi_phy_cap cap;
 
+                u32 flags;
+
                 struct ath6kl_hw_fw {
                         const char *dir;
                         const char *otp;
diff --git a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
index 2798624d3a9d..cd0e1ba410d6 100644
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
@@ -1309,7 +1309,7 @@ static int ath6kl_htc_rx_packet(struct htc_target *target,
         }
 
         ath6kl_dbg(ATH6KL_DBG_HTC,
-                   "htc rx 0x%p hdr x%x len %d mbox 0x%x\n",
+                   "htc rx 0x%p hdr 0x%x len %d mbox 0x%x\n",
                    packet, packet->info.rx.exp_hdr,
                    padded_len, dev->ar->mbox_info.htc_addr);
 
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 7eb0515f458a..f90b5db741cf 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -42,6 +42,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .reserved_ram_size              = 6912,
                 .refclk_hz                      = 26000000,
                 .uarttx_pin                     = 8,
+                .flags                          = 0,
 
                 /* hw2.0 needs override address hardcoded */
                 .app_start_override_addr        = 0x944C00,
@@ -67,6 +68,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .refclk_hz                      = 26000000,
                 .uarttx_pin                     = 8,
                 .testscript_addr                = 0x57ef74,
+                .flags                          = 0,
 
                 .fw = {
                         .dir            = AR6003_HW_2_1_1_FW_DIR,
@@ -91,6 +93,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_addr                     = 0x433900,
                 .refclk_hz                      = 26000000,
                 .uarttx_pin                     = 11,
+                .flags                          = ATH6KL_HW_FLAG_64BIT_RATES,
 
                 .fw = {
                         .dir            = AR6004_HW_1_0_FW_DIR,
@@ -110,6 +113,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_addr                     = 0x43d400,
                 .refclk_hz                      = 40000000,
                 .uarttx_pin                     = 11,
+                .flags                          = ATH6KL_HW_FLAG_64BIT_RATES,
 
                 .fw = {
                         .dir            = AR6004_HW_1_1_FW_DIR,
@@ -129,6 +133,7 @@ static const struct ath6kl_hw hw_list[] = {
                 .board_addr                     = 0x435c00,
                 .refclk_hz                      = 40000000,
                 .uarttx_pin                     = 11,
+                .flags                          = ATH6KL_HW_FLAG_64BIT_RATES,
 
                 .fw = {
                         .dir            = AR6004_HW_1_2_FW_DIR,
@@ -938,6 +943,14 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
                 }
 
                 switch (ie_id) {
+                case ATH6KL_FW_IE_FW_VERSION:
+                        strlcpy(ar->wiphy->fw_version, data,
+                                sizeof(ar->wiphy->fw_version));
+
+                        ath6kl_dbg(ATH6KL_DBG_BOOT,
+                                   "found fw version %s\n",
+                                    ar->wiphy->fw_version);
+                        break;
                 case ATH6KL_FW_IE_OTP_IMAGE:
                         ath6kl_dbg(ATH6KL_DBG_BOOT, "found otp image ie (%zd B)\n",
                                    ie_len);
@@ -991,9 +1004,6 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
                                    ar->hw.reserved_ram_size);
                         break;
                 case ATH6KL_FW_IE_CAPABILITIES:
-                        if (ie_len < DIV_ROUND_UP(ATH6KL_FW_CAPABILITY_MAX, 8))
-                                break;
-
                         ath6kl_dbg(ATH6KL_DBG_BOOT,
                                    "found firmware capabilities ie (%zd B)\n",
                                    ie_len);
@@ -1002,6 +1012,9 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
                                 index = i / 8;
                                 bit = i % 8;
 
+                                if (index == ie_len)
+                                        break;
+
                                 if (data[index] & (1 << bit))
                                         __set_bit(i, ar->fw_capabilities);
                         }
@@ -1392,6 +1405,12 @@ static int ath6kl_init_upload(struct ath6kl *ar)
             ar->version.target_ver == AR6003_HW_2_1_1_VERSION) {
                 ath6kl_err("temporary war to avoid sdio crc error\n");
 
+                param = 0x28;
+                address = GPIO_BASE_ADDRESS + GPIO_PIN9_ADDRESS;
+                status = ath6kl_bmi_reg_write(ar, address, param);
+                if (status)
+                        return status;
+
                 param = 0x20;
 
                 address = GPIO_BASE_ADDRESS + GPIO_PIN10_ADDRESS;
@@ -1659,6 +1678,9 @@ void ath6kl_cleanup_vif(struct ath6kl_vif *vif, bool wmi_ready)
                 cfg80211_scan_done(vif->scan_req, true);
                 vif->scan_req = NULL;
         }
+
+        /* need to clean up enhanced bmiss detection fw state */
+        ath6kl_cfg80211_sta_bmiss_enhance(vif, false);
 }
 
 void ath6kl_stop_txrx(struct ath6kl *ar)
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index b836f2795114..c189e28e86a9 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -554,20 +554,24 @@ void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver,
         struct ath6kl *ar = devt;
 
         memcpy(ar->mac_addr, datap, ETH_ALEN);
-        ath6kl_dbg(ATH6KL_DBG_TRC, "%s: mac addr = %pM\n",
-                   __func__, ar->mac_addr);
+
+        ath6kl_dbg(ATH6KL_DBG_BOOT,
+                   "ready event mac addr %pM sw_ver 0x%x abi_ver 0x%x cap 0x%x\n",
+                   ar->mac_addr, sw_ver, abi_ver, cap);
 
         ar->version.wlan_ver = sw_ver;
         ar->version.abi_ver = abi_ver;
         ar->hw.cap = cap;
 
-        snprintf(ar->wiphy->fw_version,
-                 sizeof(ar->wiphy->fw_version),
-                 "%u.%u.%u.%u",
-                 (ar->version.wlan_ver & 0xf0000000) >> 28,
-                 (ar->version.wlan_ver & 0x0f000000) >> 24,
-                 (ar->version.wlan_ver & 0x00ff0000) >> 16,
-                 (ar->version.wlan_ver & 0x0000ffff));
+        if (strlen(ar->wiphy->fw_version) == 0) {
+                snprintf(ar->wiphy->fw_version,
+                         sizeof(ar->wiphy->fw_version),
+                         "%u.%u.%u.%u",
+                         (ar->version.wlan_ver & 0xf0000000) >> 28,
+                         (ar->version.wlan_ver & 0x0f000000) >> 24,
+                         (ar->version.wlan_ver & 0x00ff0000) >> 16,
+                         (ar->version.wlan_ver & 0x0000ffff));
+        }
 
         /* indicate to the waiting thread that the ready event was received */
         set_bit(WMI_READY, &ar->flag);
@@ -1166,7 +1170,10 @@ static void ath6kl_set_multicast_list(struct net_device *ndev)
         else
                 clear_bit(NETDEV_MCAST_ALL_ON, &vif->flags);
 
-        mc_all_on = mc_all_on || (vif->ar->state == ATH6KL_STATE_ON);
+        if (test_bit(ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER,
+                     vif->ar->fw_capabilities)) {
+                mc_all_on = mc_all_on || (vif->ar->state == ATH6KL_STATE_ON);
+        }
 
         if (!(ndev->flags & IFF_MULTICAST)) {
                 mc_all_on = false;
diff --git a/drivers/net/wireless/ath/ath6kl/target.h b/drivers/net/wireless/ath/ath6kl/target.h
index 78e0ef4567a5..a98c12ba70c1 100644
--- a/drivers/net/wireless/ath/ath6kl/target.h
+++ b/drivers/net/wireless/ath/ath6kl/target.h
@@ -45,6 +45,7 @@
 #define LPO_CAL_ENABLE_S                20
 #define LPO_CAL_ENABLE                  0x00100000
 
+#define GPIO_PIN9_ADDRESS               0x0000004c
 #define GPIO_PIN10_ADDRESS              0x00000050
 #define GPIO_PIN11_ADDRESS              0x00000054
 #define GPIO_PIN12_ADDRESS              0x00000058
diff --git a/drivers/net/wireless/ath/ath6kl/txrx.c b/drivers/net/wireless/ath/ath6kl/txrx.c
index 67206aedea6c..7dfa0fd86d7b 100644
--- a/drivers/net/wireless/ath/ath6kl/txrx.c
+++ b/drivers/net/wireless/ath/ath6kl/txrx.c
@@ -1036,6 +1036,7 @@ static void aggr_deque_frms(struct aggr_info_conn *agg_conn, u8 tid,
         rxtid = &agg_conn->rx_tid[tid];
         stats = &agg_conn->stat[tid];
 
+        spin_lock_bh(&rxtid->lock);
         idx = AGGR_WIN_IDX(rxtid->seq_next, rxtid->hold_q_sz);
 
         /*
@@ -1054,8 +1055,6 @@ static void aggr_deque_frms(struct aggr_info_conn *agg_conn, u8 tid,
         seq_end = seq_no ? seq_no : rxtid->seq_next;
         idx_end = AGGR_WIN_IDX(seq_end, rxtid->hold_q_sz);
 
-        spin_lock_bh(&rxtid->lock);
-
         do {
                 node = &rxtid->hold_q[idx];
                 if ((order == 1) && (!node->skb))
@@ -1127,11 +1126,13 @@ static bool aggr_process_recv_frm(struct aggr_info_conn *agg_conn, u8 tid,
                     ((end > extended_end) && (cur > extended_end) &&
                      (cur < end))) {
                         aggr_deque_frms(agg_conn, tid, 0, 0);
+                        spin_lock_bh(&rxtid->lock);
                         if (cur >= rxtid->hold_q_sz - 1)
                                 rxtid->seq_next = cur - (rxtid->hold_q_sz - 1);
                         else
                                 rxtid->seq_next = ATH6KL_MAX_SEQ_NO -
                                                   (rxtid->hold_q_sz - 2 - cur);
+                        spin_unlock_bh(&rxtid->lock);
                 } else {
                         /*
                          * Dequeue only those frames that are outside the
@@ -1185,25 +1186,25 @@ static bool aggr_process_recv_frm(struct aggr_info_conn *agg_conn, u8 tid,
         aggr_deque_frms(agg_conn, tid, 0, 1);
 
         if (agg_conn->timer_scheduled)
-                rxtid->progress = true;
-        else
-                for (idx = 0 ; idx < rxtid->hold_q_sz; idx++) {
-                        if (rxtid->hold_q[idx].skb) {
-                                /*
-                                 * There is a frame in the queue and no
-                                 * timer so start a timer to ensure that
-                                 * the frame doesn't remain stuck
-                                 * forever.
-                                 */
-                                agg_conn->timer_scheduled = true;
-                                mod_timer(&agg_conn->timer,
-                                          (jiffies +
-                                           HZ * (AGGR_RX_TIMEOUT) / 1000));
-                                rxtid->progress = false;
-                                rxtid->timer_mon = true;
-                                break;
-                        }
+                return is_queued;
+
+        spin_lock_bh(&rxtid->lock);
+        for (idx = 0 ; idx < rxtid->hold_q_sz; idx++) {
+                if (rxtid->hold_q[idx].skb) {
+                        /*
+                         * There is a frame in the queue and no
+                         * timer so start a timer to ensure that
+                         * the frame doesn't remain stuck
+                         * forever.
+                         */
+                        agg_conn->timer_scheduled = true;
+                        mod_timer(&agg_conn->timer,
+                                  (jiffies + (HZ * AGGR_RX_TIMEOUT) / 1000));
+                        rxtid->timer_mon = true;
+                        break;
                 }
+        }
+        spin_unlock_bh(&rxtid->lock);
 
         return is_queued;
 }
@@ -1608,7 +1609,7 @@ static void aggr_timeout(unsigned long arg)
                 rxtid = &aggr_conn->rx_tid[i];
                 stats = &aggr_conn->stat[i];
 
-                if (!rxtid->aggr || !rxtid->timer_mon || rxtid->progress)
+                if (!rxtid->aggr || !rxtid->timer_mon)
                         continue;
 
                 stats->num_timeouts++;
@@ -1626,14 +1627,15 @@ static void aggr_timeout(unsigned long arg)
                 rxtid = &aggr_conn->rx_tid[i];
 
                 if (rxtid->aggr && rxtid->hold_q) {
+                        spin_lock_bh(&rxtid->lock);
                         for (j = 0; j < rxtid->hold_q_sz; j++) {
                                 if (rxtid->hold_q[j].skb) {
                                         aggr_conn->timer_scheduled = true;
                                         rxtid->timer_mon = true;
-                                        rxtid->progress = false;
                                         break;
                                 }
                         }
+                        spin_unlock_bh(&rxtid->lock);
 
                         if (j >= rxtid->hold_q_sz)
                                 rxtid->timer_mon = false;
@@ -1660,7 +1662,6 @@ static void aggr_delete_tid_state(struct aggr_info_conn *aggr_conn, u8 tid)
                 aggr_deque_frms(aggr_conn, tid, 0, 0);
 
         rxtid->aggr = false;
-        rxtid->progress = false;
         rxtid->timer_mon = false;
         rxtid->win_sz = 0;
         rxtid->seq_next = 0;
@@ -1739,7 +1740,6 @@ void aggr_conn_init(struct ath6kl_vif *vif, struct aggr_info *aggr_info,
         for (i = 0; i < NUM_OF_TIDS; i++) {
                 rxtid = &aggr_conn->rx_tid[i];
                 rxtid->aggr = false;
-                rxtid->progress = false;
                 rxtid->timer_mon = false;
                 skb_queue_head_init(&rxtid->q);
                 spin_lock_init(&rxtid->lock);
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index ee8ec2394c2c..a6caa673e8ad 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -743,7 +743,6 @@ int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid)
                 return -ENOMEM;
 
         cmd = (struct roam_ctrl_cmd *) skb->data;
-        memset(cmd, 0, sizeof(*cmd));
 
         memcpy(cmd->info.bssid, bssid, ETH_ALEN);
         cmd->roam_ctrl = WMI_FORCE_ROAM;
@@ -753,6 +752,22 @@ int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid)
                                    NO_SYNC_WMIFLAG);
 }
 
+int ath6kl_wmi_ap_set_dtim_cmd(struct wmi *wmi, u8 if_idx, u32 dtim_period)
+{
+        struct sk_buff *skb;
+        struct set_dtim_cmd *cmd;
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct set_dtim_cmd *) skb->data;
+
+        cmd->dtim_period = cpu_to_le32(dtim_period);
+        return ath6kl_wmi_cmd_send(wmi, if_idx, skb,
+                                   WMI_AP_SET_DTIM_CMDID, NO_SYNC_WMIFLAG);
+}
+
 int ath6kl_wmi_set_roam_mode_cmd(struct wmi *wmi, enum wmi_roam_mode mode)
 {
         struct sk_buff *skb;
@@ -763,7 +778,6 @@ int ath6kl_wmi_set_roam_mode_cmd(struct wmi *wmi, enum wmi_roam_mode mode)
                 return -ENOMEM;
 
         cmd = (struct roam_ctrl_cmd *) skb->data;
-        memset(cmd, 0, sizeof(*cmd));
 
         cmd->info.roam_mode = mode;
         cmd->roam_ctrl = WMI_SET_ROAM_MODE;
@@ -1995,7 +2009,7 @@ int ath6kl_wmi_probedssid_cmd(struct wmi *wmi, u8 if_idx, u8 index, u8 flag,
         struct wmi_probed_ssid_cmd *cmd;
         int ret;
 
-        if (index > MAX_PROBED_SSID_INDEX)
+        if (index >= MAX_PROBED_SSIDS)
                 return -EINVAL;
 
         if (ssid_len > sizeof(cmd->ssid))
@@ -2599,6 +2613,115 @@ static void ath6kl_wmi_relinquish_implicit_pstream_credits(struct wmi *wmi)
         spin_unlock_bh(&wmi->lock);
 }
 
+static int ath6kl_set_bitrate_mask64(struct wmi *wmi, u8 if_idx,
+                                     const struct cfg80211_bitrate_mask *mask)
+{
+        struct sk_buff *skb;
+        int ret, mode, band;
+        u64 mcsrate, ratemask[IEEE80211_NUM_BANDS];
+        struct wmi_set_tx_select_rates64_cmd *cmd;
+
+        memset(&ratemask, 0, sizeof(ratemask));
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                /* copy legacy rate mask */
+                ratemask[band] = mask->control[band].legacy;
+                if (band == IEEE80211_BAND_5GHZ)
+                        ratemask[band] =
+                                mask->control[band].legacy << 4;
+
+                /* copy mcs rate mask */
+                mcsrate = mask->control[band].mcs[1];
+                mcsrate <<= 8;
+                mcsrate |= mask->control[band].mcs[0];
+                ratemask[band] |= mcsrate << 12;
+                ratemask[band] |= mcsrate << 28;
+        }
+
+        ath6kl_dbg(ATH6KL_DBG_WMI,
+                   "Ratemask 64 bit: 2.4:%llx 5:%llx\n",
+                   ratemask[0], ratemask[1]);
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd) * WMI_RATES_MODE_MAX);
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct wmi_set_tx_select_rates64_cmd *) skb->data;
+        for (mode = 0; mode < WMI_RATES_MODE_MAX; mode++) {
+                /* A mode operate in 5GHZ band */
+                if (mode == WMI_RATES_MODE_11A ||
+                    mode == WMI_RATES_MODE_11A_HT20 ||
+                    mode == WMI_RATES_MODE_11A_HT40)
+                        band = IEEE80211_BAND_5GHZ;
+                else
+                        band = IEEE80211_BAND_2GHZ;
+                cmd->ratemask[mode] = cpu_to_le64(ratemask[band]);
+        }
+
+        ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb,
+                                  WMI_SET_TX_SELECT_RATES_CMDID,
+                                  NO_SYNC_WMIFLAG);
+        return ret;
+}
+
+static int ath6kl_set_bitrate_mask32(struct wmi *wmi, u8 if_idx,
+                                     const struct cfg80211_bitrate_mask *mask)
+{
+        struct sk_buff *skb;
+        int ret, mode, band;
+        u32 mcsrate, ratemask[IEEE80211_NUM_BANDS];
+        struct wmi_set_tx_select_rates32_cmd *cmd;
+
+        memset(&ratemask, 0, sizeof(ratemask));
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                /* copy legacy rate mask */
+                ratemask[band] = mask->control[band].legacy;
+                if (band == IEEE80211_BAND_5GHZ)
+                        ratemask[band] =
+                                mask->control[band].legacy << 4;
+
+                /* copy mcs rate mask */
+                mcsrate = mask->control[band].mcs[0];
+                ratemask[band] |= mcsrate << 12;
+                ratemask[band] |= mcsrate << 20;
+        }
+
+        ath6kl_dbg(ATH6KL_DBG_WMI,
+                   "Ratemask 32 bit: 2.4:%x 5:%x\n",
+                   ratemask[0], ratemask[1]);
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd) * WMI_RATES_MODE_MAX);
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct wmi_set_tx_select_rates32_cmd *) skb->data;
+        for (mode = 0; mode < WMI_RATES_MODE_MAX; mode++) {
+                /* A mode operate in 5GHZ band */
+                if (mode == WMI_RATES_MODE_11A ||
+                    mode == WMI_RATES_MODE_11A_HT20 ||
+                    mode == WMI_RATES_MODE_11A_HT40)
+                        band = IEEE80211_BAND_5GHZ;
+                else
+                        band = IEEE80211_BAND_2GHZ;
+                cmd->ratemask[mode] = cpu_to_le32(ratemask[band]);
+        }
+
+        ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb,
+                                  WMI_SET_TX_SELECT_RATES_CMDID,
+                                  NO_SYNC_WMIFLAG);
+        return ret;
+}
+
+int ath6kl_wmi_set_bitrate_mask(struct wmi *wmi, u8 if_idx,
+                                const struct cfg80211_bitrate_mask *mask)
+{
+        struct ath6kl *ar = wmi->parent_dev;
+
+        if (ar->hw.flags & ATH6KL_HW_FLAG_64BIT_RATES)
+                return ath6kl_set_bitrate_mask64(wmi, if_idx, mask);
+        else
+                return ath6kl_set_bitrate_mask32(wmi, if_idx, mask);
+}
+
 int ath6kl_wmi_set_host_sleep_mode_cmd(struct wmi *wmi, u8 if_idx,
                                        enum ath6kl_host_mode host_mode)
 {
@@ -2997,6 +3120,25 @@ int ath6kl_wmi_add_del_mcast_filter_cmd(struct wmi *wmi, u8 if_idx,
         return ret;
 }
 
+int ath6kl_wmi_sta_bmiss_enhance_cmd(struct wmi *wmi, u8 if_idx, bool enhance)
+{
+        struct sk_buff *skb;
+        struct wmi_sta_bmiss_enhance_cmd *cmd;
+        int ret;
+
+        skb = ath6kl_wmi_get_new_buf(sizeof(*cmd));
+        if (!skb)
+                return -ENOMEM;
+
+        cmd = (struct wmi_sta_bmiss_enhance_cmd *) skb->data;
+        cmd->enable = enhance ? 1 : 0;
+
+        ret = ath6kl_wmi_cmd_send(wmi, if_idx, skb,
+                                  WMI_STA_BMISS_ENHANCE_CMDID,
+                                  NO_SYNC_WMIFLAG);
+        return ret;
+}
+
 s32 ath6kl_wmi_get_rate(s8 rate_index)
 {
         if (rate_index == RATE_AUTO)
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index 9076bec3a2ba..43339aca585d 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -624,6 +624,10 @@ enum wmi_cmd_id {
         WMI_SEND_MGMT_CMDID,
         WMI_BEGIN_SCAN_CMDID,
 
+        WMI_SET_BLACK_LIST,
+        WMI_SET_MCASTRATE,
+
+        WMI_STA_BMISS_ENHANCE_CMDID,
 };
 
 enum wmi_mgmt_frame_type {
@@ -960,6 +964,9 @@ enum wmi_bss_filter {
         /* beacons matching probed ssid */
         PROBED_SSID_FILTER,
 
+        /* beacons matching matched ssid */
+        MATCHED_SSID_FILTER,
+
         /* marker only */
         LAST_BSS_FILTER,
 };
@@ -978,7 +985,7 @@ struct wmi_bss_filter_cmd {
 } __packed;
 
 /* WMI_SET_PROBED_SSID_CMDID */
-#define MAX_PROBED_SSID_INDEX   9
+#define MAX_PROBED_SSIDS   16
 
 enum wmi_ssid_flag {
         /* disables entry */
@@ -989,10 +996,13 @@ enum wmi_ssid_flag {
 
         /* probes for any ssid */
         ANY_SSID_FLAG = 0x02,
+
+        /* match for ssid */
+        MATCH_SSID_FLAG = 0x08,
 };
 
 struct wmi_probed_ssid_cmd {
-        /* 0 to MAX_PROBED_SSID_INDEX */
+        /* 0 to MAX_PROBED_SSIDS - 1 */
         u8 entry_index;
 
         /* see, enum wmi_ssid_flg */
@@ -1017,6 +1027,11 @@ struct wmi_bmiss_time_cmd {
         __le16 num_beacons;
 };
 
+/* WMI_STA_ENHANCE_BMISS_CMDID */
+struct wmi_sta_bmiss_enhance_cmd {
+        u8 enable;
+} __packed;
+
 /* WMI_SET_POWER_MODE_CMDID */
 enum wmi_power_mode {
         REC_POWER = 0x01,
@@ -1048,6 +1063,36 @@ struct wmi_power_params_cmd {
         __le16 ps_fail_event_policy;
 } __packed;
 
+/*
+ * Ratemask for below modes should be passed
+ * to WMI_SET_TX_SELECT_RATES_CMDID.
+ * AR6003 has 32 bit mask for each modes.
+ * First 12 bits for legacy rates, 13 to 20
+ * bits for HT 20 rates and 21 to 28 bits for
+ * HT 40 rates
+ */
+enum wmi_mode_phy {
+        WMI_RATES_MODE_11A = 0,
+        WMI_RATES_MODE_11G,
+        WMI_RATES_MODE_11B,
+        WMI_RATES_MODE_11GONLY,
+        WMI_RATES_MODE_11A_HT20,
+        WMI_RATES_MODE_11G_HT20,
+        WMI_RATES_MODE_11A_HT40,
+        WMI_RATES_MODE_11G_HT40,
+        WMI_RATES_MODE_MAX
+};
+
+/* WMI_SET_TX_SELECT_RATES_CMDID */
+struct wmi_set_tx_select_rates32_cmd {
+        __le32 ratemask[WMI_RATES_MODE_MAX];
+} __packed;
+
+/* WMI_SET_TX_SELECT_RATES_CMDID */
+struct wmi_set_tx_select_rates64_cmd {
+        __le64 ratemask[WMI_RATES_MODE_MAX];
+} __packed;
+
 /* WMI_SET_DISC_TIMEOUT_CMDID */
 struct wmi_disc_timeout_cmd {
         /* seconds */
@@ -1572,6 +1617,10 @@ struct roam_ctrl_cmd {
         u8 roam_ctrl;
 } __packed;
 
+struct set_dtim_cmd {
+        __le32 dtim_period;
+} __packed;
+
 /* BSS INFO HDR version 2.0 */
 struct wmi_bss_info_hdr2 {
         __le16 ch; /* frequency in MHz */
@@ -2532,6 +2581,8 @@ int ath6kl_wmi_set_ip_cmd(struct wmi *wmi, u8 if_idx,
                           __be32 ips0, __be32 ips1);
 int ath6kl_wmi_set_host_sleep_mode_cmd(struct wmi *wmi, u8 if_idx,
                                        enum ath6kl_host_mode host_mode);
+int ath6kl_wmi_set_bitrate_mask(struct wmi *wmi, u8 if_idx,
+                                const struct cfg80211_bitrate_mask *mask);
 int ath6kl_wmi_set_wow_mode_cmd(struct wmi *wmi, u8 if_idx,
                                 enum ath6kl_wow_mode wow_mode,
                                 u32 filter, u16 host_req_delay);
@@ -2542,11 +2593,14 @@ int ath6kl_wmi_add_wow_pattern_cmd(struct wmi *wmi, u8 if_idx,
 int ath6kl_wmi_del_wow_pattern_cmd(struct wmi *wmi, u8 if_idx,
                                    u16 list_id, u16 filter_id);
 int ath6kl_wmi_set_roam_lrssi_cmd(struct wmi *wmi, u8 lrssi);
+int ath6kl_wmi_ap_set_dtim_cmd(struct wmi *wmi, u8 if_idx, u32 dtim_period);
 int ath6kl_wmi_force_roam_cmd(struct wmi *wmi, const u8 *bssid);
 int ath6kl_wmi_set_roam_mode_cmd(struct wmi *wmi, enum wmi_roam_mode mode);
 int ath6kl_wmi_mcast_filter_cmd(struct wmi *wmi, u8 if_idx, bool mc_all_on);
 int ath6kl_wmi_add_del_mcast_filter_cmd(struct wmi *wmi, u8 if_idx,
                                         u8 *filter, bool add_filter);
+int ath6kl_wmi_sta_bmiss_enhance_cmd(struct wmi *wmi, u8 if_idx, bool enable);
+
 /* AP mode uAPSD */
 int ath6kl_wmi_ap_set_apsd(struct wmi *wmi, u8 if_idx, u8 enable);
 
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index b4c77f9d7470..ff007f500feb 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -104,11 +104,6 @@ static const struct ani_cck_level_entry cck_level_table[] = {
 #define ATH9K_ANI_CCK_DEF_LEVEL \
         2 /* default level - matches the INI settings */
 
-static bool use_new_ani(struct ath_hw *ah)
-{
-        return AR_SREV_9300_20_OR_LATER(ah) || modparam_force_new_ani;
-}
-
 static void ath9k_hw_update_mibstats(struct ath_hw *ah,
                                      struct ath9k_mib_stats *stats)
 {
@@ -122,8 +117,6 @@ static void ath9k_hw_update_mibstats(struct ath_hw *ah,
 static void ath9k_ani_restart(struct ath_hw *ah)
 {
         struct ar5416AniState *aniState;
-        struct ath_common *common = ath9k_hw_common(ah);
-        u32 ofdm_base = 0, cck_base = 0;
 
         if (!DO_ANI(ah))
                 return;
@@ -131,18 +124,10 @@ static void ath9k_ani_restart(struct ath_hw *ah)
         aniState = &ah->curchan->ani;
         aniState->listenTime = 0;
 
-        if (!use_new_ani(ah)) {
-                ofdm_base = AR_PHY_COUNTMAX - ah->config.ofdm_trig_high;
-                cck_base = AR_PHY_COUNTMAX - ah->config.cck_trig_high;
-        }
-
-        ath_dbg(common, ANI, "Writing ofdmbase=%u   cckbase=%u\n",
-                ofdm_base, cck_base);
-
         ENABLE_REGWRITE_BUFFER(ah);
 
-        REG_WRITE(ah, AR_PHY_ERR_1, ofdm_base);
-        REG_WRITE(ah, AR_PHY_ERR_2, cck_base);
+        REG_WRITE(ah, AR_PHY_ERR_1, 0);
+        REG_WRITE(ah, AR_PHY_ERR_2, 0);
         REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);
         REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
 
@@ -154,129 +139,23 @@ static void ath9k_ani_restart(struct ath_hw *ah)
         aniState->cckPhyErrCount = 0;
 }
 
-static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah)
-{
-        struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
-        struct ar5416AniState *aniState;
-        int32_t rssi;
-
-        aniState = &ah->curchan->ani;
-
-        if (aniState->noiseImmunityLevel < HAL_NOISE_IMMUNE_MAX) {
-                if (ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
-                                         aniState->noiseImmunityLevel + 1)) {
-                        return;
-                }
-        }
-
-        if (aniState->spurImmunityLevel < HAL_SPUR_IMMUNE_MAX) {
-                if (ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
-                                         aniState->spurImmunityLevel + 1)) {
-                        return;
-                }
-        }
-
-        if (ah->opmode == NL80211_IFTYPE_AP) {
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-                }
-                return;
-        }
-        rssi = BEACON_RSSI(ah);
-        if (rssi > aniState->rssiThrHigh) {
-                if (!aniState->ofdmWeakSigDetectOff) {
-                        if (ath9k_hw_ani_control(ah,
-                                         ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                         false)) {
-                                ath9k_hw_ani_control(ah,
-                                        ATH9K_ANI_SPUR_IMMUNITY_LEVEL, 0);
-                                return;
-                        }
-                }
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-                        return;
-                }
-        } else if (rssi > aniState->rssiThrLow) {
-                if (aniState->ofdmWeakSigDetectOff)
-                        ath9k_hw_ani_control(ah,
-                                     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                     true);
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX)
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-                return;
-        } else {
-                if ((conf->channel->band == IEEE80211_BAND_2GHZ) &&
-                    !conf_is_ht(conf)) {
-                        if (!aniState->ofdmWeakSigDetectOff)
-                                ath9k_hw_ani_control(ah,
-                                     ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                     false);
-                        if (aniState->firstepLevel > 0)
-                                ath9k_hw_ani_control(ah,
-                                             ATH9K_ANI_FIRSTEP_LEVEL, 0);
-                        return;
-                }
-        }
-}
-
-static void ath9k_hw_ani_cck_err_trigger_old(struct ath_hw *ah)
-{
-        struct ieee80211_conf *conf = &ath9k_hw_common(ah)->hw->conf;
-        struct ar5416AniState *aniState;
-        int32_t rssi;
-
-        aniState = &ah->curchan->ani;
-        if (aniState->noiseImmunityLevel < HAL_NOISE_IMMUNE_MAX) {
-                if (ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
-                                         aniState->noiseImmunityLevel + 1)) {
-                        return;
-                }
-        }
-        if (ah->opmode == NL80211_IFTYPE_AP) {
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-                }
-                return;
-        }
-        rssi = BEACON_RSSI(ah);
-        if (rssi > aniState->rssiThrLow) {
-                if (aniState->firstepLevel < HAL_FIRST_STEP_MAX)
-                        ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                             aniState->firstepLevel + 1);
-        } else {
-                if ((conf->channel->band == IEEE80211_BAND_2GHZ) &&
-                    !conf_is_ht(conf)) {
-                        if (aniState->firstepLevel > 0)
-                                ath9k_hw_ani_control(ah,
-                                             ATH9K_ANI_FIRSTEP_LEVEL, 0);
-                }
-        }
-}
-
 /* Adjust the OFDM Noise Immunity Level */
-static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel)
+static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel,
+                                  bool scan)
 {
         struct ar5416AniState *aniState = &ah->curchan->ani;
         struct ath_common *common = ath9k_hw_common(ah);
         const struct ani_ofdm_level_entry *entry_ofdm;
         const struct ani_cck_level_entry *entry_cck;
-
-        aniState->noiseFloor = BEACON_RSSI(ah);
+        bool weak_sig;
 
         ath_dbg(common, ANI, "**** ofdmlevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
                 aniState->ofdmNoiseImmunityLevel,
-                immunityLevel, aniState->noiseFloor,
+                immunityLevel, BEACON_RSSI(ah),
                 aniState->rssiThrLow, aniState->rssiThrHigh);
 
-        if (aniState->update_ani)
-                aniState->ofdmNoiseImmunityLevel =
-                        (immunityLevel > ATH9K_ANI_OFDM_DEF_LEVEL) ?
-                        immunityLevel : ATH9K_ANI_OFDM_DEF_LEVEL;
+        if (!scan)
+                aniState->ofdmNoiseImmunityLevel = immunityLevel;
 
         entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
         entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
@@ -292,12 +171,22 @@ static void ath9k_hw_set_ofdm_nil(struct ath_hw *ah, u8 immunityLevel)
                                      ATH9K_ANI_FIRSTEP_LEVEL,
                                      entry_ofdm->fir_step_level);
 
-        if ((aniState->noiseFloor >= aniState->rssiThrHigh) &&
-            (!aniState->ofdmWeakSigDetectOff !=
-             entry_ofdm->ofdm_weak_signal_on)) {
+        weak_sig = entry_ofdm->ofdm_weak_signal_on;
+        if (ah->opmode == NL80211_IFTYPE_STATION &&
+            BEACON_RSSI(ah) <= aniState->rssiThrHigh)
+                weak_sig = true;
+
+        if (aniState->ofdmWeakSigDetect != weak_sig)
                         ath9k_hw_ani_control(ah,
                                 ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
                                 entry_ofdm->ofdm_weak_signal_on);
+
+        if (aniState->ofdmNoiseImmunityLevel >= ATH9K_ANI_OFDM_DEF_LEVEL) {
+                ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
+                ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI;
+        } else {
+                ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI;
+                ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW;
         }
 }
 
@@ -308,43 +197,35 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
         if (!DO_ANI(ah))
                 return;
 
-        if (!use_new_ani(ah)) {
-                ath9k_hw_ani_ofdm_err_trigger_old(ah);
-                return;
-        }
-
         aniState = &ah->curchan->ani;
 
         if (aniState->ofdmNoiseImmunityLevel < ATH9K_ANI_OFDM_MAX_LEVEL)
-                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1);
+                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1, false);
 }
 
 /*
  * Set the ANI settings to match an CCK level.
  */
-static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel)
+static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel,
+                                 bool scan)
 {
         struct ar5416AniState *aniState = &ah->curchan->ani;
         struct ath_common *common = ath9k_hw_common(ah);
         const struct ani_ofdm_level_entry *entry_ofdm;
         const struct ani_cck_level_entry *entry_cck;
 
-        aniState->noiseFloor = BEACON_RSSI(ah);
         ath_dbg(common, ANI, "**** ccklevel %d=>%d, rssi=%d[lo=%d hi=%d]\n",
                 aniState->cckNoiseImmunityLevel, immunityLevel,
-                aniState->noiseFloor, aniState->rssiThrLow,
+                BEACON_RSSI(ah), aniState->rssiThrLow,
                 aniState->rssiThrHigh);
 
-        if ((ah->opmode == NL80211_IFTYPE_STATION ||
-             ah->opmode == NL80211_IFTYPE_ADHOC) &&
-            aniState->noiseFloor <= aniState->rssiThrLow &&
+        if (ah->opmode == NL80211_IFTYPE_STATION &&
+            BEACON_RSSI(ah) <= aniState->rssiThrLow &&
             immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
                 immunityLevel = ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI;
 
-        if (aniState->update_ani)
-                aniState->cckNoiseImmunityLevel =
-                        (immunityLevel > ATH9K_ANI_CCK_DEF_LEVEL) ?
-                        immunityLevel : ATH9K_ANI_CCK_DEF_LEVEL;
+        if (!scan)
+                aniState->cckNoiseImmunityLevel = immunityLevel;
 
         entry_ofdm = &ofdm_level_table[aniState->ofdmNoiseImmunityLevel];
         entry_cck = &cck_level_table[aniState->cckNoiseImmunityLevel];
@@ -359,7 +240,7 @@ static void ath9k_hw_set_cck_nil(struct ath_hw *ah, u_int8_t immunityLevel)
         if (!AR_SREV_9300_20_OR_LATER(ah) || AR_SREV_9485(ah))
                 return;
 
-        if (aniState->mrcCCKOff == entry_cck->mrc_cck_on)
+        if (aniState->mrcCCK != entry_cck->mrc_cck_on)
                 ath9k_hw_ani_control(ah,
                                      ATH9K_ANI_MRC_CCK,
                                      entry_cck->mrc_cck_on);
@@ -372,68 +253,11 @@ static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
         if (!DO_ANI(ah))
                 return;
 
-        if (!use_new_ani(ah)) {
-                ath9k_hw_ani_cck_err_trigger_old(ah);
-                return;
-        }
-
         aniState = &ah->curchan->ani;
 
         if (aniState->cckNoiseImmunityLevel < ATH9K_ANI_CCK_MAX_LEVEL)
-                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1);
-}
-
-static void ath9k_hw_ani_lower_immunity_old(struct ath_hw *ah)
-{
-        struct ar5416AniState *aniState;
-        int32_t rssi;
-
-        aniState = &ah->curchan->ani;
-
-        if (ah->opmode == NL80211_IFTYPE_AP) {
-                if (aniState->firstepLevel > 0) {
-                        if (ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                                 aniState->firstepLevel - 1))
-                                return;
-                }
-        } else {
-                rssi = BEACON_RSSI(ah);
-                if (rssi > aniState->rssiThrHigh) {
-                        /* XXX: Handle me */
-                } else if (rssi > aniState->rssiThrLow) {
-                        if (aniState->ofdmWeakSigDetectOff) {
-                                if (ath9k_hw_ani_control(ah,
-                                         ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                         true))
-                                        return;
-                        }
-                        if (aniState->firstepLevel > 0) {
-                                if (ath9k_hw_ani_control(ah,
-                                         ATH9K_ANI_FIRSTEP_LEVEL,
-                                         aniState->firstepLevel - 1))
-                                        return;
-                        }
-                } else {
-                        if (aniState->firstepLevel > 0) {
-                                if (ath9k_hw_ani_control(ah,
-                                         ATH9K_ANI_FIRSTEP_LEVEL,
-                                         aniState->firstepLevel - 1))
-                                        return;
-                        }
-                }
-        }
-
-        if (aniState->spurImmunityLevel > 0) {
-                if (ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
-                                         aniState->spurImmunityLevel - 1))
-                        return;
-        }
-
-        if (aniState->noiseImmunityLevel > 0) {
-                ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
-                                     aniState->noiseImmunityLevel - 1);
-                return;
-        }
+                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1,
+                                     false);
 }
 
 /*
@@ -446,87 +270,18 @@ static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
 
         aniState = &ah->curchan->ani;
 
-        if (!use_new_ani(ah)) {
-                ath9k_hw_ani_lower_immunity_old(ah);
-                return;
-        }
-
         /* lower OFDM noise immunity */
         if (aniState->ofdmNoiseImmunityLevel > 0 &&
             (aniState->ofdmsTurn || aniState->cckNoiseImmunityLevel == 0)) {
-                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel - 1);
+                ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel - 1,
+                                      false);
                 return;
         }
 
         /* lower CCK noise immunity */
         if (aniState->cckNoiseImmunityLevel > 0)
-                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel - 1);
-}
-
-static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning)
-{
-        struct ar5416AniState *aniState;
-        struct ath9k_channel *chan = ah->curchan;
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        if (!DO_ANI(ah))
-                return;
-
-        aniState = &ah->curchan->ani;
-
-        if (ah->opmode != NL80211_IFTYPE_STATION
-            && ah->opmode != NL80211_IFTYPE_ADHOC) {
-                ath_dbg(common, ANI, "Reset ANI state opmode %u\n", ah->opmode);
-                ah->stats.ast_ani_reset++;
-
-                if (ah->opmode == NL80211_IFTYPE_AP) {
-                        /*
-                         * ath9k_hw_ani_control() will only process items set on
-                         * ah->ani_function
-                         */
-                        if (IS_CHAN_2GHZ(chan))
-                                ah->ani_function = (ATH9K_ANI_SPUR_IMMUNITY_LEVEL |
-                                                    ATH9K_ANI_FIRSTEP_LEVEL);
-                        else
-                                ah->ani_function = 0;
-                }
-
-                ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL, 0);
-                ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL, 0);
-                ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL, 0);
-                ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                     !ATH9K_ANI_USE_OFDM_WEAK_SIG);
-                ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,
-                                     ATH9K_ANI_CCK_WEAK_SIG_THR);
-
-                ath9k_ani_restart(ah);
-                return;
-        }
-
-        if (aniState->noiseImmunityLevel != 0)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
-                                     aniState->noiseImmunityLevel);
-        if (aniState->spurImmunityLevel != 0)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL,
-                                     aniState->spurImmunityLevel);
-        if (aniState->ofdmWeakSigDetectOff)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
-                                     !aniState->ofdmWeakSigDetectOff);
-        if (aniState->cckWeakSigThreshold)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR,
-                                     aniState->cckWeakSigThreshold);
-        if (aniState->firstepLevel != 0)
-                ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
-                                     aniState->firstepLevel);
-
-        ath9k_ani_restart(ah);
-
-        ENABLE_REGWRITE_BUFFER(ah);
-
-        REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);
-        REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
-
-        REGWRITE_BUFFER_FLUSH(ah);
+                ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel - 1,
+                                     false);
 }
 
 /*
@@ -539,13 +294,11 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
         struct ar5416AniState *aniState = &ah->curchan->ani;
         struct ath9k_channel *chan = ah->curchan;
         struct ath_common *common = ath9k_hw_common(ah);
+        int ofdm_nil, cck_nil;
 
         if (!DO_ANI(ah))
                 return;
 
-        if (!use_new_ani(ah))
-                return ath9k_ani_reset_old(ah, is_scanning);
-
         BUG_ON(aniState == NULL);
         ah->stats.ast_ani_reset++;
 
@@ -563,6 +316,11 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
         /* always allow mode (on/off) to be controlled */
         ah->ani_function |= ATH9K_ANI_MODE;
 
+        ofdm_nil = max_t(int, ATH9K_ANI_OFDM_DEF_LEVEL,
+                         aniState->ofdmNoiseImmunityLevel);
+        cck_nil = max_t(int, ATH9K_ANI_CCK_DEF_LEVEL,
+                         aniState->cckNoiseImmunityLevel);
+
         if (is_scanning ||
             (ah->opmode != NL80211_IFTYPE_STATION &&
              ah->opmode != NL80211_IFTYPE_ADHOC)) {
@@ -585,9 +343,8 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
                                 aniState->ofdmNoiseImmunityLevel,
                                 aniState->cckNoiseImmunityLevel);
 
-                        aniState->update_ani = false;
-                        ath9k_hw_set_ofdm_nil(ah, ATH9K_ANI_OFDM_DEF_LEVEL);
-                        ath9k_hw_set_cck_nil(ah, ATH9K_ANI_CCK_DEF_LEVEL);
+                        ofdm_nil = ATH9K_ANI_OFDM_DEF_LEVEL;
+                        cck_nil = ATH9K_ANI_CCK_DEF_LEVEL;
                 }
         } else {
                 /*
@@ -601,13 +358,9 @@ void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning)
                         is_scanning,
                         aniState->ofdmNoiseImmunityLevel,
                         aniState->cckNoiseImmunityLevel);
-
-                        aniState->update_ani = true;
-                        ath9k_hw_set_ofdm_nil(ah,
-                                              aniState->ofdmNoiseImmunityLevel);
-                        ath9k_hw_set_cck_nil(ah,
-                                             aniState->cckNoiseImmunityLevel);
         }
+        ath9k_hw_set_ofdm_nil(ah, ofdm_nil, is_scanning);
+        ath9k_hw_set_cck_nil(ah, cck_nil, is_scanning);
 
         /*
          * enable phy counters if hw supports or if not, enable phy
@@ -627,9 +380,6 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
         struct ar5416AniState *aniState = &ah->curchan->ani;
-        u32 ofdm_base = 0;
-        u32 cck_base = 0;
-        u32 ofdmPhyErrCnt, cckPhyErrCnt;
         u32 phyCnt1, phyCnt2;
         int32_t listenTime;
 
@@ -642,11 +392,6 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah)
                 return false;
         }
 
-        if (!use_new_ani(ah)) {
-                ofdm_base = AR_PHY_COUNTMAX - ah->config.ofdm_trig_high;
-                cck_base = AR_PHY_COUNTMAX - ah->config.cck_trig_high;
-        }
-
         aniState->listenTime += listenTime;
 
         ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
@@ -654,35 +399,12 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah)
         phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
         phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
 
-        if (!use_new_ani(ah) && (phyCnt1 < ofdm_base || phyCnt2 < cck_base)) {
-                if (phyCnt1 < ofdm_base) {
-                        ath_dbg(common, ANI,
-                                "phyCnt1 0x%x, resetting counter value to 0x%x\n",
-                                phyCnt1, ofdm_base);
-                        REG_WRITE(ah, AR_PHY_ERR_1, ofdm_base);
-                        REG_WRITE(ah, AR_PHY_ERR_MASK_1,
-                                  AR_PHY_ERR_OFDM_TIMING);
-                }
-                if (phyCnt2 < cck_base) {
-                        ath_dbg(common, ANI,
-                                "phyCnt2 0x%x, resetting counter value to 0x%x\n",
-                                phyCnt2, cck_base);
-                        REG_WRITE(ah, AR_PHY_ERR_2, cck_base);
-                        REG_WRITE(ah, AR_PHY_ERR_MASK_2,
-                                  AR_PHY_ERR_CCK_TIMING);
-                }
-                return false;
-        }
+        ah->stats.ast_ani_ofdmerrs += phyCnt1 - aniState->ofdmPhyErrCount;
+        aniState->ofdmPhyErrCount = phyCnt1;
 
-        ofdmPhyErrCnt = phyCnt1 - ofdm_base;
-        ah->stats.ast_ani_ofdmerrs +=
-                ofdmPhyErrCnt - aniState->ofdmPhyErrCount;
-        aniState->ofdmPhyErrCount = ofdmPhyErrCnt;
+        ah->stats.ast_ani_cckerrs += phyCnt2 - aniState->cckPhyErrCount;
+        aniState->cckPhyErrCount = phyCnt2;
 
-        cckPhyErrCnt = phyCnt2 - cck_base;
-        ah->stats.ast_ani_cckerrs +=
-                cckPhyErrCnt - aniState->cckPhyErrCount;
-        aniState->cckPhyErrCount = cckPhyErrCnt;
         return true;
 }
 
@@ -716,21 +438,10 @@ void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan)
 
         if (aniState->listenTime > ah->aniperiod) {
                 if (cckPhyErrRate < ah->config.cck_trig_low &&
-                    ((ofdmPhyErrRate < ah->config.ofdm_trig_low &&
-                      aniState->ofdmNoiseImmunityLevel <
-                      ATH9K_ANI_OFDM_DEF_LEVEL) ||
-                     (ofdmPhyErrRate < ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI &&
-                      aniState->ofdmNoiseImmunityLevel >=
-                      ATH9K_ANI_OFDM_DEF_LEVEL))) {
+                    ofdmPhyErrRate < ah->config.ofdm_trig_low) {
                         ath9k_hw_ani_lower_immunity(ah);
                         aniState->ofdmsTurn = !aniState->ofdmsTurn;
-                } else if ((ofdmPhyErrRate > ah->config.ofdm_trig_high &&
-                            aniState->ofdmNoiseImmunityLevel >=
-                            ATH9K_ANI_OFDM_DEF_LEVEL) ||
-                           (ofdmPhyErrRate >
-                            ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI &&
-                            aniState->ofdmNoiseImmunityLevel <
-                            ATH9K_ANI_OFDM_DEF_LEVEL)) {
+                } else if (ofdmPhyErrRate > ah->config.ofdm_trig_high) {
                         ath9k_hw_ani_ofdm_err_trigger(ah);
                         aniState->ofdmsTurn = false;
                 } else if (cckPhyErrRate > ah->config.cck_trig_high) {
@@ -778,49 +489,6 @@ void ath9k_hw_disable_mib_counters(struct ath_hw *ah)
 }
 EXPORT_SYMBOL(ath9k_hw_disable_mib_counters);
 
-/*
- * Process a MIB interrupt.  We may potentially be invoked because
- * any of the MIB counters overflow/trigger so don't assume we're
- * here because a PHY error counter triggered.
- */
-void ath9k_hw_proc_mib_event(struct ath_hw *ah)
-{
-        u32 phyCnt1, phyCnt2;
-
-        /* Reset these counters regardless */
-        REG_WRITE(ah, AR_FILT_OFDM, 0);
-        REG_WRITE(ah, AR_FILT_CCK, 0);
-        if (!(REG_READ(ah, AR_SLP_MIB_CTRL) & AR_SLP_MIB_PENDING))
-                REG_WRITE(ah, AR_SLP_MIB_CTRL, AR_SLP_MIB_CLEAR);
-
-        /* Clear the mib counters and save them in the stats */
-        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
-
-        if (!DO_ANI(ah)) {
-                /*
-                 * We must always clear the interrupt cause by
-                 * resetting the phy error regs.
-                 */
-                REG_WRITE(ah, AR_PHY_ERR_1, 0);
-                REG_WRITE(ah, AR_PHY_ERR_2, 0);
-                return;
-        }
-
-        /* NB: these are not reset-on-read */
-        phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
-        phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
-        if (((phyCnt1 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK) ||
-            ((phyCnt2 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK)) {
-
-                if (!use_new_ani(ah))
-                        ath9k_hw_ani_read_counters(ah);
-
-                /* NB: always restart to insure the h/w counters are reset */
-                ath9k_ani_restart(ah);
-        }
-}
-EXPORT_SYMBOL(ath9k_hw_proc_mib_event);
-
 void ath9k_hw_ani_setup(struct ath_hw *ah)
 {
         int i;
@@ -845,66 +513,37 @@ void ath9k_hw_ani_init(struct ath_hw *ah)
 
         ath_dbg(common, ANI, "Initialize ANI\n");
 
-        if (use_new_ani(ah)) {
-                ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_NEW;
-                ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW_NEW;
+        ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH;
+        ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW;
 
-                ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH_NEW;
-                ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW_NEW;
-        } else {
-                ah->config.ofdm_trig_high = ATH9K_ANI_OFDM_TRIG_HIGH_OLD;
-                ah->config.ofdm_trig_low = ATH9K_ANI_OFDM_TRIG_LOW_OLD;
-
-                ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH_OLD;
-                ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW_OLD;
-        }
+        ah->config.cck_trig_high = ATH9K_ANI_CCK_TRIG_HIGH;
+        ah->config.cck_trig_low = ATH9K_ANI_CCK_TRIG_LOW;
 
         for (i = 0; i < ARRAY_SIZE(ah->channels); i++) {
                 struct ath9k_channel *chan = &ah->channels[i];
                 struct ar5416AniState *ani = &chan->ani;
 
-                if (use_new_ani(ah)) {
-                        ani->spurImmunityLevel =
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
+                ani->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
 
-                        ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
+                ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
 
-                        if (AR_SREV_9300_20_OR_LATER(ah))
-                                ani->mrcCCKOff =
-                                        !ATH9K_ANI_ENABLE_MRC_CCK;
-                        else
-                                ani->mrcCCKOff = true;
-
-                        ani->ofdmsTurn = true;
-                } else {
-                        ani->spurImmunityLevel =
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_OLD;
-                        ani->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_OLD;
-
-                        ani->cckWeakSigThreshold =
-                                ATH9K_ANI_CCK_WEAK_SIG_THR;
-                }
+                ani->mrcCCK = AR_SREV_9300_20_OR_LATER(ah) ? true : false;
+
+                ani->ofdmsTurn = true;
 
                 ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
                 ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
-                ani->ofdmWeakSigDetectOff =
-                        !ATH9K_ANI_USE_OFDM_WEAK_SIG;
+                ani->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
                 ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
                 ani->ofdmNoiseImmunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;
-                ani->update_ani = false;
         }
 
         /*
          * since we expect some ongoing maintenance on the tables, let's sanity
          * check here default level should not modify INI setting.
          */
-        if (use_new_ani(ah)) {
-                ah->aniperiod = ATH9K_ANI_PERIOD_NEW;
-                ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL_NEW;
-        } else {
-                ah->aniperiod = ATH9K_ANI_PERIOD_OLD;
-                ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL_OLD;
-        }
+        ah->aniperiod = ATH9K_ANI_PERIOD;
+        ah->config.ani_poll_interval = ATH9K_ANI_POLLINTERVAL;
 
         if (ah->config.enable_ani)
                 ah->proc_phyerr |= HAL_PROCESS_ANI;
diff --git a/drivers/net/wireless/ath/ath9k/ani.h b/drivers/net/wireless/ath/ath9k/ani.h
index 72e2b874e179..1485bf5e3518 100644
--- a/drivers/net/wireless/ath/ath9k/ani.h
+++ b/drivers/net/wireless/ath/ath9k/ani.h
@@ -24,42 +24,34 @@
 #define BEACON_RSSI(ahp) (ahp->stats.avgbrssi)
 
 /* units are errors per second */
-#define ATH9K_ANI_OFDM_TRIG_HIGH_OLD      500
-#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW      3500
+#define ATH9K_ANI_OFDM_TRIG_HIGH          3500
 #define ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI 1000
 
 /* units are errors per second */
-#define ATH9K_ANI_OFDM_TRIG_LOW_OLD       200
-#define ATH9K_ANI_OFDM_TRIG_LOW_NEW       400
+#define ATH9K_ANI_OFDM_TRIG_LOW           400
 #define ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI 900
 
 /* units are errors per second */
-#define ATH9K_ANI_CCK_TRIG_HIGH_OLD       200
-#define ATH9K_ANI_CCK_TRIG_HIGH_NEW       600
+#define ATH9K_ANI_CCK_TRIG_HIGH           600
 
 /* units are errors per second */
-#define ATH9K_ANI_CCK_TRIG_LOW_OLD        100
-#define ATH9K_ANI_CCK_TRIG_LOW_NEW        300
+#define ATH9K_ANI_CCK_TRIG_LOW            300
 
 #define ATH9K_ANI_NOISE_IMMUNE_LVL        4
 #define ATH9K_ANI_USE_OFDM_WEAK_SIG       true
 #define ATH9K_ANI_CCK_WEAK_SIG_THR        false
 
-#define ATH9K_ANI_SPUR_IMMUNE_LVL_OLD     7
-#define ATH9K_ANI_SPUR_IMMUNE_LVL_NEW     3
+#define ATH9K_ANI_SPUR_IMMUNE_LVL         3
 
-#define ATH9K_ANI_FIRSTEP_LVL_OLD         0
-#define ATH9K_ANI_FIRSTEP_LVL_NEW         2
+#define ATH9K_ANI_FIRSTEP_LVL             2
 
 #define ATH9K_ANI_RSSI_THR_HIGH           40
 #define ATH9K_ANI_RSSI_THR_LOW            7
 
-#define ATH9K_ANI_PERIOD_OLD              100
-#define ATH9K_ANI_PERIOD_NEW              300
+#define ATH9K_ANI_PERIOD                  300
 
 /* in ms */
-#define ATH9K_ANI_POLLINTERVAL_OLD        100
-#define ATH9K_ANI_POLLINTERVAL_NEW        1000
+#define ATH9K_ANI_POLLINTERVAL            1000
 
 #define HAL_NOISE_IMMUNE_MAX              4
 #define HAL_SPUR_IMMUNE_MAX               7
@@ -70,8 +62,6 @@
 #define ATH9K_SIG_SPUR_IMM_SETTING_MIN    0
 #define ATH9K_SIG_SPUR_IMM_SETTING_MAX    22
 
-#define ATH9K_ANI_ENABLE_MRC_CCK          true
-
 /* values here are relative to the INI */
 
 enum ath9k_ani_cmd {
@@ -119,16 +109,14 @@ struct ar5416AniState {
         u8 ofdmNoiseImmunityLevel;
         u8 cckNoiseImmunityLevel;
         bool ofdmsTurn;
-        u8 mrcCCKOff;
+        u8 mrcCCK;
         u8 spurImmunityLevel;
         u8 firstepLevel;
-        u8 ofdmWeakSigDetectOff;
+        u8 ofdmWeakSigDetect;
         u8 cckWeakSigThreshold;
-        bool update_ani;
         u32 listenTime;
         int32_t rssiThrLow;
         int32_t rssiThrHigh;
-        u32 noiseFloor;
         u32 ofdmPhyErrCount;
         u32 cckPhyErrCount;
         int16_t pktRssi[2];
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index c7492c6a2519..874186bfda41 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -995,141 +995,6 @@ static u32 ar5008_hw_compute_pll_control(struct ath_hw *ah,
         return pll;
 }
 
-static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
-                                      enum ath9k_ani_cmd cmd,
-                                      int param)
-{
-        struct ar5416AniState *aniState = &ah->curchan->ani;
-        struct ath_common *common = ath9k_hw_common(ah);
-
-        switch (cmd & ah->ani_function) {
-        case ATH9K_ANI_NOISE_IMMUNITY_LEVEL:{
-                u32 level = param;
-
-                if (level >= ARRAY_SIZE(ah->totalSizeDesired)) {
-                        ath_dbg(common, ANI, "level out of range (%u > %zu)\n",
-                                level, ARRAY_SIZE(ah->totalSizeDesired));
-                        return false;
-                }
-
-                REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ,
-                              AR_PHY_DESIRED_SZ_TOT_DES,
-                              ah->totalSizeDesired[level]);
-                REG_RMW_FIELD(ah, AR_PHY_AGC_CTL1,
-                              AR_PHY_AGC_CTL1_COARSE_LOW,
-                              ah->coarse_low[level]);
-                REG_RMW_FIELD(ah, AR_PHY_AGC_CTL1,
-                              AR_PHY_AGC_CTL1_COARSE_HIGH,
-                              ah->coarse_high[level]);
-                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
-                              AR_PHY_FIND_SIG_FIRPWR,
-                              ah->firpwr[level]);
-
-                if (level > aniState->noiseImmunityLevel)
-                        ah->stats.ast_ani_niup++;
-                else if (level < aniState->noiseImmunityLevel)
-                        ah->stats.ast_ani_nidown++;
-                aniState->noiseImmunityLevel = level;
-                break;
-        }
-        case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
-                u32 on = param ? 1 : 0;
-
-                if (on)
-                        REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
-                                    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
-                else
-                        REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
-                                    AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
-
-                if (!on != aniState->ofdmWeakSigDetectOff) {
-                        if (on)
-                                ah->stats.ast_ani_ofdmon++;
-                        else
-                                ah->stats.ast_ani_ofdmoff++;
-                        aniState->ofdmWeakSigDetectOff = !on;
-                }
-                break;
-        }
-        case ATH9K_ANI_CCK_WEAK_SIGNAL_THR:{
-                static const int weakSigThrCck[] = { 8, 6 };
-                u32 high = param ? 1 : 0;
-
-                REG_RMW_FIELD(ah, AR_PHY_CCK_DETECT,
-                              AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK,
-                              weakSigThrCck[high]);
-                if (high != aniState->cckWeakSigThreshold) {
-                        if (high)
-                                ah->stats.ast_ani_cckhigh++;
-                        else
-                                ah->stats.ast_ani_ccklow++;
-                        aniState->cckWeakSigThreshold = high;
-                }
-                break;
-        }
-        case ATH9K_ANI_FIRSTEP_LEVEL:{
-                static const int firstep[] = { 0, 4, 8 };
-                u32 level = param;
-
-                if (level >= ARRAY_SIZE(firstep)) {
-                        ath_dbg(common, ANI, "level out of range (%u > %zu)\n",
-                                level, ARRAY_SIZE(firstep));
-                        return false;
-                }
-                REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
-                              AR_PHY_FIND_SIG_FIRSTEP,
-                              firstep[level]);
-                if (level > aniState->firstepLevel)
-                        ah->stats.ast_ani_stepup++;
-                else if (level < aniState->firstepLevel)
-                        ah->stats.ast_ani_stepdown++;
-                aniState->firstepLevel = level;
-                break;
-        }
-        case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{
-                static const int cycpwrThr1[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
-                u32 level = param;
-
-                if (level >= ARRAY_SIZE(cycpwrThr1)) {
-                        ath_dbg(common, ANI, "level out of range (%u > %zu)\n",
-                                level, ARRAY_SIZE(cycpwrThr1));
-                        return false;
-                }
-                REG_RMW_FIELD(ah, AR_PHY_TIMING5,
-                              AR_PHY_TIMING5_CYCPWR_THR1,
-                              cycpwrThr1[level]);
-                if (level > aniState->spurImmunityLevel)
-                        ah->stats.ast_ani_spurup++;
-                else if (level < aniState->spurImmunityLevel)
-                        ah->stats.ast_ani_spurdown++;
-                aniState->spurImmunityLevel = level;
-                break;
-        }
-        case ATH9K_ANI_PRESENT:
-                break;
-        default:
-                ath_dbg(common, ANI, "invalid cmd %u\n", cmd);
-                return false;
-        }
-
-        ath_dbg(common, ANI, "ANI parameters:\n");
-        ath_dbg(common, ANI,
-                "noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetectOff=%d\n",
-                aniState->noiseImmunityLevel,
-                aniState->spurImmunityLevel,
-                !aniState->ofdmWeakSigDetectOff);
-        ath_dbg(common, ANI,
-                "cckWeakSigThreshold=%d, firstepLevel=%d, listenTime=%d\n",
-                aniState->cckWeakSigThreshold,
-                aniState->firstepLevel,
-                aniState->listenTime);
-        ath_dbg(common, ANI, "ofdmPhyErrCount=%d, cckPhyErrCount=%d\n\n",
-                aniState->ofdmPhyErrCount,
-                aniState->cckPhyErrCount);
-
-        return true;
-}
-
 static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                       enum ath9k_ani_cmd cmd,
                                       int param)
@@ -1206,18 +1071,18 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                         REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
                                     AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
 
-                if (!on != aniState->ofdmWeakSigDetectOff) {
+                if (on != aniState->ofdmWeakSigDetect) {
                         ath_dbg(common, ANI,
                                 "** ch %d: ofdm weak signal: %s=>%s\n",
                                 chan->channel,
-                                !aniState->ofdmWeakSigDetectOff ?
+                                aniState->ofdmWeakSigDetect ?
                                 "on" : "off",
                                 on ? "on" : "off");
                         if (on)
                                 ah->stats.ast_ani_ofdmon++;
                         else
                                 ah->stats.ast_ani_ofdmoff++;
-                        aniState->ofdmWeakSigDetectOff = !on;
+                        aniState->ofdmWeakSigDetect = on;
                 }
                 break;
         }
@@ -1236,7 +1101,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value = firstep_table[level] -
-                        firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                        firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
                         aniState->iniDef.firstep;
                 if (value < ATH9K_SIG_FIRSTEP_SETTING_MIN)
                         value = ATH9K_SIG_FIRSTEP_SETTING_MIN;
@@ -1251,7 +1116,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value2 = firstep_table[level] -
-                         firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                         firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
                          aniState->iniDef.firstepLow;
                 if (value2 < ATH9K_SIG_FIRSTEP_SETTING_MIN)
                         value2 = ATH9K_SIG_FIRSTEP_SETTING_MIN;
@@ -1267,7 +1132,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->firstepLevel,
                                 level,
-                                ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                ATH9K_ANI_FIRSTEP_LVL,
                                 value,
                                 aniState->iniDef.firstep);
                         ath_dbg(common, ANI,
@@ -1275,7 +1140,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->firstepLevel,
                                 level,
-                                ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                ATH9K_ANI_FIRSTEP_LVL,
                                 value2,
                                 aniState->iniDef.firstepLow);
                         if (level > aniState->firstepLevel)
@@ -1300,7 +1165,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value = cycpwrThr1_table[level] -
-                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
                         aniState->iniDef.cycpwrThr1;
                 if (value < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
                         value = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
@@ -1316,7 +1181,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value2 = cycpwrThr1_table[level] -
-                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
                          aniState->iniDef.cycpwrThr1Ext;
                 if (value2 < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
                         value2 = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
@@ -1331,7 +1196,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->spurImmunityLevel,
                                 level,
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                ATH9K_ANI_SPUR_IMMUNE_LVL,
                                 value,
                                 aniState->iniDef.cycpwrThr1);
                         ath_dbg(common, ANI,
@@ -1339,7 +1204,7 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->spurImmunityLevel,
                                 level,
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                ATH9K_ANI_SPUR_IMMUNE_LVL,
                                 value2,
                                 aniState->iniDef.cycpwrThr1Ext);
                         if (level > aniState->spurImmunityLevel)
@@ -1367,9 +1232,9 @@ static bool ar5008_hw_ani_control_new(struct ath_hw *ah,
         ath_dbg(common, ANI,
                 "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n",
                 aniState->spurImmunityLevel,
-                !aniState->ofdmWeakSigDetectOff ? "on" : "off",
+                aniState->ofdmWeakSigDetect ? "on" : "off",
                 aniState->firstepLevel,
-                !aniState->mrcCCKOff ? "on" : "off",
+                aniState->mrcCCK ? "on" : "off",
                 aniState->listenTime,
                 aniState->ofdmPhyErrCount,
                 aniState->cckPhyErrCount);
@@ -1454,10 +1319,10 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah)
                                                AR_PHY_EXT_TIMING5_CYCPWR_THR1);
 
         /* these levels just got reset to defaults by the INI */
-        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
-        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
-        aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
-        aniState->mrcCCKOff = true; /* not available on pre AR9003 */
+        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
+        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
+        aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
+        aniState->mrcCCK = false; /* not available on pre AR9003 */
 }
 
 static void ar5008_hw_set_nf_limits(struct ath_hw *ah)
@@ -1545,11 +1410,8 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
         priv_ops->do_getnf = ar5008_hw_do_getnf;
         priv_ops->set_radar_params = ar5008_hw_set_radar_params;
 
-        if (modparam_force_new_ani) {
-                priv_ops->ani_control = ar5008_hw_ani_control_new;
-                priv_ops->ani_cache_ini_regs = ar5008_hw_ani_cache_ini_regs;
-        } else
-                priv_ops->ani_control = ar5008_hw_ani_control_old;
+        priv_ops->ani_control = ar5008_hw_ani_control_new;
+        priv_ops->ani_cache_ini_regs = ar5008_hw_ani_cache_ini_regs;
 
         if (AR_SREV_9100(ah) || AR_SREV_9160_10_OR_LATER(ah))
                 priv_ops->compute_pll_control = ar9160_hw_compute_pll_control;
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_hw.c b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
index d9a69fc470cd..edf21ea4fe93 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
@@ -21,10 +21,6 @@
 #include "ar9002_initvals.h"
 #include "ar9002_phy.h"
 
-int modparam_force_new_ani;
-module_param_named(force_new_ani, modparam_force_new_ani, int, 0444);
-MODULE_PARM_DESC(force_new_ani, "Force new ANI for AR5008, AR9001, AR9002");
-
 /* General hardware code for the A5008/AR9001/AR9002 hadware families */
 
 static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
index 952cb2b4656b..89bf94d4d8a1 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
index cc2853ade8f8..61558375bfbf 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -767,10 +767,6 @@ static void ar9003_mci_mute_bt(struct ath_hw *ah)
 {
         /* disable all MCI messages */
         REG_WRITE(ah, AR_MCI_MSG_ATTRIBUTES_TABLE, 0xffff0000);
-        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS0, 0xffffffff);
-        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS1, 0xffffffff);
-        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS2, 0xffffffff);
-        REG_WRITE(ah, AR_BTCOEX_WL_WEIGHTS3, 0xffffffff);
         REG_SET_BIT(ah, AR_MCI_TX_CTRL, AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
 
         /* wait pending HW messages to flush out */
@@ -1019,9 +1015,14 @@ void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool force)
                 return;
 
         if (mci->is_2g) {
-                ar9003_mci_send_2g5g_status(ah, true);
+                if (!force) {
+                        ar9003_mci_send_2g5g_status(ah, true);
 
-                REG_SET_BIT(ah, AR_MCI_TX_CTRL,
+                        ar9003_mci_send_lna_transfer(ah, true);
+                        udelay(5);
+                }
+
+                REG_CLR_BIT(ah, AR_MCI_TX_CTRL,
                             AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
                 REG_CLR_BIT(ah, AR_PHY_GLB_CONTROL,
                             AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
@@ -1029,6 +1030,11 @@ void ar9003_mci_2g5g_switch(struct ath_hw *ah, bool force)
                 if (!(mci->config & ATH_MCI_CONFIG_DISABLE_OSLA))
                         ar9003_mci_osla_setup(ah, true);
         } else {
+                if (!force) {
+                        ar9003_mci_send_lna_take(ah, true);
+                        udelay(5);
+                }
+
                 REG_SET_BIT(ah, AR_MCI_TX_CTRL,
                             AR_MCI_TX_CTRL_DISABLE_LNA_UPDATE);
                 REG_SET_BIT(ah, AR_PHY_GLB_CONTROL,
@@ -1255,6 +1261,9 @@ void ar9003_mci_bt_gain_ctrl(struct ath_hw *ah)
 
         ath_dbg(common, MCI, "Give LNA and SPDT control to BT\n");
 
+        ar9003_mci_send_lna_take(ah, true);
+        udelay(50);
+
         REG_SET_BIT(ah, AR_PHY_GLB_CONTROL, AR_BTCOEX_CTRL_BT_OWN_SPDT_CTRL);
         mci->is_2g = false;
         mci->update_2g5g = true;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index d6baf69cdc14..6b91ebb158fe 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -173,7 +173,7 @@ static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,
         int cur_bb_spur, negative = 0, cck_spur_freq;
         int i;
         int range, max_spur_cnts, synth_freq;
-        u8 *spur_fbin_ptr = NULL;
+        u8 *spur_fbin_ptr = ar9003_get_spur_chan_ptr(ah, IS_CHAN_2GHZ(chan));
 
         /*
          * Need to verify range +/- 10 MHz in control channel, otherwise spur
@@ -181,8 +181,6 @@ static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,
          */
 
         if (AR_SREV_9485(ah) || AR_SREV_9340(ah) || AR_SREV_9330(ah)) {
-                spur_fbin_ptr = ar9003_get_spur_chan_ptr(ah,
-                                                         IS_CHAN_2GHZ(chan));
                 if (spur_fbin_ptr[0] == 0) /* No spur */
                         return;
                 max_spur_cnts = 5;
@@ -825,18 +823,18 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                         REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW,
                                     AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW);
 
-                if (!on != aniState->ofdmWeakSigDetectOff) {
+                if (on != aniState->ofdmWeakSigDetect) {
                         ath_dbg(common, ANI,
                                 "** ch %d: ofdm weak signal: %s=>%s\n",
                                 chan->channel,
-                                !aniState->ofdmWeakSigDetectOff ?
+                                aniState->ofdmWeakSigDetect ?
                                 "on" : "off",
                                 on ? "on" : "off");
                         if (on)
                                 ah->stats.ast_ani_ofdmon++;
                         else
                                 ah->stats.ast_ani_ofdmoff++;
-                        aniState->ofdmWeakSigDetectOff = !on;
+                        aniState->ofdmWeakSigDetect = on;
                 }
                 break;
         }
@@ -855,7 +853,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value = firstep_table[level] -
-                        firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                        firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
                         aniState->iniDef.firstep;
                 if (value < ATH9K_SIG_FIRSTEP_SETTING_MIN)
                         value = ATH9K_SIG_FIRSTEP_SETTING_MIN;
@@ -870,7 +868,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value2 = firstep_table[level] -
-                         firstep_table[ATH9K_ANI_FIRSTEP_LVL_NEW] +
+                         firstep_table[ATH9K_ANI_FIRSTEP_LVL] +
                          aniState->iniDef.firstepLow;
                 if (value2 < ATH9K_SIG_FIRSTEP_SETTING_MIN)
                         value2 = ATH9K_SIG_FIRSTEP_SETTING_MIN;
@@ -886,7 +884,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->firstepLevel,
                                 level,
-                                ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                ATH9K_ANI_FIRSTEP_LVL,
                                 value,
                                 aniState->iniDef.firstep);
                         ath_dbg(common, ANI,
@@ -894,7 +892,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->firstepLevel,
                                 level,
-                                ATH9K_ANI_FIRSTEP_LVL_NEW,
+                                ATH9K_ANI_FIRSTEP_LVL,
                                 value2,
                                 aniState->iniDef.firstepLow);
                         if (level > aniState->firstepLevel)
@@ -919,7 +917,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value = cycpwrThr1_table[level] -
-                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                        cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
                         aniState->iniDef.cycpwrThr1;
                 if (value < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
                         value = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
@@ -935,7 +933,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                  * from INI file & cap value
                  */
                 value2 = cycpwrThr1_table[level] -
-                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL_NEW] +
+                         cycpwrThr1_table[ATH9K_ANI_SPUR_IMMUNE_LVL] +
                          aniState->iniDef.cycpwrThr1Ext;
                 if (value2 < ATH9K_SIG_SPUR_IMM_SETTING_MIN)
                         value2 = ATH9K_SIG_SPUR_IMM_SETTING_MIN;
@@ -950,7 +948,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->spurImmunityLevel,
                                 level,
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                ATH9K_ANI_SPUR_IMMUNE_LVL,
                                 value,
                                 aniState->iniDef.cycpwrThr1);
                         ath_dbg(common, ANI,
@@ -958,7 +956,7 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                                 chan->channel,
                                 aniState->spurImmunityLevel,
                                 level,
-                                ATH9K_ANI_SPUR_IMMUNE_LVL_NEW,
+                                ATH9K_ANI_SPUR_IMMUNE_LVL,
                                 value2,
                                 aniState->iniDef.cycpwrThr1Ext);
                         if (level > aniState->spurImmunityLevel)
@@ -979,16 +977,16 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
                               AR_PHY_MRC_CCK_ENABLE, is_on);
                 REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL,
                               AR_PHY_MRC_CCK_MUX_REG, is_on);
-                if (!is_on != aniState->mrcCCKOff) {
+                if (is_on != aniState->mrcCCK) {
                         ath_dbg(common, ANI, "** ch %d: MRC CCK: %s=>%s\n",
                                 chan->channel,
-                                !aniState->mrcCCKOff ? "on" : "off",
+                                aniState->mrcCCK ? "on" : "off",
                                 is_on ? "on" : "off");
                 if (is_on)
                         ah->stats.ast_ani_ccklow++;
                 else
                         ah->stats.ast_ani_cckhigh++;
-                aniState->mrcCCKOff = !is_on;
+                aniState->mrcCCK = is_on;
                 }
         break;
         }
@@ -1002,9 +1000,9 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah,
         ath_dbg(common, ANI,
                 "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n",
                 aniState->spurImmunityLevel,
-                !aniState->ofdmWeakSigDetectOff ? "on" : "off",
+                aniState->ofdmWeakSigDetect ? "on" : "off",
                 aniState->firstepLevel,
-                !aniState->mrcCCKOff ? "on" : "off",
+                aniState->mrcCCK ? "on" : "off",
                 aniState->listenTime,
                 aniState->ofdmPhyErrCount,
                 aniState->cckPhyErrCount);
@@ -1111,10 +1109,10 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah)
                                                AR_PHY_EXT_CYCPWR_THR1);
 
         /* these levels just got reset to defaults by the INI */
-        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW;
-        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW;
-        aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG;
-        aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK;
+        aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
+        aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
+        aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG;
+        aniState->mrcCCK = true;
 }
 
 static void ar9003_hw_set_radar_params(struct ath_hw *ah,
diff --git a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
index 1bd3a3d22101..6e1756bc3833 100644
--- a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
@@ -337,12 +337,7 @@ static const u32 ar9331_modes_low_ob_db_tx_gain_1p1[][5] = {
         {0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
 };
 
-static const u32 ar9331_1p1_baseband_core_txfir_coeff_japan_2484[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a398, 0x00000000},
-        {0x0000a39c, 0x6f7f0301},
-        {0x0000a3a0, 0xca9228ee},
-};
+#define ar9331_1p1_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484
 
 static const u32 ar9331_1p1_xtal_25M[][2] = {
         /* Addr      allmodes  */
@@ -783,17 +778,7 @@ static const u32 ar9331_modes_high_power_tx_gain_1p1[][5] = {
         {0x00016284, 0x14d3f000, 0x14d3f000, 0x14d3f000, 0x14d3f000},
 };
 
-static const u32 ar9331_1p1_mac_postamble[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-};
+#define ar9331_1p1_mac_postamble ar9300_2p2_mac_postamble
 
 static const u32 ar9331_1p1_soc_preamble[][2] = {
         /* Addr      allmodes  */
@@ -1112,38 +1097,4 @@ static const u32 ar9331_common_tx_gain_offset1_1[][1] = {
         {0x00000000},
 };
 
-static const u32 ar9331_1p1_chansel_xtal_25M[] = {
-        0x0101479e,
-        0x0101d027,
-        0x010258af,
-        0x0102e138,
-        0x010369c0,
-        0x0103f249,
-        0x01047ad1,
-        0x0105035a,
-        0x01058be2,
-        0x0106146b,
-        0x01069cf3,
-        0x0107257c,
-        0x0107ae04,
-        0x0108f5b2,
-};
-
-static const u32 ar9331_1p1_chansel_xtal_40M[] = {
-        0x00a0ccbe,
-        0x00a12213,
-        0x00a17769,
-        0x00a1ccbe,
-        0x00a22213,
-        0x00a27769,
-        0x00a2ccbe,
-        0x00a32213,
-        0x00a37769,
-        0x00a3ccbe,
-        0x00a42213,
-        0x00a47769,
-        0x00a4ccbe,
-        0x00a5998b,
-};
-
 #endif /* INITVALS_9330_1P1_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h b/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
index 0e6ca0834b34..57ed8a112173 100644
--- a/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2011 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,8 +18,8 @@
 #ifndef INITVALS_9330_1P2_H
 #define INITVALS_9330_1P2_H
 
-static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p2[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+static const u32 ar9331_modes_high_ob_db_tx_gain_1p2[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
         {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
         {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
@@ -102,8 +103,14 @@ static const u32 ar9331_modes_lowest_ob_db_tx_gain_1p2[][5] = {
         {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
 };
 
+#define ar9331_modes_high_power_tx_gain_1p2 ar9331_modes_high_ob_db_tx_gain_1p2
+
+#define ar9331_modes_low_ob_db_tx_gain_1p2 ar9331_modes_high_power_tx_gain_1p2
+
+#define ar9331_modes_lowest_ob_db_tx_gain_1p2 ar9331_modes_low_ob_db_tx_gain_1p2
+
 static const u32 ar9331_1p2_baseband_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
         {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
         {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
@@ -147,191 +154,6 @@ static const u32 ar9331_1p2_baseband_postamble[][5] = {
         {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
 };
 
-static const u32 ar9331_modes_high_ob_db_tx_gain_1p2[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x3f001620, 0x3f001620},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x41001621, 0x41001621},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x44001640, 0x44001640},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x46001641, 0x46001641},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x48001642, 0x48001642},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x4b001644, 0x4b001644},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4e001a81, 0x4e001a81},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x51001a83, 0x51001a83},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x54001c84, 0x54001c84},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x57001ce3, 0x57001ce3},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x5b001ce5, 0x5b001ce5},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5f001ce9, 0x5f001ce9},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x66001eec, 0x66001eec},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x66001eec, 0x66001eec},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
-        {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
-        {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
-        {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
-        {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
-        {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
-        {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
-        {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
-        {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
-        {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
-        {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
-        {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
-        {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
-        {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
-        {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
-        {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
-        {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
-        {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
-        {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
-        {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
-        {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
-        {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
-        {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-        {0x0000a618, 0x02008501, 0x02008501, 0x02008501, 0x02008501},
-        {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
-        {0x0000a620, 0x0300c802, 0x0300c802, 0x0300c802, 0x0300c802},
-        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x0300cc03, 0x0300cc03},
-        {0x0000a628, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a62c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a630, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a634, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a638, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-};
-
-static const u32 ar9331_modes_low_ob_db_tx_gain_1p2[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x3f001620, 0x3f001620},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x41001621, 0x41001621},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x44001640, 0x44001640},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x46001641, 0x46001641},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x48001642, 0x48001642},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x4b001644, 0x4b001644},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4e001a81, 0x4e001a81},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x51001a83, 0x51001a83},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x54001c84, 0x54001c84},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x57001ce3, 0x57001ce3},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x5b001ce5, 0x5b001ce5},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5f001ce9, 0x5f001ce9},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x66001eec, 0x66001eec},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x66001eec, 0x66001eec},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
-        {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
-        {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
-        {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
-        {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
-        {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
-        {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
-        {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
-        {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
-        {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
-        {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
-        {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
-        {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
-        {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
-        {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
-        {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
-        {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
-        {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
-        {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
-        {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
-        {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
-        {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
-        {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-        {0x0000a618, 0x02008501, 0x02008501, 0x02008501, 0x02008501},
-        {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
-        {0x0000a620, 0x0300c802, 0x0300c802, 0x0300c802, 0x0300c802},
-        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x0300cc03, 0x0300cc03},
-        {0x0000a628, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a62c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a630, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a634, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a638, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-};
-
-static const u32 ar9331_1p2_baseband_core_txfir_coeff_japan_2484[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a398, 0x00000000},
-        {0x0000a39c, 0x6f7f0301},
-        {0x0000a3a0, 0xca9228ee},
-};
-
-static const u32 ar9331_1p2_xtal_25M[][2] = {
-        /* Addr      allmodes  */
-        {0x00007038, 0x000002f8},
-        {0x00008244, 0x0010f3d7},
-        {0x0000824c, 0x0001e7ae},
-        {0x0001609c, 0x0f508f29},
-};
-
 static const u32 ar9331_1p2_radio_core[][2] = {
         /* Addr      allmodes  */
         {0x00016000, 0x36db6db6},
@@ -397,684 +219,24 @@ static const u32 ar9331_1p2_radio_core[][2] = {
         {0x000163d4, 0x00000000},
 };
 
-static const u32 ar9331_1p2_soc_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x00007010, 0x00000022, 0x00000022, 0x00000022, 0x00000022},
-};
+#define ar9331_1p2_baseband_core_txfir_coeff_japan_2484 ar9331_1p1_baseband_core_txfir_coeff_japan_2484
 
-static const u32 ar9331_common_wo_xlna_rx_gain_1p2[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a000, 0x00060005},
-        {0x0000a004, 0x00810080},
-        {0x0000a008, 0x00830082},
-        {0x0000a00c, 0x00850084},
-        {0x0000a010, 0x01820181},
-        {0x0000a014, 0x01840183},
-        {0x0000a018, 0x01880185},
-        {0x0000a01c, 0x018a0189},
-        {0x0000a020, 0x02850284},
-        {0x0000a024, 0x02890288},
-        {0x0000a028, 0x028b028a},
-        {0x0000a02c, 0x03850384},
-        {0x0000a030, 0x03890388},
-        {0x0000a034, 0x038b038a},
-        {0x0000a038, 0x038d038c},
-        {0x0000a03c, 0x03910390},
-        {0x0000a040, 0x03930392},
-        {0x0000a044, 0x03950394},
-        {0x0000a048, 0x00000396},
-        {0x0000a04c, 0x00000000},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x28282828},
-        {0x0000a084, 0x28282828},
-        {0x0000a088, 0x28282828},
-        {0x0000a08c, 0x28282828},
-        {0x0000a090, 0x28282828},
-        {0x0000a094, 0x24242428},
-        {0x0000a098, 0x171e1e1e},
-        {0x0000a09c, 0x02020b0b},
-        {0x0000a0a0, 0x02020202},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x22072208},
-        {0x0000a0c4, 0x22052206},
-        {0x0000a0c8, 0x22032204},
-        {0x0000a0cc, 0x22012202},
-        {0x0000a0d0, 0x221f2200},
-        {0x0000a0d4, 0x221d221e},
-        {0x0000a0d8, 0x33023303},
-        {0x0000a0dc, 0x33003301},
-        {0x0000a0e0, 0x331e331f},
-        {0x0000a0e4, 0x4402331d},
-        {0x0000a0e8, 0x44004401},
-        {0x0000a0ec, 0x441e441f},
-        {0x0000a0f0, 0x55025503},
-        {0x0000a0f4, 0x55005501},
-        {0x0000a0f8, 0x551e551f},
-        {0x0000a0fc, 0x6602551d},
-        {0x0000a100, 0x66006601},
-        {0x0000a104, 0x661e661f},
-        {0x0000a108, 0x7703661d},
-        {0x0000a10c, 0x77017702},
-        {0x0000a110, 0x00007700},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x111f1100},
-        {0x0000a148, 0x111d111e},
-        {0x0000a14c, 0x111b111c},
-        {0x0000a150, 0x22032204},
-        {0x0000a154, 0x22012202},
-        {0x0000a158, 0x221f2200},
-        {0x0000a15c, 0x221d221e},
-        {0x0000a160, 0x33013302},
-        {0x0000a164, 0x331f3300},
-        {0x0000a168, 0x4402331e},
-        {0x0000a16c, 0x44004401},
-        {0x0000a170, 0x441e441f},
-        {0x0000a174, 0x55015502},
-        {0x0000a178, 0x551f5500},
-        {0x0000a17c, 0x6602551e},
-        {0x0000a180, 0x66006601},
-        {0x0000a184, 0x661e661f},
-        {0x0000a188, 0x7703661d},
-        {0x0000a18c, 0x77017702},
-        {0x0000a190, 0x00007700},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000296},
-};
+#define ar9331_1p2_xtal_25M ar9331_1p1_xtal_25M
 
-static const u32 ar9331_1p2_baseband_core[][2] = {
-        /* Addr      allmodes  */
-        {0x00009800, 0xafe68e30},
-        {0x00009804, 0xfd14e000},
-        {0x00009808, 0x9c0a8f6b},
-        {0x0000980c, 0x04800000},
-        {0x00009814, 0x9280c00a},
-        {0x00009818, 0x00000000},
-        {0x0000981c, 0x00020028},
-        {0x00009834, 0x5f3ca3de},
-        {0x00009838, 0x0108ecff},
-        {0x0000983c, 0x14750600},
-        {0x00009880, 0x201fff00},
-        {0x00009884, 0x00001042},
-        {0x000098a4, 0x00200400},
-        {0x000098b0, 0x32840bbe},
-        {0x000098d0, 0x004b6a8e},
-        {0x000098d4, 0x00000820},
-        {0x000098dc, 0x00000000},
-        {0x000098f0, 0x00000000},
-        {0x000098f4, 0x00000000},
-        {0x00009c04, 0x00000000},
-        {0x00009c08, 0x03200000},
-        {0x00009c0c, 0x00000000},
-        {0x00009c10, 0x00000000},
-        {0x00009c14, 0x00046384},
-        {0x00009c18, 0x05b6b440},
-        {0x00009c1c, 0x00b6b440},
-        {0x00009d00, 0xc080a333},
-        {0x00009d04, 0x40206c10},
-        {0x00009d08, 0x009c4060},
-        {0x00009d0c, 0x1883800a},
-        {0x00009d10, 0x01834061},
-        {0x00009d14, 0x00c00400},
-        {0x00009d18, 0x00000000},
-        {0x00009e08, 0x0038233c},
-        {0x00009e24, 0x9927b515},
-        {0x00009e28, 0x12ef0200},
-        {0x00009e30, 0x06336f77},
-        {0x00009e34, 0x6af6532f},
-        {0x00009e38, 0x0cc80c00},
-        {0x00009e40, 0x0d261820},
-        {0x00009e4c, 0x00001004},
-        {0x00009e50, 0x00ff03f1},
-        {0x00009fc0, 0x803e4788},
-        {0x00009fc4, 0x0001efb5},
-        {0x00009fcc, 0x40000014},
-        {0x0000a20c, 0x00000000},
-        {0x0000a220, 0x00000000},
-        {0x0000a224, 0x00000000},
-        {0x0000a228, 0x10002310},
-        {0x0000a23c, 0x00000000},
-        {0x0000a244, 0x0c000000},
-        {0x0000a2a0, 0x00000001},
-        {0x0000a2c0, 0x00000001},
-        {0x0000a2c8, 0x00000000},
-        {0x0000a2cc, 0x18c43433},
-        {0x0000a2d4, 0x00000000},
-        {0x0000a2dc, 0x00000000},
-        {0x0000a2e0, 0x00000000},
-        {0x0000a2e4, 0x00000000},
-        {0x0000a2e8, 0x00000000},
-        {0x0000a2ec, 0x00000000},
-        {0x0000a2f0, 0x00000000},
-        {0x0000a2f4, 0x00000000},
-        {0x0000a2f8, 0x00000000},
-        {0x0000a344, 0x00000000},
-        {0x0000a34c, 0x00000000},
-        {0x0000a350, 0x0000a000},
-        {0x0000a364, 0x00000000},
-        {0x0000a370, 0x00000000},
-        {0x0000a390, 0x00000001},
-        {0x0000a394, 0x00000444},
-        {0x0000a398, 0x001f0e0f},
-        {0x0000a39c, 0x0075393f},
-        {0x0000a3a0, 0xb79f6427},
-        {0x0000a3a4, 0x00000000},
-        {0x0000a3a8, 0xaaaaaaaa},
-        {0x0000a3ac, 0x3c466478},
-        {0x0000a3c0, 0x20202020},
-        {0x0000a3c4, 0x22222220},
-        {0x0000a3c8, 0x20200020},
-        {0x0000a3cc, 0x20202020},
-        {0x0000a3d0, 0x20202020},
-        {0x0000a3d4, 0x20202020},
-        {0x0000a3d8, 0x20202020},
-        {0x0000a3dc, 0x20202020},
-        {0x0000a3e0, 0x20202020},
-        {0x0000a3e4, 0x20202020},
-        {0x0000a3e8, 0x20202020},
-        {0x0000a3ec, 0x20202020},
-        {0x0000a3f0, 0x00000000},
-        {0x0000a3f4, 0x00000006},
-        {0x0000a3f8, 0x0cdbd380},
-        {0x0000a3fc, 0x000f0f01},
-        {0x0000a400, 0x8fa91f01},
-        {0x0000a404, 0x00000000},
-        {0x0000a408, 0x0e79e5c6},
-        {0x0000a40c, 0x00820820},
-        {0x0000a414, 0x1ce739ce},
-        {0x0000a418, 0x2d001dce},
-        {0x0000a41c, 0x1ce739ce},
-        {0x0000a420, 0x000001ce},
-        {0x0000a424, 0x1ce739ce},
-        {0x0000a428, 0x000001ce},
-        {0x0000a42c, 0x1ce739ce},
-        {0x0000a430, 0x1ce739ce},
-        {0x0000a434, 0x00000000},
-        {0x0000a438, 0x00001801},
-        {0x0000a43c, 0x00000000},
-        {0x0000a440, 0x00000000},
-        {0x0000a444, 0x00000000},
-        {0x0000a448, 0x04000000},
-        {0x0000a44c, 0x00000001},
-        {0x0000a450, 0x00010000},
-        {0x0000a458, 0x00000000},
-        {0x0000a640, 0x00000000},
-        {0x0000a644, 0x3fad9d74},
-        {0x0000a648, 0x0048060a},
-        {0x0000a64c, 0x00003c37},
-        {0x0000a670, 0x03020100},
-        {0x0000a674, 0x09080504},
-        {0x0000a678, 0x0d0c0b0a},
-        {0x0000a67c, 0x13121110},
-        {0x0000a680, 0x31301514},
-        {0x0000a684, 0x35343332},
-        {0x0000a688, 0x00000036},
-        {0x0000a690, 0x00000838},
-        {0x0000a7c0, 0x00000000},
-        {0x0000a7c4, 0xfffffffc},
-        {0x0000a7c8, 0x00000000},
-        {0x0000a7cc, 0x00000000},
-        {0x0000a7d0, 0x00000000},
-        {0x0000a7d4, 0x00000004},
-        {0x0000a7dc, 0x00000001},
-};
+#define ar9331_1p2_xtal_40M ar9331_1p1_xtal_40M
 
-static const u32 ar9331_modes_high_power_tx_gain_1p2[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x0000a410, 0x000050d7, 0x000050d7, 0x000050d7, 0x000050d7},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x23000a00, 0x23000a00},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x27000a02, 0x27000a02},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2b000a04, 0x2b000a04},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x3f001620, 0x3f001620},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x41001621, 0x41001621},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x44001640, 0x44001640},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x46001641, 0x46001641},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x48001642, 0x48001642},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x4b001644, 0x4b001644},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4e001a81, 0x4e001a81},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x51001a83, 0x51001a83},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x54001c84, 0x54001c84},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x57001ce3, 0x57001ce3},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x5b001ce5, 0x5b001ce5},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5f001ce9, 0x5f001ce9},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x66001eec, 0x66001eec},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x66001eec, 0x66001eec},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x66001eec, 0x66001eec},
-        {0x0000a580, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a584, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a588, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a58c, 0x11062202, 0x11062202, 0x0b000200, 0x0b000200},
-        {0x0000a590, 0x17022e00, 0x17022e00, 0x0f000202, 0x0f000202},
-        {0x0000a594, 0x1d000ec2, 0x1d000ec2, 0x11000400, 0x11000400},
-        {0x0000a598, 0x25020ec0, 0x25020ec0, 0x15000402, 0x15000402},
-        {0x0000a59c, 0x2b020ec3, 0x2b020ec3, 0x19000404, 0x19000404},
-        {0x0000a5a0, 0x2f001f04, 0x2f001f04, 0x1b000603, 0x1b000603},
-        {0x0000a5a4, 0x35001fc4, 0x35001fc4, 0x1f000a02, 0x1f000a02},
-        {0x0000a5a8, 0x3c022f04, 0x3c022f04, 0x23000a04, 0x23000a04},
-        {0x0000a5ac, 0x41023e85, 0x41023e85, 0x26000a20, 0x26000a20},
-        {0x0000a5b0, 0x48023ec6, 0x48023ec6, 0x2a000e20, 0x2a000e20},
-        {0x0000a5b4, 0x4d023f01, 0x4d023f01, 0x2e000e22, 0x2e000e22},
-        {0x0000a5b8, 0x53023f4b, 0x53023f4b, 0x31000e24, 0x31000e24},
-        {0x0000a5bc, 0x5a027f09, 0x5a027f09, 0x34001640, 0x34001640},
-        {0x0000a5c0, 0x5f027fc9, 0x5f027fc9, 0x38001660, 0x38001660},
-        {0x0000a5c4, 0x6502feca, 0x6502feca, 0x3b001861, 0x3b001861},
-        {0x0000a5c8, 0x6b02ff4a, 0x6b02ff4a, 0x3e001a81, 0x3e001a81},
-        {0x0000a5cc, 0x7203feca, 0x7203feca, 0x42001a83, 0x42001a83},
-        {0x0000a5d0, 0x7703ff0b, 0x7703ff0b, 0x44001c84, 0x44001c84},
-        {0x0000a5d4, 0x7d06ffcb, 0x7d06ffcb, 0x48001ce3, 0x48001ce3},
-        {0x0000a5d8, 0x8407ff0b, 0x8407ff0b, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a5dc, 0x8907ffcb, 0x8907ffcb, 0x50001ce9, 0x50001ce9},
-        {0x0000a5e0, 0x900fff0b, 0x900fff0b, 0x54001ceb, 0x54001ceb},
-        {0x0000a5e4, 0x960fffcb, 0x960fffcb, 0x56001eec, 0x56001eec},
-        {0x0000a5e8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5ec, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f0, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f4, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5f8, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a5fc, 0x9c1fff0b, 0x9c1fff0b, 0x56001eec, 0x56001eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-        {0x0000a618, 0x02008501, 0x02008501, 0x02008501, 0x02008501},
-        {0x0000a61c, 0x02008802, 0x02008802, 0x02008802, 0x02008802},
-        {0x0000a620, 0x0300c802, 0x0300c802, 0x0300c802, 0x0300c802},
-        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x0300cc03, 0x0300cc03},
-        {0x0000a628, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a62c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a630, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a634, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a638, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-        {0x0000a63c, 0x04011004, 0x04011004, 0x04011004, 0x04011004},
-};
+#define ar9331_1p2_baseband_core ar9331_1p1_baseband_core
 
-static const u32 ar9331_1p2_mac_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-};
+#define ar9331_1p2_soc_postamble ar9331_1p1_soc_postamble
 
-static const u32 ar9331_1p2_soc_preamble[][2] = {
-        /* Addr      allmodes  */
-        {0x00007020, 0x00000000},
-        {0x00007034, 0x00000002},
-        {0x00007038, 0x000002f8},
-};
+#define ar9331_1p2_mac_postamble ar9331_1p1_mac_postamble
 
-static const u32 ar9331_1p2_xtal_40M[][2] = {
-        /* Addr      allmodes  */
-        {0x00007038, 0x000004c2},
-        {0x00008244, 0x0010f400},
-        {0x0000824c, 0x0001e800},
-        {0x0001609c, 0x0b283f31},
-};
+#define ar9331_1p2_soc_preamble ar9331_1p1_soc_preamble
 
-static const u32 ar9331_1p2_mac_core[][2] = {
-        /* Addr      allmodes  */
-        {0x00000008, 0x00000000},
-        {0x00000030, 0x00020085},
-        {0x00000034, 0x00000005},
-        {0x00000040, 0x00000000},
-        {0x00000044, 0x00000000},
-        {0x00000048, 0x00000008},
-        {0x0000004c, 0x00000010},
-        {0x00000050, 0x00000000},
-        {0x00001040, 0x002ffc0f},
-        {0x00001044, 0x002ffc0f},
-        {0x00001048, 0x002ffc0f},
-        {0x0000104c, 0x002ffc0f},
-        {0x00001050, 0x002ffc0f},
-        {0x00001054, 0x002ffc0f},
-        {0x00001058, 0x002ffc0f},
-        {0x0000105c, 0x002ffc0f},
-        {0x00001060, 0x002ffc0f},
-        {0x00001064, 0x002ffc0f},
-        {0x000010f0, 0x00000100},
-        {0x00001270, 0x00000000},
-        {0x000012b0, 0x00000000},
-        {0x000012f0, 0x00000000},
-        {0x0000143c, 0x00000000},
-        {0x0000147c, 0x00000000},
-        {0x00008000, 0x00000000},
-        {0x00008004, 0x00000000},
-        {0x00008008, 0x00000000},
-        {0x0000800c, 0x00000000},
-        {0x00008018, 0x00000000},
-        {0x00008020, 0x00000000},
-        {0x00008038, 0x00000000},
-        {0x0000803c, 0x00000000},
-        {0x00008040, 0x00000000},
-        {0x00008044, 0x00000000},
-        {0x00008048, 0x00000000},
-        {0x0000804c, 0xffffffff},
-        {0x00008054, 0x00000000},
-        {0x00008058, 0x00000000},
-        {0x0000805c, 0x000fc78f},
-        {0x00008060, 0x0000000f},
-        {0x00008064, 0x00000000},
-        {0x00008070, 0x00000310},
-        {0x00008074, 0x00000020},
-        {0x00008078, 0x00000000},
-        {0x0000809c, 0x0000000f},
-        {0x000080a0, 0x00000000},
-        {0x000080a4, 0x02ff0000},
-        {0x000080a8, 0x0e070605},
-        {0x000080ac, 0x0000000d},
-        {0x000080b0, 0x00000000},
-        {0x000080b4, 0x00000000},
-        {0x000080b8, 0x00000000},
-        {0x000080bc, 0x00000000},
-        {0x000080c0, 0x2a800000},
-        {0x000080c4, 0x06900168},
-        {0x000080c8, 0x13881c20},
-        {0x000080cc, 0x01f40000},
-        {0x000080d0, 0x00252500},
-        {0x000080d4, 0x00a00000},
-        {0x000080d8, 0x00400000},
-        {0x000080dc, 0x00000000},
-        {0x000080e0, 0xffffffff},
-        {0x000080e4, 0x0000ffff},
-        {0x000080e8, 0x3f3f3f3f},
-        {0x000080ec, 0x00000000},
-        {0x000080f0, 0x00000000},
-        {0x000080f4, 0x00000000},
-        {0x000080fc, 0x00020000},
-        {0x00008100, 0x00000000},
-        {0x00008108, 0x00000052},
-        {0x0000810c, 0x00000000},
-        {0x00008110, 0x00000000},
-        {0x00008114, 0x000007ff},
-        {0x00008118, 0x000000aa},
-        {0x0000811c, 0x00003210},
-        {0x00008124, 0x00000000},
-        {0x00008128, 0x00000000},
-        {0x0000812c, 0x00000000},
-        {0x00008130, 0x00000000},
-        {0x00008134, 0x00000000},
-        {0x00008138, 0x00000000},
-        {0x0000813c, 0x0000ffff},
-        {0x00008144, 0xffffffff},
-        {0x00008168, 0x00000000},
-        {0x0000816c, 0x00000000},
-        {0x00008170, 0x18486200},
-        {0x00008174, 0x33332210},
-        {0x00008178, 0x00000000},
-        {0x0000817c, 0x00020000},
-        {0x000081c0, 0x00000000},
-        {0x000081c4, 0x33332210},
-        {0x000081c8, 0x00000000},
-        {0x000081cc, 0x00000000},
-        {0x000081d4, 0x00000000},
-        {0x000081ec, 0x00000000},
-        {0x000081f0, 0x00000000},
-        {0x000081f4, 0x00000000},
-        {0x000081f8, 0x00000000},
-        {0x000081fc, 0x00000000},
-        {0x00008240, 0x00100000},
-        {0x00008248, 0x00000800},
-        {0x00008250, 0x00000000},
-        {0x00008254, 0x00000000},
-        {0x00008258, 0x00000000},
-        {0x0000825c, 0x40000000},
-        {0x00008260, 0x00080922},
-        {0x00008264, 0x9d400010},
-        {0x00008268, 0xffffffff},
-        {0x0000826c, 0x0000ffff},
-        {0x00008270, 0x00000000},
-        {0x00008274, 0x40000000},
-        {0x00008278, 0x003e4180},
-        {0x0000827c, 0x00000004},
-        {0x00008284, 0x0000002c},
-        {0x00008288, 0x0000002c},
-        {0x0000828c, 0x000000ff},
-        {0x00008294, 0x00000000},
-        {0x00008298, 0x00000000},
-        {0x0000829c, 0x00000000},
-        {0x00008300, 0x00000140},
-        {0x00008314, 0x00000000},
-        {0x0000831c, 0x0000010d},
-        {0x00008328, 0x00000000},
-        {0x0000832c, 0x00000007},
-        {0x00008330, 0x00000302},
-        {0x00008334, 0x00000700},
-        {0x00008338, 0x00ff0000},
-        {0x0000833c, 0x02400000},
-        {0x00008340, 0x000107ff},
-        {0x00008344, 0xaa48105b},
-        {0x00008348, 0x008f0000},
-        {0x0000835c, 0x00000000},
-        {0x00008360, 0xffffffff},
-        {0x00008364, 0xffffffff},
-        {0x00008368, 0x00000000},
-        {0x00008370, 0x00000000},
-        {0x00008374, 0x000000ff},
-        {0x00008378, 0x00000000},
-        {0x0000837c, 0x00000000},
-        {0x00008380, 0xffffffff},
-        {0x00008384, 0xffffffff},
-        {0x00008390, 0xffffffff},
-        {0x00008394, 0xffffffff},
-        {0x00008398, 0x00000000},
-        {0x0000839c, 0x00000000},
-        {0x000083a0, 0x00000000},
-        {0x000083a4, 0x0000fa14},
-        {0x000083a8, 0x000f0c00},
-        {0x000083ac, 0x33332210},
-        {0x000083b0, 0x33332210},
-        {0x000083b4, 0x33332210},
-        {0x000083b8, 0x33332210},
-        {0x000083bc, 0x00000000},
-        {0x000083c0, 0x00000000},
-        {0x000083c4, 0x00000000},
-        {0x000083c8, 0x00000000},
-        {0x000083cc, 0x00000200},
-        {0x000083d0, 0x000301ff},
-};
+#define ar9331_1p2_mac_core ar9331_1p1_mac_core
 
-static const u32 ar9331_common_rx_gain_1p2[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x01800082},
-        {0x0000a014, 0x01820181},
-        {0x0000a018, 0x01840183},
-        {0x0000a01c, 0x01880185},
-        {0x0000a020, 0x018a0189},
-        {0x0000a024, 0x02850284},
-        {0x0000a028, 0x02890288},
-        {0x0000a02c, 0x03850384},
-        {0x0000a030, 0x03890388},
-        {0x0000a034, 0x038b038a},
-        {0x0000a038, 0x038d038c},
-        {0x0000a03c, 0x03910390},
-        {0x0000a040, 0x03930392},
-        {0x0000a044, 0x03950394},
-        {0x0000a048, 0x00000396},
-        {0x0000a04c, 0x00000000},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x28282828},
-        {0x0000a084, 0x28282828},
-        {0x0000a088, 0x28282828},
-        {0x0000a08c, 0x28282828},
-        {0x0000a090, 0x28282828},
-        {0x0000a094, 0x21212128},
-        {0x0000a098, 0x171c1c1c},
-        {0x0000a09c, 0x02020212},
-        {0x0000a0a0, 0x00000202},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x111f1100},
-        {0x0000a0c8, 0x111d111e},
-        {0x0000a0cc, 0x111b111c},
-        {0x0000a0d0, 0x22032204},
-        {0x0000a0d4, 0x22012202},
-        {0x0000a0d8, 0x221f2200},
-        {0x0000a0dc, 0x221d221e},
-        {0x0000a0e0, 0x33013302},
-        {0x0000a0e4, 0x331f3300},
-        {0x0000a0e8, 0x4402331e},
-        {0x0000a0ec, 0x44004401},
-        {0x0000a0f0, 0x441e441f},
-        {0x0000a0f4, 0x55015502},
-        {0x0000a0f8, 0x551f5500},
-        {0x0000a0fc, 0x6602551e},
-        {0x0000a100, 0x66006601},
-        {0x0000a104, 0x661e661f},
-        {0x0000a108, 0x7703661d},
-        {0x0000a10c, 0x77017702},
-        {0x0000a110, 0x00007700},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x111f1100},
-        {0x0000a148, 0x111d111e},
-        {0x0000a14c, 0x111b111c},
-        {0x0000a150, 0x22032204},
-        {0x0000a154, 0x22012202},
-        {0x0000a158, 0x221f2200},
-        {0x0000a15c, 0x221d221e},
-        {0x0000a160, 0x33013302},
-        {0x0000a164, 0x331f3300},
-        {0x0000a168, 0x4402331e},
-        {0x0000a16c, 0x44004401},
-        {0x0000a170, 0x441e441f},
-        {0x0000a174, 0x55015502},
-        {0x0000a178, 0x551f5500},
-        {0x0000a17c, 0x6602551e},
-        {0x0000a180, 0x66006601},
-        {0x0000a184, 0x661e661f},
-        {0x0000a188, 0x7703661d},
-        {0x0000a18c, 0x77017702},
-        {0x0000a190, 0x00007700},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000296},
-};
+#define ar9331_common_wo_xlna_rx_gain_1p2 ar9331_common_wo_xlna_rx_gain_1p1
+
+#define ar9331_common_rx_gain_1p2 ar9485_common_rx_gain_1_1
 
 #endif /* INITVALS_9330_1P2_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
index 815a8af1beef..1d8235e19f0f 100644
--- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2011 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,16 +19,16 @@
 #define INITVALS_9340_H
 
 static const u32 ar9340_1p0_radio_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x000160ac, 0xa4646800, 0xa4646800, 0xa4646800, 0xa4646800},
-        {0x0001610c, 0x08000000, 0x08000000, 0x00000000, 0x00000000},
+        {0x0001610c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00016140, 0x10804000, 0x10804000, 0x50804000, 0x50804000},
-        {0x0001650c, 0x08000000, 0x08000000, 0x00000000, 0x00000000},
+        {0x0001650c, 0x08000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00016540, 0x10804000, 0x10804000, 0x50804000, 0x50804000},
 };
 
 static const u32 ar9340Modes_lowest_ob_db_tx_gain_table_1p0[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
@@ -99,21 +100,10 @@ static const u32 ar9340Modes_lowest_ob_db_tx_gain_table_1p0[][5] = {
         {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
 };
 
-static const u32 ar9340Modes_fast_clock_1p0[][3] = {
-        /*  Addr      5G_HT20     5G_HT40  */
-        {0x00001030, 0x00000268, 0x000004d0},
-        {0x00001070, 0x0000018c, 0x00000318},
-        {0x000010b0, 0x00000fd0, 0x00001fa0},
-        {0x00008014, 0x044c044c, 0x08980898},
-        {0x0000801c, 0x148ec02b, 0x148ec057},
-        {0x00008318, 0x000044c0, 0x00008980},
-        {0x00009e00, 0x03721821, 0x03721821},
-        {0x0000a230, 0x0000000b, 0x00000016},
-        {0x0000a254, 0x00000898, 0x00001130},
-};
+#define ar9340Modes_fast_clock_1p0 ar9300Modes_fast_clock_2p2
 
 static const u32 ar9340_1p0_radio_core[][2] = {
-        /*  Addr     allmodes  */
+        /* Addr      allmodes  */
         {0x00016000, 0x36db6db6},
         {0x00016004, 0x6db6db40},
         {0x00016008, 0x73f00000},
@@ -146,15 +136,13 @@ static const u32 ar9340_1p0_radio_core[][2] = {
         {0x00016100, 0x04cb0001},
         {0x00016104, 0xfff80000},
         {0x00016108, 0x00080010},
-        {0x0001610c, 0x00000000},
         {0x00016140, 0x50804008},
         {0x00016144, 0x01884080},
         {0x00016148, 0x000080c0},
         {0x00016280, 0x01000015},
-        {0x00016284, 0x05530000},
+        {0x00016284, 0x15530000},
         {0x00016288, 0x00318000},
         {0x0001628c, 0x50000000},
-        {0x00016290, 0x4080294f},
         {0x00016380, 0x00000000},
         {0x00016384, 0x00000000},
         {0x00016388, 0x00800700},
@@ -219,52 +207,43 @@ static const u32 ar9340_1p0_radio_core[][2] = {
 };
 
 static const u32 ar9340_1p0_radio_core_40M[][2] = {
+        /* Addr      allmodes  */
         {0x0001609c, 0x02566f3a},
         {0x000160ac, 0xa4647c00},
         {0x000160b0, 0x01885f5a},
 };
 
-static const u32 ar9340_1p0_mac_postamble[][5] = {
-        /* Addr       5G_HT20     5G_HT40     2G_HT40    2G_HT20  */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-};
+#define ar9340_1p0_mac_postamble ar9300_2p2_mac_postamble
 
-static const u32 ar9340_1p0_soc_postamble[][5] = {
-        /*   Addr     5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
-        {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
-};
+#define ar9340_1p0_soc_postamble ar9300_2p2_soc_postamble
 
 static const u32 ar9340_1p0_baseband_postamble[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
         {0x00009820, 0x206a022e, 0x206a022e, 0x206a022e, 0x206a022e},
         {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
         {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
         {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
         {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
-        {0x00009c00, 0x00000044, 0x000000c4, 0x000000c4, 0x00000044},
-        {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
-        {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
+        {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
+        {0x00009e00, 0x0372111a, 0x0372111a, 0x037216a0, 0x037216a0},
+        {0x00009e04, 0x001c2020, 0x001c2020, 0x001c2020, 0x001c2020},
         {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
         {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec88d2e, 0x7ec88d2e},
-        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
+        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3379605e, 0x33795d5e},
         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
         {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
+        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
         {0x00009e44, 0x02321e27, 0x02321e27, 0x02291e27, 0x02291e27},
         {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
         {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
-        {0x0000a204, 0x00003fc0, 0x00003fc4, 0x00003fc4, 0x00003fc0},
+        {0x0000a204, 0x00003ec0, 0x00003ec4, 0x00003ec4, 0x00003ec0},
         {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
+        {0x0000a22c, 0x07e26a2f, 0x07e26a2f, 0x01026a2f, 0x01026a2f},
         {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
+        {0x0000a234, 0x00000fff, 0x10000fff, 0x10000fff, 0x00000fff},
         {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
         {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
         {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
@@ -277,11 +256,11 @@ static const u32 ar9340_1p0_baseband_postamble[][5] = {
         {0x0000a288, 0x00000220, 0x00000220, 0x00000110, 0x00000110},
         {0x0000a28c, 0x00011111, 0x00011111, 0x00022222, 0x00022222},
         {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
-        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
-        {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
+        {0x0000a2d0, 0x00041983, 0x00041983, 0x00041982, 0x00041982},
+        {0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
         {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
-        {0x0000ae04, 0x00180000, 0x00180000, 0x00180000, 0x00180000},
+        {0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
         {0x0000ae18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000ae1c, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
         {0x0000ae20, 0x000001b5, 0x000001b5, 0x000001ce, 0x000001ce},
@@ -289,21 +268,21 @@ static const u32 ar9340_1p0_baseband_postamble[][5] = {
 };
 
 static const u32 ar9340_1p0_baseband_core[][2] = {
-        /*  Addr     allmodes  */
+        /* Addr      allmodes  */
         {0x00009800, 0xafe68e30},
         {0x00009804, 0xfd14e000},
         {0x00009808, 0x9c0a9f6b},
         {0x0000980c, 0x04900000},
-        {0x00009814, 0xb280c00a},
+        {0x00009814, 0x3280c00a},
         {0x00009818, 0x00000000},
         {0x0000981c, 0x00020028},
-        {0x00009834, 0x5f3ca3de},
+        {0x00009834, 0x6400a190},
         {0x00009838, 0x0108ecff},
-        {0x0000983c, 0x14750600},
+        {0x0000983c, 0x14000600},
         {0x00009880, 0x201fff00},
         {0x00009884, 0x00001042},
         {0x000098a4, 0x00200400},
-        {0x000098b0, 0x52440bbe},
+        {0x000098b0, 0x32840bbe},
         {0x000098d0, 0x004b6a8e},
         {0x000098d4, 0x00000820},
         {0x000098dc, 0x00000000},
@@ -329,7 +308,6 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x00009e30, 0x06336f77},
         {0x00009e34, 0x6af6532f},
         {0x00009e38, 0x0cc80c00},
-        {0x00009e3c, 0xcf946222},
         {0x00009e40, 0x0d261820},
         {0x00009e4c, 0x00001004},
         {0x00009e50, 0x00ff03f1},
@@ -342,8 +320,6 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a220, 0x00000000},
         {0x0000a224, 0x00000000},
         {0x0000a228, 0x10002310},
-        {0x0000a22c, 0x01036a1e},
-        {0x0000a234, 0x10000fff},
         {0x0000a23c, 0x00000000},
         {0x0000a244, 0x0c000000},
         {0x0000a2a0, 0x00000001},
@@ -351,10 +327,6 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a2c8, 0x00000000},
         {0x0000a2cc, 0x18c43433},
         {0x0000a2d4, 0x00000000},
-        {0x0000a2dc, 0x00000000},
-        {0x0000a2e0, 0x00000000},
-        {0x0000a2e4, 0x00000000},
-        {0x0000a2e8, 0x00000000},
         {0x0000a2ec, 0x00000000},
         {0x0000a2f0, 0x00000000},
         {0x0000a2f4, 0x00000000},
@@ -385,7 +357,7 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a3e8, 0x20202020},
         {0x0000a3ec, 0x20202020},
         {0x0000a3f0, 0x00000000},
-        {0x0000a3f4, 0x00000246},
+        {0x0000a3f4, 0x00000000},
         {0x0000a3f8, 0x0cdbd380},
         {0x0000a3fc, 0x000f0f01},
         {0x0000a400, 0x8fa91f01},
@@ -402,33 +374,17 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a430, 0x1ce739ce},
         {0x0000a434, 0x00000000},
         {0x0000a438, 0x00001801},
-        {0x0000a43c, 0x00000000},
+        {0x0000a43c, 0x00100000},
         {0x0000a440, 0x00000000},
         {0x0000a444, 0x00000000},
-        {0x0000a448, 0x04000080},
+        {0x0000a448, 0x05000080},
         {0x0000a44c, 0x00000001},
         {0x0000a450, 0x00010000},
         {0x0000a458, 0x00000000},
-        {0x0000a600, 0x00000000},
-        {0x0000a604, 0x00000000},
-        {0x0000a608, 0x00000000},
-        {0x0000a60c, 0x00000000},
-        {0x0000a610, 0x00000000},
-        {0x0000a614, 0x00000000},
-        {0x0000a618, 0x00000000},
-        {0x0000a61c, 0x00000000},
-        {0x0000a620, 0x00000000},
-        {0x0000a624, 0x00000000},
-        {0x0000a628, 0x00000000},
-        {0x0000a62c, 0x00000000},
-        {0x0000a630, 0x00000000},
-        {0x0000a634, 0x00000000},
-        {0x0000a638, 0x00000000},
-        {0x0000a63c, 0x00000000},
         {0x0000a640, 0x00000000},
         {0x0000a644, 0x3fad9d74},
         {0x0000a648, 0x0048060a},
-        {0x0000a64c, 0x00000637},
+        {0x0000a64c, 0x00003c37},
         {0x0000a670, 0x03020100},
         {0x0000a674, 0x09080504},
         {0x0000a678, 0x0d0c0b0a},
@@ -451,10 +407,6 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
         {0x0000a8f4, 0x00000000},
         {0x0000b2d0, 0x00000080},
         {0x0000b2d4, 0x00000000},
-        {0x0000b2dc, 0x00000000},
-        {0x0000b2e0, 0x00000000},
-        {0x0000b2e4, 0x00000000},
-        {0x0000b2e8, 0x00000000},
         {0x0000b2ec, 0x00000000},
         {0x0000b2f0, 0x00000000},
         {0x0000b2f4, 0x00000000},
@@ -465,80 +417,108 @@ static const u32 ar9340_1p0_baseband_core[][2] = {
 };
 
 static const u32 ar9340Modes_high_power_tx_gain_table_1p0[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
+        {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
+        {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
+        {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
-        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
-        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
-        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
+        {0x0000a504, 0x04002222, 0x04002222, 0x02000001, 0x02000001},
+        {0x0000a508, 0x09002421, 0x09002421, 0x05000003, 0x05000003},
+        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0a000005, 0x0a000005},
+        {0x0000a510, 0x13004620, 0x13004620, 0x0e000201, 0x0e000201},
+        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000203, 0x11000203},
+        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x14000401, 0x14000401},
+        {0x0000a51c, 0x21005420, 0x21005420, 0x18000403, 0x18000403},
+        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000602, 0x1b000602},
+        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000802, 0x1f000802},
+        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x21000620, 0x21000620},
+        {0x0000a52c, 0x33005e44, 0x33005e44, 0x25000820, 0x25000820},
+        {0x0000a530, 0x38005e65, 0x38005e65, 0x29000822, 0x29000822},
+        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2d000824, 0x2d000824},
+        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x30000828, 0x30000828},
+        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x3400082a, 0x3400082a},
+        {0x0000a540, 0x49005e72, 0x49005e72, 0x38000849, 0x38000849},
+        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b000a2c, 0x3b000a2c},
+        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e000e2b, 0x3e000e2b},
+        {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42000e2d, 0x42000e2d},
+        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x4500124a, 0x4500124a},
+        {0x0000a554, 0x61027f12, 0x61027f12, 0x4900124c, 0x4900124c},
+        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c00126c, 0x4c00126c},
+        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x4f00128c, 0x4f00128c},
+        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x52001290, 0x52001290},
+        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
+        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001292, 0x56001292},
         {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
-        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x00016044, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
+        {0x0000a584, 0x04802222, 0x04802222, 0x02800001, 0x02800001},
+        {0x0000a588, 0x09802421, 0x09802421, 0x05800003, 0x05800003},
+        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0a800005, 0x0a800005},
+        {0x0000a590, 0x13804620, 0x13804620, 0x0e800201, 0x0e800201},
+        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800203, 0x11800203},
+        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x14800401, 0x14800401},
+        {0x0000a59c, 0x21805420, 0x21805420, 0x18800403, 0x18800403},
+        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800602, 0x1b800602},
+        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800802, 0x1f800802},
+        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x21800620, 0x21800620},
+        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x25800820, 0x25800820},
+        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x29800822, 0x29800822},
+        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2d800824, 0x2d800824},
+        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x30800828, 0x30800828},
+        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x3480082a, 0x3480082a},
+        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38800849, 0x38800849},
+        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b800a2c, 0x3b800a2c},
+        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e800e2b, 0x3e800e2b},
+        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42800e2d, 0x42800e2d},
+        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x4580124a, 0x4580124a},
+        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x4980124c, 0x4980124c},
+        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c80126c, 0x4c80126c},
+        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x4f80128c, 0x4f80128c},
+        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x52801290, 0x52801290},
+        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801292, 0x56801292},
+        {0x00016044, 0x056db2db, 0x056db2db, 0x022492db, 0x022492db},
         {0x00016048, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
-        {0x00016444, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
+        {0x00016444, 0x056db2db, 0x056db2db, 0x022492db, 0x022492db},
         {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
 };
 
 static const u32 ar9340Modes_high_ob_db_tx_gain_table_1p0[][5] = {
-        /*  Addr       5G_HT20    5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
         {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
@@ -559,7 +539,7 @@ static const u32 ar9340Modes_high_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
         {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
         {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x59025eb5, 0x59025eb5, 0x42001a83, 0x42001a83},
+        {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
         {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
         {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
         {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
@@ -604,13 +584,43 @@ static const u32 ar9340Modes_high_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
+        {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
+        {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x00016044, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
-        {0x00016048, 0x8e481266, 0x8e481266, 0x8e481266, 0x8e481266},
+        {0x00016048, 0x8e481666, 0x8e481666, 0x8e481266, 0x8e481266},
+        {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
         {0x00016444, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
-        {0x00016448, 0x8e481266, 0x8e481266, 0x8e481266, 0x8e481266},
+        {0x00016448, 0x8e481666, 0x8e481666, 0x8e481266, 0x8e481266},
 };
+
 static const u32 ar9340Modes_ub124_tx_gain_table_1p0[][5] = {
-        /*  Addr      5G_HT20      5G_HT40     2G_HT40    2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
+        {0x00009820, 0x206a022e, 0x206a022e, 0x206a00ae, 0x206a00ae},
+        {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
+        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec82d2e, 0x7ec82d2e},
+        {0x0000a2dc, 0xfef5d402, 0xfef5d402, 0xfdab5b52, 0xfdab5b52},
+        {0x0000a2e0, 0xfe896600, 0xfe896600, 0xfd339c84, 0xfd339c84},
+        {0x0000a2e4, 0xff01f800, 0xff01f800, 0xfec3e000, 0xfec3e000},
+        {0x0000a2e8, 0xfffe0000, 0xfffe0000, 0xfffc0000, 0xfffc0000},
         {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
         {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
@@ -676,15 +686,34 @@ static const u32 ar9340Modes_ub124_tx_gain_table_1p0[][5] = {
         {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
         {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x00016044, 0x036db2db, 0x036db2db, 0x036db2db, 0x036db2db},
-        {0x00016048, 0x69b65266, 0x69b65266, 0x69b65266, 0x69b65266},
-        {0x00016444, 0x036db2db, 0x036db2db, 0x036db2db, 0x036db2db},
-        {0x00016448, 0x69b65266, 0x69b65266, 0x69b65266, 0x69b65266},
+        {0x00016044, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
+        {0x00016048, 0x8e480086, 0x8e480086, 0x8e480086, 0x8e480086},
+        {0x00016444, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4, 0x03b6d2e4},
+        {0x00016448, 0x8e480086, 0x8e480086, 0x8e480086, 0x8e480086},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
+        {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
+        {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0xfef5d402, 0xfef5d402, 0xfdab5b52, 0xfdab5b52},
+        {0x0000b2e0, 0xfe896600, 0xfe896600, 0xfd339c84, 0xfd339c84},
+        {0x0000b2e4, 0xff01f800, 0xff01f800, 0xfec3e000, 0xfec3e000},
+        {0x0000b2e8, 0xfffe0000, 0xfffe0000, 0xfffc0000, 0xfffc0000},
 };
 
-
 static const u32 ar9340Common_rx_gain_table_1p0[][2] = {
-        /*   Addr     allmodes */
+        /* Addr      allmodes  */
         {0x0000a000, 0x00010000},
         {0x0000a004, 0x00030002},
         {0x0000a008, 0x00050004},
@@ -845,14 +874,14 @@ static const u32 ar9340Common_rx_gain_table_1p0[][2] = {
         {0x0000b074, 0x00000000},
         {0x0000b078, 0x00000000},
         {0x0000b07c, 0x00000000},
-        {0x0000b080, 0x32323232},
-        {0x0000b084, 0x2f2f3232},
-        {0x0000b088, 0x23282a2d},
-        {0x0000b08c, 0x1c1e2123},
-        {0x0000b090, 0x14171919},
-        {0x0000b094, 0x0e0e1214},
-        {0x0000b098, 0x03050707},
-        {0x0000b09c, 0x00030303},
+        {0x0000b080, 0x23232323},
+        {0x0000b084, 0x21232323},
+        {0x0000b088, 0x19191c1e},
+        {0x0000b08c, 0x12141417},
+        {0x0000b090, 0x07070e0e},
+        {0x0000b094, 0x03030305},
+        {0x0000b098, 0x00000003},
+        {0x0000b09c, 0x00000000},
         {0x0000b0a0, 0x00000000},
         {0x0000b0a4, 0x00000000},
         {0x0000b0a8, 0x00000000},
@@ -944,7 +973,11 @@ static const u32 ar9340Common_rx_gain_table_1p0[][2] = {
 };
 
 static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
-        /*  Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
@@ -952,8 +985,8 @@ static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
         {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
         {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
-        {0x0000a518, 0x21020220, 0x21020220, 0x16000402, 0x16000402},
-        {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
+        {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
+        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
         {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
         {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
         {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
@@ -965,19 +998,19 @@ static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
         {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
         {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
-        {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x47001a83, 0x47001a83},
-        {0x0000a550, 0x61042a6c, 0x61042a6c, 0x4a001c84, 0x4a001c84},
-        {0x0000a554, 0x66062a6c, 0x66062a6c, 0x4e001ce3, 0x4e001ce3},
-        {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x52001ce5, 0x52001ce5},
-        {0x0000a55c, 0x7006308c, 0x7006308c, 0x56001ce9, 0x56001ce9},
-        {0x0000a560, 0x730a308a, 0x730a308a, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a564, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a568, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a56c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a570, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a574, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a578, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
-        {0x0000a57c, 0x770a308c, 0x770a308c, 0x5d001eec, 0x5d001eec},
+        {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
+        {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
+        {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
+        {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
+        {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
+        {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
+        {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
+        {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
         {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
         {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
         {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
@@ -1010,14 +1043,40 @@ static const u32 ar9340Modes_low_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a5f4, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
         {0x0000a5f8, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
         {0x0000a5fc, 0x778a308c, 0x778a308c, 0x5d801eec, 0x5d801eec},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
+        {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
+        {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
+        {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x00016044, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
-        {0x00016048, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
+        {0x00016048, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
+        {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
+        {0x00016288, 0xf0318000, 0xf0318000, 0xf0318000, 0xf0318000},
         {0x00016444, 0x056db2db, 0x056db2db, 0x056db2db, 0x056db2db},
-        {0x00016448, 0x24925266, 0x24925266, 0x24925266, 0x24925266},
+        {0x00016448, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
 };
 
 static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
-        /*  Addr       5G_HT20     5G_HT40     2G_HT40    2G_HT20  */
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
         {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
@@ -1025,8 +1084,8 @@ static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
         {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
         {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
-        {0x0000a518, 0x21020220, 0x21020220, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x27020223, 0x27020223, 0x19000404, 0x19000404},
+        {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
+        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
         {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000603, 0x1b000603},
         {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000a02, 0x1f000a02},
         {0x0000a528, 0x34022225, 0x34022225, 0x23000a04, 0x23000a04},
@@ -1038,19 +1097,19 @@ static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
         {0x0000a544, 0x5302266c, 0x5302266c, 0x3b001861, 0x3b001861},
         {0x0000a548, 0x5702286c, 0x5702286c, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x5c04286b, 0x5c04286b, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x61042a6c, 0x61042a6c, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x66062a6c, 0x66062a6c, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x6b062e6c, 0x6b062e6c, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x7006308c, 0x7006308c, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x730a308a, 0x730a308a, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x770a308c, 0x770a308c, 0x56001eec, 0x56001eec},
+        {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42001a83, 0x42001a83},
+        {0x0000a550, 0x61024a6c, 0x61024a6c, 0x44001c84, 0x44001c84},
+        {0x0000a554, 0x66026a6c, 0x66026a6c, 0x48001ce3, 0x48001ce3},
+        {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c001ce5, 0x4c001ce5},
+        {0x0000a55c, 0x7002708c, 0x7002708c, 0x50001ce9, 0x50001ce9},
+        {0x0000a560, 0x7302b08a, 0x7302b08a, 0x54001ceb, 0x54001ceb},
+        {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
+        {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001eec, 0x56001eec},
         {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
         {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
         {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
@@ -1083,14 +1142,36 @@ static const u32 ar9340Modes_mixed_ob_db_tx_gain_table_1p0[][5] = {
         {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
         {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
         {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801eec, 0x56801eec},
+        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
+        {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
+        {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
+        {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
+        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
+        {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
+        {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
+        {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
+        {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
+        {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
+        {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
+        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
         {0x00016044, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
-        {0x00016048, 0x24927266, 0x24927266, 0x8e483266, 0x8e483266},
+        {0x00016048, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
+        {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
+        {0x00016288, 0x30318000, 0x30318000, 0x00318000, 0x00318000},
         {0x00016444, 0x056db2db, 0x056db2db, 0x03b6d2e4, 0x03b6d2e4},
-        {0x00016448, 0x24927266, 0x24927266, 0x8e482266, 0x8e482266},
+        {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
 };
 
 static const u32 ar9340_1p0_mac_core[][2] = {
-        /*    Addr        allmodes        */
+        /* Addr      allmodes  */
         {0x00000008, 0x00000000},
         {0x00000030, 0x00020085},
         {0x00000034, 0x00000005},
@@ -1119,6 +1200,7 @@ static const u32 ar9340_1p0_mac_core[][2] = {
         {0x00008004, 0x00000000},
         {0x00008008, 0x00000000},
         {0x0000800c, 0x00000000},
+        {0x00008010, 0x00080800},
         {0x00008018, 0x00000000},
         {0x00008020, 0x00000000},
         {0x00008038, 0x00000000},
@@ -1146,7 +1228,7 @@ static const u32 ar9340_1p0_mac_core[][2] = {
         {0x000080bc, 0x00000000},
         {0x000080c0, 0x2a800000},
         {0x000080c4, 0x06900168},
-        {0x000080c8, 0x13881c20},
+        {0x000080c8, 0x13881c22},
         {0x000080cc, 0x01f40000},
         {0x000080d0, 0x00252500},
         {0x000080d4, 0x00a00000},
@@ -1250,276 +1332,17 @@ static const u32 ar9340_1p0_mac_core[][2] = {
         {0x000083c4, 0x00000000},
         {0x000083c8, 0x00000000},
         {0x000083cc, 0x00000200},
-        {0x000083d0, 0x000301ff},
+        {0x000083d0, 0x000101ff},
 };
 
-static const u32 ar9340Common_wo_xlna_rx_gain_table_1p0[][2] = {
-        /*    Addr        allmodes        */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x00830082},
-        {0x0000a014, 0x01810180},
-        {0x0000a018, 0x01830182},
-        {0x0000a01c, 0x01850184},
-        {0x0000a020, 0x01890188},
-        {0x0000a024, 0x018b018a},
-        {0x0000a028, 0x018d018c},
-        {0x0000a02c, 0x03820190},
-        {0x0000a030, 0x03840383},
-        {0x0000a034, 0x03880385},
-        {0x0000a038, 0x038a0389},
-        {0x0000a03c, 0x038c038b},
-        {0x0000a040, 0x0390038d},
-        {0x0000a044, 0x03920391},
-        {0x0000a048, 0x03940393},
-        {0x0000a04c, 0x03960395},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x29292929},
-        {0x0000a084, 0x29292929},
-        {0x0000a088, 0x29292929},
-        {0x0000a08c, 0x29292929},
-        {0x0000a090, 0x22292929},
-        {0x0000a094, 0x1d1d2222},
-        {0x0000a098, 0x0c111117},
-        {0x0000a09c, 0x00030303},
-        {0x0000a0a0, 0x00000000},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x01000101},
-        {0x0000a0c8, 0x011e011f},
-        {0x0000a0cc, 0x011c011d},
-        {0x0000a0d0, 0x02030204},
-        {0x0000a0d4, 0x02010202},
-        {0x0000a0d8, 0x021f0200},
-        {0x0000a0dc, 0x0302021e},
-        {0x0000a0e0, 0x03000301},
-        {0x0000a0e4, 0x031e031f},
-        {0x0000a0e8, 0x0402031d},
-        {0x0000a0ec, 0x04000401},
-        {0x0000a0f0, 0x041e041f},
-        {0x0000a0f4, 0x0502041d},
-        {0x0000a0f8, 0x05000501},
-        {0x0000a0fc, 0x051e051f},
-        {0x0000a100, 0x06010602},
-        {0x0000a104, 0x061f0600},
-        {0x0000a108, 0x061d061e},
-        {0x0000a10c, 0x07020703},
-        {0x0000a110, 0x07000701},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x01000101},
-        {0x0000a148, 0x011e011f},
-        {0x0000a14c, 0x011c011d},
-        {0x0000a150, 0x02030204},
-        {0x0000a154, 0x02010202},
-        {0x0000a158, 0x021f0200},
-        {0x0000a15c, 0x0302021e},
-        {0x0000a160, 0x03000301},
-        {0x0000a164, 0x031e031f},
-        {0x0000a168, 0x0402031d},
-        {0x0000a16c, 0x04000401},
-        {0x0000a170, 0x041e041f},
-        {0x0000a174, 0x0502041d},
-        {0x0000a178, 0x05000501},
-        {0x0000a17c, 0x051e051f},
-        {0x0000a180, 0x06010602},
-        {0x0000a184, 0x061f0600},
-        {0x0000a188, 0x061d061e},
-        {0x0000a18c, 0x07020703},
-        {0x0000a190, 0x07000701},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000196},
-        {0x0000b000, 0x00010000},
-        {0x0000b004, 0x00030002},
-        {0x0000b008, 0x00050004},
-        {0x0000b00c, 0x00810080},
-        {0x0000b010, 0x00830082},
-        {0x0000b014, 0x01810180},
-        {0x0000b018, 0x01830182},
-        {0x0000b01c, 0x01850184},
-        {0x0000b020, 0x02810280},
-        {0x0000b024, 0x02830282},
-        {0x0000b028, 0x02850284},
-        {0x0000b02c, 0x02890288},
-        {0x0000b030, 0x028b028a},
-        {0x0000b034, 0x0388028c},
-        {0x0000b038, 0x038a0389},
-        {0x0000b03c, 0x038c038b},
-        {0x0000b040, 0x0390038d},
-        {0x0000b044, 0x03920391},
-        {0x0000b048, 0x03940393},
-        {0x0000b04c, 0x03960395},
-        {0x0000b050, 0x00000000},
-        {0x0000b054, 0x00000000},
-        {0x0000b058, 0x00000000},
-        {0x0000b05c, 0x00000000},
-        {0x0000b060, 0x00000000},
-        {0x0000b064, 0x00000000},
-        {0x0000b068, 0x00000000},
-        {0x0000b06c, 0x00000000},
-        {0x0000b070, 0x00000000},
-        {0x0000b074, 0x00000000},
-        {0x0000b078, 0x00000000},
-        {0x0000b07c, 0x00000000},
-        {0x0000b080, 0x32323232},
-        {0x0000b084, 0x2f2f3232},
-        {0x0000b088, 0x23282a2d},
-        {0x0000b08c, 0x1c1e2123},
-        {0x0000b090, 0x14171919},
-        {0x0000b094, 0x0e0e1214},
-        {0x0000b098, 0x03050707},
-        {0x0000b09c, 0x00030303},
-        {0x0000b0a0, 0x00000000},
-        {0x0000b0a4, 0x00000000},
-        {0x0000b0a8, 0x00000000},
-        {0x0000b0ac, 0x00000000},
-        {0x0000b0b0, 0x00000000},
-        {0x0000b0b4, 0x00000000},
-        {0x0000b0b8, 0x00000000},
-        {0x0000b0bc, 0x00000000},
-        {0x0000b0c0, 0x003f0020},
-        {0x0000b0c4, 0x00400041},
-        {0x0000b0c8, 0x0140005f},
-        {0x0000b0cc, 0x0160015f},
-        {0x0000b0d0, 0x017e017f},
-        {0x0000b0d4, 0x02410242},
-        {0x0000b0d8, 0x025f0240},
-        {0x0000b0dc, 0x027f0260},
-        {0x0000b0e0, 0x0341027e},
-        {0x0000b0e4, 0x035f0340},
-        {0x0000b0e8, 0x037f0360},
-        {0x0000b0ec, 0x04400441},
-        {0x0000b0f0, 0x0460045f},
-        {0x0000b0f4, 0x0541047f},
-        {0x0000b0f8, 0x055f0540},
-        {0x0000b0fc, 0x057f0560},
-        {0x0000b100, 0x06400641},
-        {0x0000b104, 0x0660065f},
-        {0x0000b108, 0x067e067f},
-        {0x0000b10c, 0x07410742},
-        {0x0000b110, 0x075f0740},
-        {0x0000b114, 0x077f0760},
-        {0x0000b118, 0x07800781},
-        {0x0000b11c, 0x07a0079f},
-        {0x0000b120, 0x07c107bf},
-        {0x0000b124, 0x000007c0},
-        {0x0000b128, 0x00000000},
-        {0x0000b12c, 0x00000000},
-        {0x0000b130, 0x00000000},
-        {0x0000b134, 0x00000000},
-        {0x0000b138, 0x00000000},
-        {0x0000b13c, 0x00000000},
-        {0x0000b140, 0x003f0020},
-        {0x0000b144, 0x00400041},
-        {0x0000b148, 0x0140005f},
-        {0x0000b14c, 0x0160015f},
-        {0x0000b150, 0x017e017f},
-        {0x0000b154, 0x02410242},
-        {0x0000b158, 0x025f0240},
-        {0x0000b15c, 0x027f0260},
-        {0x0000b160, 0x0341027e},
-        {0x0000b164, 0x035f0340},
-        {0x0000b168, 0x037f0360},
-        {0x0000b16c, 0x04400441},
-        {0x0000b170, 0x0460045f},
-        {0x0000b174, 0x0541047f},
-        {0x0000b178, 0x055f0540},
-        {0x0000b17c, 0x057f0560},
-        {0x0000b180, 0x06400641},
-        {0x0000b184, 0x0660065f},
-        {0x0000b188, 0x067e067f},
-        {0x0000b18c, 0x07410742},
-        {0x0000b190, 0x075f0740},
-        {0x0000b194, 0x077f0760},
-        {0x0000b198, 0x07800781},
-        {0x0000b19c, 0x07a0079f},
-        {0x0000b1a0, 0x07c107bf},
-        {0x0000b1a4, 0x000007c0},
-        {0x0000b1a8, 0x00000000},
-        {0x0000b1ac, 0x00000000},
-        {0x0000b1b0, 0x00000000},
-        {0x0000b1b4, 0x00000000},
-        {0x0000b1b8, 0x00000000},
-        {0x0000b1bc, 0x00000000},
-        {0x0000b1c0, 0x00000000},
-        {0x0000b1c4, 0x00000000},
-        {0x0000b1c8, 0x00000000},
-        {0x0000b1cc, 0x00000000},
-        {0x0000b1d0, 0x00000000},
-        {0x0000b1d4, 0x00000000},
-        {0x0000b1d8, 0x00000000},
-        {0x0000b1dc, 0x00000000},
-        {0x0000b1e0, 0x00000000},
-        {0x0000b1e4, 0x00000000},
-        {0x0000b1e8, 0x00000000},
-        {0x0000b1ec, 0x00000000},
-        {0x0000b1f0, 0x00000396},
-        {0x0000b1f4, 0x00000396},
-        {0x0000b1f8, 0x00000396},
-        {0x0000b1fc, 0x00000196},
-};
+#define ar9340Common_wo_xlna_rx_gain_table_1p0 ar9300Common_wo_xlna_rx_gain_table_2p2
 
 static const u32 ar9340_1p0_soc_preamble[][2] = {
-        /*    Addr        allmodes        */
-        {0x000040a4, 0x00a0c1c9},
+        /* Addr      allmodes  */
         {0x00007008, 0x00000000},
         {0x00007020, 0x00000000},
         {0x00007034, 0x00000002},
         {0x00007038, 0x000004c2},
 };
 
-#endif
+#endif /* INITVALS_9340_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
index 8f406ff2c95e..4ef7dcccaa2f 100644
--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2010 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -61,7 +62,7 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = {
         {0x00009e44, 0x62321e27, 0x62321e27, 0xfe291e27, 0xfe291e27},
         {0x00009e48, 0x5030201a, 0x5030201a, 0x50302012, 0x50302012},
         {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
-        {0x0000a204, 0x013187c0, 0x013187c4, 0x013187c4, 0x013187c0},
+        {0x0000a204, 0x01318fc0, 0x01318fc4, 0x01318fc4, 0x01318fc0},
         {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
         {0x0000a22c, 0x01026a2f, 0x01026a27, 0x01026a2f, 0x01026a2f},
         {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
@@ -1007,7 +1008,7 @@ static const u32 ar9462_2p0_radio_core[][2] = {
 
 static const u32 ar9462_2p0_soc_preamble[][2] = {
         /* Addr      allmodes  */
-        {0x000040a4 ,0x00a0c1c9},
+        {0x000040a4, 0x00a0c1c9},
         {0x00007020, 0x00000000},
         {0x00007034, 0x00000002},
         {0x00007038, 0x000004c2},
diff --git a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
index d16d029f81a9..fb4497fc7a3d 100644
--- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -17,360 +18,151 @@
 #ifndef INITVALS_9485_H
 #define INITVALS_9485_H
 
-static const u32 ar9485_1_1_mac_core[][2] = {
-        /*  Addr       allmodes */
-        {0x00000008, 0x00000000},
-        {0x00000030, 0x00020085},
-        {0x00000034, 0x00000005},
-        {0x00000040, 0x00000000},
-        {0x00000044, 0x00000000},
-        {0x00000048, 0x00000008},
-        {0x0000004c, 0x00000010},
-        {0x00000050, 0x00000000},
-        {0x00001040, 0x002ffc0f},
-        {0x00001044, 0x002ffc0f},
-        {0x00001048, 0x002ffc0f},
-        {0x0000104c, 0x002ffc0f},
-        {0x00001050, 0x002ffc0f},
-        {0x00001054, 0x002ffc0f},
-        {0x00001058, 0x002ffc0f},
-        {0x0000105c, 0x002ffc0f},
-        {0x00001060, 0x002ffc0f},
-        {0x00001064, 0x002ffc0f},
-        {0x000010f0, 0x00000100},
-        {0x00001270, 0x00000000},
-        {0x000012b0, 0x00000000},
-        {0x000012f0, 0x00000000},
-        {0x0000143c, 0x00000000},
-        {0x0000147c, 0x00000000},
-        {0x00008000, 0x00000000},
-        {0x00008004, 0x00000000},
-        {0x00008008, 0x00000000},
-        {0x0000800c, 0x00000000},
-        {0x00008018, 0x00000000},
-        {0x00008020, 0x00000000},
-        {0x00008038, 0x00000000},
-        {0x0000803c, 0x00000000},
-        {0x00008040, 0x00000000},
-        {0x00008044, 0x00000000},
-        {0x00008048, 0x00000000},
-        {0x0000804c, 0xffffffff},
-        {0x00008054, 0x00000000},
-        {0x00008058, 0x00000000},
-        {0x0000805c, 0x000fc78f},
-        {0x00008060, 0x0000000f},
-        {0x00008064, 0x00000000},
-        {0x00008070, 0x00000310},
-        {0x00008074, 0x00000020},
-        {0x00008078, 0x00000000},
-        {0x0000809c, 0x0000000f},
-        {0x000080a0, 0x00000000},
-        {0x000080a4, 0x02ff0000},
-        {0x000080a8, 0x0e070605},
-        {0x000080ac, 0x0000000d},
-        {0x000080b0, 0x00000000},
-        {0x000080b4, 0x00000000},
-        {0x000080b8, 0x00000000},
-        {0x000080bc, 0x00000000},
-        {0x000080c0, 0x2a800000},
-        {0x000080c4, 0x06900168},
-        {0x000080c8, 0x13881c22},
-        {0x000080cc, 0x01f40000},
-        {0x000080d0, 0x00252500},
-        {0x000080d4, 0x00a00000},
-        {0x000080d8, 0x00400000},
-        {0x000080dc, 0x00000000},
-        {0x000080e0, 0xffffffff},
-        {0x000080e4, 0x0000ffff},
-        {0x000080e8, 0x3f3f3f3f},
-        {0x000080ec, 0x00000000},
-        {0x000080f0, 0x00000000},
-        {0x000080f4, 0x00000000},
-        {0x000080fc, 0x00020000},
-        {0x00008100, 0x00000000},
-        {0x00008108, 0x00000052},
-        {0x0000810c, 0x00000000},
-        {0x00008110, 0x00000000},
-        {0x00008114, 0x000007ff},
-        {0x00008118, 0x000000aa},
-        {0x0000811c, 0x00003210},
-        {0x00008124, 0x00000000},
-        {0x00008128, 0x00000000},
-        {0x0000812c, 0x00000000},
-        {0x00008130, 0x00000000},
-        {0x00008134, 0x00000000},
-        {0x00008138, 0x00000000},
-        {0x0000813c, 0x0000ffff},
-        {0x00008144, 0xffffffff},
-        {0x00008168, 0x00000000},
-        {0x0000816c, 0x00000000},
-        {0x00008170, 0x18486200},
-        {0x00008174, 0x33332210},
-        {0x00008178, 0x00000000},
-        {0x0000817c, 0x00020000},
-        {0x000081c0, 0x00000000},
-        {0x000081c4, 0x33332210},
-        {0x000081d4, 0x00000000},
-        {0x000081ec, 0x00000000},
-        {0x000081f0, 0x00000000},
-        {0x000081f4, 0x00000000},
-        {0x000081f8, 0x00000000},
-        {0x000081fc, 0x00000000},
-        {0x00008240, 0x00100000},
-        {0x00008244, 0x0010f400},
-        {0x00008248, 0x00000800},
-        {0x0000824c, 0x0001e800},
-        {0x00008250, 0x00000000},
-        {0x00008254, 0x00000000},
-        {0x00008258, 0x00000000},
-        {0x0000825c, 0x40000000},
-        {0x00008260, 0x00080922},
-        {0x00008264, 0x9ca00010},
-        {0x00008268, 0xffffffff},
-        {0x0000826c, 0x0000ffff},
-        {0x00008270, 0x00000000},
-        {0x00008274, 0x40000000},
-        {0x00008278, 0x003e4180},
-        {0x0000827c, 0x00000004},
-        {0x00008284, 0x0000002c},
-        {0x00008288, 0x0000002c},
-        {0x0000828c, 0x000000ff},
-        {0x00008294, 0x00000000},
-        {0x00008298, 0x00000000},
-        {0x0000829c, 0x00000000},
-        {0x00008300, 0x00000140},
-        {0x00008314, 0x00000000},
-        {0x0000831c, 0x0000010d},
-        {0x00008328, 0x00000000},
-        {0x0000832c, 0x00000007},
-        {0x00008330, 0x00000302},
-        {0x00008334, 0x00000700},
-        {0x00008338, 0x00ff0000},
-        {0x0000833c, 0x02400000},
-        {0x00008340, 0x000107ff},
-        {0x00008344, 0xa248105b},
-        {0x00008348, 0x008f0000},
-        {0x0000835c, 0x00000000},
-        {0x00008360, 0xffffffff},
-        {0x00008364, 0xffffffff},
-        {0x00008368, 0x00000000},
-        {0x00008370, 0x00000000},
-        {0x00008374, 0x000000ff},
-        {0x00008378, 0x00000000},
-        {0x0000837c, 0x00000000},
-        {0x00008380, 0xffffffff},
-        {0x00008384, 0xffffffff},
-        {0x00008390, 0xffffffff},
-        {0x00008394, 0xffffffff},
-        {0x00008398, 0x00000000},
-        {0x0000839c, 0x00000000},
-        {0x000083a0, 0x00000000},
-        {0x000083a4, 0x0000fa14},
-        {0x000083a8, 0x000f0c00},
-        {0x000083ac, 0x33332210},
-        {0x000083b0, 0x33332210},
-        {0x000083b4, 0x33332210},
-        {0x000083b8, 0x33332210},
-        {0x000083bc, 0x00000000},
-        {0x000083c0, 0x00000000},
-        {0x000083c4, 0x00000000},
-        {0x000083c8, 0x00000000},
-        {0x000083cc, 0x00000200},
-        {0x000083d0, 0x000301ff},
-};
+/* AR9485 1.0 */
 
-static const u32 ar9485_1_1_baseband_core[][2] = {
-        /* Addr       allmodes */
-        {0x00009800, 0xafe68e30},
-        {0x00009804, 0xfd14e000},
-        {0x00009808, 0x9c0a8f6b},
-        {0x0000980c, 0x04800000},
-        {0x00009814, 0x9280c00a},
-        {0x00009818, 0x00000000},
-        {0x0000981c, 0x00020028},
-        {0x00009834, 0x5f3ca3de},
-        {0x00009838, 0x0108ecff},
-        {0x0000983c, 0x14750600},
-        {0x00009880, 0x201fff00},
-        {0x00009884, 0x00001042},
-        {0x000098a4, 0x00200400},
-        {0x000098b0, 0x52440bbe},
-        {0x000098d0, 0x004b6a8e},
-        {0x000098d4, 0x00000820},
-        {0x000098dc, 0x00000000},
-        {0x000098f0, 0x00000000},
-        {0x000098f4, 0x00000000},
-        {0x00009c04, 0x00000000},
-        {0x00009c08, 0x03200000},
-        {0x00009c0c, 0x00000000},
-        {0x00009c10, 0x00000000},
-        {0x00009c14, 0x00046384},
-        {0x00009c18, 0x05b6b440},
-        {0x00009c1c, 0x00b6b440},
-        {0x00009d00, 0xc080a333},
-        {0x00009d04, 0x40206c10},
-        {0x00009d08, 0x009c4060},
-        {0x00009d0c, 0x1883800a},
-        {0x00009d10, 0x01834061},
-        {0x00009d14, 0x00c00400},
-        {0x00009d18, 0x00000000},
-        {0x00009d1c, 0x00000000},
-        {0x00009e08, 0x0038233c},
-        {0x00009e24, 0x9927b515},
-        {0x00009e28, 0x12ef0200},
-        {0x00009e30, 0x06336f77},
-        {0x00009e34, 0x6af6532f},
-        {0x00009e38, 0x0cc80c00},
-        {0x00009e40, 0x0d261820},
-        {0x00009e4c, 0x00001004},
-        {0x00009e50, 0x00ff03f1},
-        {0x00009fc0, 0x80be4788},
-        {0x00009fc4, 0x0001efb5},
-        {0x00009fcc, 0x40000014},
-        {0x0000a20c, 0x00000000},
-        {0x0000a210, 0x00000000},
-        {0x0000a220, 0x00000000},
-        {0x0000a224, 0x00000000},
-        {0x0000a228, 0x10002310},
-        {0x0000a23c, 0x00000000},
-        {0x0000a244, 0x0c000000},
-        {0x0000a2a0, 0x00000001},
-        {0x0000a2c0, 0x00000001},
-        {0x0000a2c8, 0x00000000},
-        {0x0000a2cc, 0x18c43433},
-        {0x0000a2d4, 0x00000000},
-        {0x0000a2dc, 0x00000000},
-        {0x0000a2e0, 0x00000000},
-        {0x0000a2e4, 0x00000000},
-        {0x0000a2e8, 0x00000000},
-        {0x0000a2ec, 0x00000000},
-        {0x0000a2f0, 0x00000000},
-        {0x0000a2f4, 0x00000000},
-        {0x0000a2f8, 0x00000000},
-        {0x0000a344, 0x00000000},
-        {0x0000a34c, 0x00000000},
-        {0x0000a350, 0x0000a000},
-        {0x0000a364, 0x00000000},
-        {0x0000a370, 0x00000000},
-        {0x0000a390, 0x00000001},
-        {0x0000a394, 0x00000444},
-        {0x0000a398, 0x001f0e0f},
-        {0x0000a39c, 0x0075393f},
-        {0x0000a3a0, 0xb79f6427},
-        {0x0000a3a4, 0x000000ff},
-        {0x0000a3a8, 0x3b3b3b3b},
-        {0x0000a3ac, 0x2f2f2f2f},
-        {0x0000a3c0, 0x20202020},
-        {0x0000a3c4, 0x22222220},
-        {0x0000a3c8, 0x20200020},
-        {0x0000a3cc, 0x20202020},
-        {0x0000a3d0, 0x20202020},
-        {0x0000a3d4, 0x20202020},
-        {0x0000a3d8, 0x20202020},
-        {0x0000a3dc, 0x20202020},
-        {0x0000a3e0, 0x20202020},
-        {0x0000a3e4, 0x20202020},
-        {0x0000a3e8, 0x20202020},
-        {0x0000a3ec, 0x20202020},
-        {0x0000a3f0, 0x00000000},
-        {0x0000a3f4, 0x00000006},
-        {0x0000a3f8, 0x0cdbd380},
-        {0x0000a3fc, 0x000f0f01},
-        {0x0000a400, 0x8fa91f01},
-        {0x0000a404, 0x00000000},
-        {0x0000a408, 0x0e79e5c6},
-        {0x0000a40c, 0x00820820},
-        {0x0000a414, 0x1ce739cf},
-        {0x0000a418, 0x2d0019ce},
-        {0x0000a41c, 0x1ce739ce},
-        {0x0000a420, 0x000001ce},
-        {0x0000a424, 0x1ce739ce},
-        {0x0000a428, 0x000001ce},
-        {0x0000a42c, 0x1ce739ce},
-        {0x0000a430, 0x1ce739ce},
-        {0x0000a434, 0x00000000},
-        {0x0000a438, 0x00001801},
-        {0x0000a43c, 0x00000000},
-        {0x0000a440, 0x00000000},
-        {0x0000a444, 0x00000000},
-        {0x0000a448, 0x04000000},
-        {0x0000a44c, 0x00000001},
-        {0x0000a450, 0x00010000},
-        {0x0000a5c4, 0xbfad9d74},
-        {0x0000a5c8, 0x0048060a},
-        {0x0000a5cc, 0x00000637},
-        {0x0000a760, 0x03020100},
-        {0x0000a764, 0x09080504},
-        {0x0000a768, 0x0d0c0b0a},
-        {0x0000a76c, 0x13121110},
-        {0x0000a770, 0x31301514},
-        {0x0000a774, 0x35343332},
-        {0x0000a778, 0x00000036},
-        {0x0000a780, 0x00000838},
-        {0x0000a7c0, 0x00000000},
-        {0x0000a7c4, 0xfffffffc},
-        {0x0000a7c8, 0x00000000},
-        {0x0000a7cc, 0x00000000},
-        {0x0000a7d0, 0x00000000},
-        {0x0000a7d4, 0x00000004},
-        {0x0000a7dc, 0x00000000},
-};
+#define ar9485_1_1_mac_postamble ar9300_2p2_mac_postamble
 
-static const u32 ar9485Common_1_1[][2] = {
-        /*  Addr      allmodes */
-        {0x00007010, 0x00000022},
-        {0x00007020, 0x00000000},
-        {0x00007034, 0x00000002},
-        {0x00007038, 0x000004c2},
+static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
+        /* Addr      allmodes  */
+        {0x00018c00, 0x18012e5e},
+        {0x00018c04, 0x000801d8},
+        {0x00018c08, 0x0000080c},
 };
 
-static const u32 ar9485_1_1_baseband_postamble[][5] = {
-        /* Addr       5G_HT20        5G_HT40       2G_HT40       2G_HT20 */
-        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
-        {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
-        {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
-        {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
-        {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
-        {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
-        {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
-        {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
-        {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
-        {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
-        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec80d2e, 0x7ec80d2e},
-        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
-        {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
-        {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
-        {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
-        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
-        {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324},
-        {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010},
-        {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
-        {0x0000a204, 0x01303fc0, 0x01303fc4, 0x01303fc4, 0x01303fc0},
-        {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
-        {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
-        {0x0000a234, 0x10000fff, 0x10000fff, 0x10000fff, 0x10000fff},
-        {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
-        {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
-        {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
-        {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
-        {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
-        {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501},
-        {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
-        {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
-        {0x0000a284, 0x00000000, 0x00000000, 0x000002a0, 0x000002a0},
-        {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
-        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071982, 0x00071982},
-        {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
-        {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000be04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
-        {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+static const u32 ar9485Common_wo_xlna_rx_gain_1_1[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a000, 0x00060005},
+        {0x0000a004, 0x00810080},
+        {0x0000a008, 0x00830082},
+        {0x0000a00c, 0x00850084},
+        {0x0000a010, 0x01820181},
+        {0x0000a014, 0x01840183},
+        {0x0000a018, 0x01880185},
+        {0x0000a01c, 0x018a0189},
+        {0x0000a020, 0x02850284},
+        {0x0000a024, 0x02890288},
+        {0x0000a028, 0x028b028a},
+        {0x0000a02c, 0x03850384},
+        {0x0000a030, 0x03890388},
+        {0x0000a034, 0x038b038a},
+        {0x0000a038, 0x038d038c},
+        {0x0000a03c, 0x03910390},
+        {0x0000a040, 0x03930392},
+        {0x0000a044, 0x03950394},
+        {0x0000a048, 0x00000396},
+        {0x0000a04c, 0x00000000},
+        {0x0000a050, 0x00000000},
+        {0x0000a054, 0x00000000},
+        {0x0000a058, 0x00000000},
+        {0x0000a05c, 0x00000000},
+        {0x0000a060, 0x00000000},
+        {0x0000a064, 0x00000000},
+        {0x0000a068, 0x00000000},
+        {0x0000a06c, 0x00000000},
+        {0x0000a070, 0x00000000},
+        {0x0000a074, 0x00000000},
+        {0x0000a078, 0x00000000},
+        {0x0000a07c, 0x00000000},
+        {0x0000a080, 0x28282828},
+        {0x0000a084, 0x28282828},
+        {0x0000a088, 0x28282828},
+        {0x0000a08c, 0x28282828},
+        {0x0000a090, 0x28282828},
+        {0x0000a094, 0x24242428},
+        {0x0000a098, 0x171e1e1e},
+        {0x0000a09c, 0x02020b0b},
+        {0x0000a0a0, 0x02020202},
+        {0x0000a0a4, 0x00000000},
+        {0x0000a0a8, 0x00000000},
+        {0x0000a0ac, 0x00000000},
+        {0x0000a0b0, 0x00000000},
+        {0x0000a0b4, 0x00000000},
+        {0x0000a0b8, 0x00000000},
+        {0x0000a0bc, 0x00000000},
+        {0x0000a0c0, 0x22072208},
+        {0x0000a0c4, 0x22052206},
+        {0x0000a0c8, 0x22032204},
+        {0x0000a0cc, 0x22012202},
+        {0x0000a0d0, 0x221f2200},
+        {0x0000a0d4, 0x221d221e},
+        {0x0000a0d8, 0x33023303},
+        {0x0000a0dc, 0x33003301},
+        {0x0000a0e0, 0x331e331f},
+        {0x0000a0e4, 0x4402331d},
+        {0x0000a0e8, 0x44004401},
+        {0x0000a0ec, 0x441e441f},
+        {0x0000a0f0, 0x55025503},
+        {0x0000a0f4, 0x55005501},
+        {0x0000a0f8, 0x551e551f},
+        {0x0000a0fc, 0x6602551d},
+        {0x0000a100, 0x66006601},
+        {0x0000a104, 0x661e661f},
+        {0x0000a108, 0x7703661d},
+        {0x0000a10c, 0x77017702},
+        {0x0000a110, 0x00007700},
+        {0x0000a114, 0x00000000},
+        {0x0000a118, 0x00000000},
+        {0x0000a11c, 0x00000000},
+        {0x0000a120, 0x00000000},
+        {0x0000a124, 0x00000000},
+        {0x0000a128, 0x00000000},
+        {0x0000a12c, 0x00000000},
+        {0x0000a130, 0x00000000},
+        {0x0000a134, 0x00000000},
+        {0x0000a138, 0x00000000},
+        {0x0000a13c, 0x00000000},
+        {0x0000a140, 0x001f0000},
+        {0x0000a144, 0x111f1100},
+        {0x0000a148, 0x111d111e},
+        {0x0000a14c, 0x111b111c},
+        {0x0000a150, 0x22032204},
+        {0x0000a154, 0x22012202},
+        {0x0000a158, 0x221f2200},
+        {0x0000a15c, 0x221d221e},
+        {0x0000a160, 0x33013302},
+        {0x0000a164, 0x331f3300},
+        {0x0000a168, 0x4402331e},
+        {0x0000a16c, 0x44004401},
+        {0x0000a170, 0x441e441f},
+        {0x0000a174, 0x55015502},
+        {0x0000a178, 0x551f5500},
+        {0x0000a17c, 0x6602551e},
+        {0x0000a180, 0x66006601},
+        {0x0000a184, 0x661e661f},
+        {0x0000a188, 0x7703661d},
+        {0x0000a18c, 0x77017702},
+        {0x0000a190, 0x00007700},
+        {0x0000a194, 0x00000000},
+        {0x0000a198, 0x00000000},
+        {0x0000a19c, 0x00000000},
+        {0x0000a1a0, 0x00000000},
+        {0x0000a1a4, 0x00000000},
+        {0x0000a1a8, 0x00000000},
+        {0x0000a1ac, 0x00000000},
+        {0x0000a1b0, 0x00000000},
+        {0x0000a1b4, 0x00000000},
+        {0x0000a1b8, 0x00000000},
+        {0x0000a1bc, 0x00000000},
+        {0x0000a1c0, 0x00000000},
+        {0x0000a1c4, 0x00000000},
+        {0x0000a1c8, 0x00000000},
+        {0x0000a1cc, 0x00000000},
+        {0x0000a1d0, 0x00000000},
+        {0x0000a1d4, 0x00000000},
+        {0x0000a1d8, 0x00000000},
+        {0x0000a1dc, 0x00000000},
+        {0x0000a1e0, 0x00000000},
+        {0x0000a1e4, 0x00000000},
+        {0x0000a1e8, 0x00000000},
+        {0x0000a1ec, 0x00000000},
+        {0x0000a1f0, 0x00000396},
+        {0x0000a1f4, 0x00000396},
+        {0x0000a1f8, 0x00000396},
+        {0x0000a1fc, 0x00000296},
 };
 
-static const u32 ar9485Modes_high_ob_db_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
+static const u32 ar9485Modes_high_power_tx_gain_1_1[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
         {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
         {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
@@ -442,102 +234,34 @@ static const u32 ar9485Modes_high_ob_db_tx_gain_1_1[][5] = {
         {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
 };
 
-static const u32 ar9485_modes_lowest_ob_db_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20  */
-        {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-};
+#define ar9485Modes_high_ob_db_tx_gain_1_1 ar9485Modes_high_power_tx_gain_1_1
 
-static const u32 ar9485_1_1_radio_postamble[][2] = {
-        /* Addr        allmodes */
-        {0x0001609c, 0x0b283f31},
-        {0x000160ac, 0x24611800},
-        {0x000160b0, 0x03284f3e},
-        {0x0001610c, 0x00170000},
-        {0x00016140, 0x50804008},
-};
+#define ar9485Modes_low_ob_db_tx_gain_1_1 ar9485Modes_high_ob_db_tx_gain_1_1
 
-static const u32 ar9485_1_1_mac_postamble[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
+#define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1
+
+static const u32 ar9485_1_1[][2] = {
+        /* Addr      allmodes  */
+        {0x0000a580, 0x00000000},
+        {0x0000a584, 0x00000000},
+        {0x0000a588, 0x00000000},
+        {0x0000a58c, 0x00000000},
+        {0x0000a590, 0x00000000},
+        {0x0000a594, 0x00000000},
+        {0x0000a598, 0x00000000},
+        {0x0000a59c, 0x00000000},
+        {0x0000a5a0, 0x00000000},
+        {0x0000a5a4, 0x00000000},
+        {0x0000a5a8, 0x00000000},
+        {0x0000a5ac, 0x00000000},
+        {0x0000a5b0, 0x00000000},
+        {0x0000a5b4, 0x00000000},
+        {0x0000a5b8, 0x00000000},
+        {0x0000a5bc, 0x00000000},
 };
 
 static const u32 ar9485_1_1_radio_core[][2] = {
-        /* Addr        allmodes */
+        /* Addr      allmodes  */
         {0x00016000, 0x36db6db6},
         {0x00016004, 0x6db6db40},
         {0x00016008, 0x73800000},
@@ -601,294 +325,145 @@ static const u32 ar9485_1_1_radio_core[][2] = {
         {0x00016c44, 0x12000000},
 };
 
-static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
-        /* Addr        allmodes */
-        {0x00018c00, 0x18052e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
-};
-
-static const u32 ar9485Modes_high_power_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
-        {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-};
-
-static const u32 ar9485_1_1[][2] = {
-        /* Addr        allmodes */
-        {0x0000a580, 0x00000000},
-        {0x0000a584, 0x00000000},
-        {0x0000a588, 0x00000000},
-        {0x0000a58c, 0x00000000},
-        {0x0000a590, 0x00000000},
-        {0x0000a594, 0x00000000},
-        {0x0000a598, 0x00000000},
-        {0x0000a59c, 0x00000000},
-        {0x0000a5a0, 0x00000000},
-        {0x0000a5a4, 0x00000000},
-        {0x0000a5a8, 0x00000000},
-        {0x0000a5ac, 0x00000000},
-        {0x0000a5b0, 0x00000000},
-        {0x0000a5b4, 0x00000000},
-        {0x0000a5b8, 0x00000000},
-        {0x0000a5bc, 0x00000000},
-};
-
-static const u32 ar9485_modes_green_ob_db_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20 */
-        {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
-        {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x06000203, 0x06000203},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x15000604, 0x15000604},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x18000605, 0x18000605},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000a04, 0x1c000a04},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x21000a06, 0x21000a06},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x29000a24, 0x29000a24},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2f000e21, 0x2f000e21},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000e20, 0x31000e20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x33000e20, 0x33000e20},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
-        {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
-        {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
-        {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
-        {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
-        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-};
-
-static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
-        /* Addr        allmodes */
-        {0x00018c00, 0x18013e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
-};
-
-static const u32 ar9485_1_1_soc_preamble[][2] = {
-        /* Addr        allmodes */
-        {0x00004014, 0xba280400},
-        {0x00004090, 0x00aa10aa},
-        {0x000040a4, 0x00a0c9c9},
-        {0x00007010, 0x00000022},
-        {0x00007020, 0x00000000},
-        {0x00007034, 0x00000002},
-        {0x00007038, 0x000004c2},
-        {0x00007048, 0x00000002},
-};
-
-static const u32 ar9485_1_1_baseband_core_txfir_coeff_japan_2484[][2] = {
-        /* Addr        allmodes */
-        {0x0000a398, 0x00000000},
-        {0x0000a39c, 0x6f7f0301},
-        {0x0000a3a0, 0xca9228ee},
-};
-
-static const u32 ar9485Modes_low_ob_db_tx_gain_1_1[][5] = {
-        /* Addr        5G_HT20       5G_HT40       2G_HT40       2G_HT20  */
-        {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
-        {0x0000a458, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a500, 0x00022200, 0x00022200, 0x00000000, 0x00000000},
-        {0x0000a504, 0x05062002, 0x05062002, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0c002e00, 0x0c002e00, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x11062202, 0x11062202, 0x0d000200, 0x0d000200},
-        {0x0000a510, 0x17022e00, 0x17022e00, 0x11000202, 0x11000202},
-        {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x15000400, 0x15000400},
-        {0x0000a518, 0x25020ec0, 0x25020ec0, 0x19000402, 0x19000402},
-        {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1d000404, 0x1d000404},
-        {0x0000a520, 0x2f001f04, 0x2f001f04, 0x21000603, 0x21000603},
-        {0x0000a524, 0x35001fc4, 0x35001fc4, 0x25000605, 0x25000605},
-        {0x0000a528, 0x3c022f04, 0x3c022f04, 0x2a000a03, 0x2a000a03},
-        {0x0000a52c, 0x41023e85, 0x41023e85, 0x2c000a04, 0x2c000a04},
-        {0x0000a530, 0x48023ec6, 0x48023ec6, 0x34000e20, 0x34000e20},
-        {0x0000a534, 0x4d023f01, 0x4d023f01, 0x35000e21, 0x35000e21},
-        {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
-        {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
-        {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
-        {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
-        {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
-        {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
-        {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
-        {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
-        {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
-        {0x0000b500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b504, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b508, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b50c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b510, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b514, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b518, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b51c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b520, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b524, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b528, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b52c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b530, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b534, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b538, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b53c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b540, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b544, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b548, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b54c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b550, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b554, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b558, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b55c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b560, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b564, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b568, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b56c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b570, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b574, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b578, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000b57c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
-        {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
-};
-
-static const u32 ar9485_fast_clock_1_1_baseband_postamble[][3] = {
-        /* Addr        5G_HT2        5G_HT40  */
-        {0x00009e00, 0x03721821, 0x03721821},
-        {0x0000a230, 0x0000400b, 0x00004016},
-        {0x0000a254, 0x00000898, 0x00001130},
-};
-
-static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_disable_L1[][2] = {
-        /* Addr        allmodes  */
-        {0x00018c00, 0x18012e5e},
-        {0x00018c04, 0x000801d8},
-        {0x00018c08, 0x0000080c},
+static const u32 ar9485_1_1_baseband_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00009800, 0xafe68e30},
+        {0x00009804, 0xfd14e000},
+        {0x00009808, 0x9c0a8f6b},
+        {0x0000980c, 0x04800000},
+        {0x00009814, 0x9280c00a},
+        {0x00009818, 0x00000000},
+        {0x0000981c, 0x00020028},
+        {0x00009834, 0x5f3ca3de},
+        {0x00009838, 0x0108ecff},
+        {0x0000983c, 0x14750600},
+        {0x00009880, 0x201fff00},
+        {0x00009884, 0x00001042},
+        {0x000098a4, 0x00200400},
+        {0x000098b0, 0x52440bbe},
+        {0x000098d0, 0x004b6a8e},
+        {0x000098d4, 0x00000820},
+        {0x000098dc, 0x00000000},
+        {0x000098f0, 0x00000000},
+        {0x000098f4, 0x00000000},
+        {0x00009c04, 0x00000000},
+        {0x00009c08, 0x03200000},
+        {0x00009c0c, 0x00000000},
+        {0x00009c10, 0x00000000},
+        {0x00009c14, 0x00046384},
+        {0x00009c18, 0x05b6b440},
+        {0x00009c1c, 0x00b6b440},
+        {0x00009d00, 0xc080a333},
+        {0x00009d04, 0x40206c10},
+        {0x00009d08, 0x009c4060},
+        {0x00009d0c, 0x1883800a},
+        {0x00009d10, 0x01834061},
+        {0x00009d14, 0x00c00400},
+        {0x00009d18, 0x00000000},
+        {0x00009d1c, 0x00000000},
+        {0x00009e08, 0x0038233c},
+        {0x00009e24, 0x9927b515},
+        {0x00009e28, 0x12ef0200},
+        {0x00009e30, 0x06336f77},
+        {0x00009e34, 0x6af6532f},
+        {0x00009e38, 0x0cc80c00},
+        {0x00009e40, 0x0d261820},
+        {0x00009e4c, 0x00001004},
+        {0x00009e50, 0x00ff03f1},
+        {0x00009fc0, 0x80be4788},
+        {0x00009fc4, 0x0001efb5},
+        {0x00009fcc, 0x40000014},
+        {0x0000a20c, 0x00000000},
+        {0x0000a210, 0x00000000},
+        {0x0000a220, 0x00000000},
+        {0x0000a224, 0x00000000},
+        {0x0000a228, 0x10002310},
+        {0x0000a23c, 0x00000000},
+        {0x0000a244, 0x0c000000},
+        {0x0000a2a0, 0x00000001},
+        {0x0000a2c0, 0x00000001},
+        {0x0000a2c8, 0x00000000},
+        {0x0000a2cc, 0x18c43433},
+        {0x0000a2d4, 0x00000000},
+        {0x0000a2dc, 0x00000000},
+        {0x0000a2e0, 0x00000000},
+        {0x0000a2e4, 0x00000000},
+        {0x0000a2e8, 0x00000000},
+        {0x0000a2ec, 0x00000000},
+        {0x0000a2f0, 0x00000000},
+        {0x0000a2f4, 0x00000000},
+        {0x0000a2f8, 0x00000000},
+        {0x0000a344, 0x00000000},
+        {0x0000a34c, 0x00000000},
+        {0x0000a350, 0x0000a000},
+        {0x0000a364, 0x00000000},
+        {0x0000a370, 0x00000000},
+        {0x0000a390, 0x00000001},
+        {0x0000a394, 0x00000444},
+        {0x0000a398, 0x001f0e0f},
+        {0x0000a39c, 0x0075393f},
+        {0x0000a3a0, 0xb79f6427},
+        {0x0000a3a4, 0x000000ff},
+        {0x0000a3a8, 0x3b3b3b3b},
+        {0x0000a3ac, 0x2f2f2f2f},
+        {0x0000a3c0, 0x20202020},
+        {0x0000a3c4, 0x22222220},
+        {0x0000a3c8, 0x20200020},
+        {0x0000a3cc, 0x20202020},
+        {0x0000a3d0, 0x20202020},
+        {0x0000a3d4, 0x20202020},
+        {0x0000a3d8, 0x20202020},
+        {0x0000a3dc, 0x20202020},
+        {0x0000a3e0, 0x20202020},
+        {0x0000a3e4, 0x20202020},
+        {0x0000a3e8, 0x20202020},
+        {0x0000a3ec, 0x20202020},
+        {0x0000a3f0, 0x00000000},
+        {0x0000a3f4, 0x00000006},
+        {0x0000a3f8, 0x0cdbd380},
+        {0x0000a3fc, 0x000f0f01},
+        {0x0000a400, 0x8fa91f01},
+        {0x0000a404, 0x00000000},
+        {0x0000a408, 0x0e79e5c6},
+        {0x0000a40c, 0x00820820},
+        {0x0000a414, 0x1ce739cf},
+        {0x0000a418, 0x2d0019ce},
+        {0x0000a41c, 0x1ce739ce},
+        {0x0000a420, 0x000001ce},
+        {0x0000a424, 0x1ce739ce},
+        {0x0000a428, 0x000001ce},
+        {0x0000a42c, 0x1ce739ce},
+        {0x0000a430, 0x1ce739ce},
+        {0x0000a434, 0x00000000},
+        {0x0000a438, 0x00001801},
+        {0x0000a43c, 0x00000000},
+        {0x0000a440, 0x00000000},
+        {0x0000a444, 0x00000000},
+        {0x0000a448, 0x04000000},
+        {0x0000a44c, 0x00000001},
+        {0x0000a450, 0x00010000},
+        {0x0000a5c4, 0xbfad9d74},
+        {0x0000a5c8, 0x0048060a},
+        {0x0000a5cc, 0x00000637},
+        {0x0000a760, 0x03020100},
+        {0x0000a764, 0x09080504},
+        {0x0000a768, 0x0d0c0b0a},
+        {0x0000a76c, 0x13121110},
+        {0x0000a770, 0x31301514},
+        {0x0000a774, 0x35343332},
+        {0x0000a778, 0x00000036},
+        {0x0000a780, 0x00000838},
+        {0x0000a7c0, 0x00000000},
+        {0x0000a7c4, 0xfffffffc},
+        {0x0000a7c8, 0x00000000},
+        {0x0000a7cc, 0x00000000},
+        {0x0000a7d0, 0x00000000},
+        {0x0000a7d4, 0x00000004},
+        {0x0000a7dc, 0x00000000},
 };
 
 static const u32 ar9485_common_rx_gain_1_1[][2] = {
-        /* Addr        allmodes */
+        /* Addr      allmodes  */
         {0x0000a000, 0x00010000},
         {0x0000a004, 0x00030002},
         {0x0000a008, 0x00050004},
@@ -1019,143 +594,260 @@ static const u32 ar9485_common_rx_gain_1_1[][2] = {
         {0x0000a1fc, 0x00000296},
 };
 
+static const u32 ar9485_1_1_pcie_phy_pll_on_clkreq_enable_L1[][2] = {
+        /* Addr      allmodes  */
+        {0x00018c00, 0x18052e5e},
+        {0x00018c04, 0x000801d8},
+        {0x00018c08, 0x0000080c},
+};
+
 static const u32 ar9485_1_1_pcie_phy_clkreq_enable_L1[][2] = {
-        /* Addr        allmodes */
+        /* Addr      allmodes  */
         {0x00018c00, 0x18053e5e},
         {0x00018c04, 0x000801d8},
         {0x00018c08, 0x0000080c},
 };
 
-static const u32 ar9485Common_wo_xlna_rx_gain_1_1[][2] = {
-        /* Addr        allmodes */
-        {0x0000a000, 0x00060005},
-        {0x0000a004, 0x00810080},
-        {0x0000a008, 0x00830082},
-        {0x0000a00c, 0x00850084},
-        {0x0000a010, 0x01820181},
-        {0x0000a014, 0x01840183},
-        {0x0000a018, 0x01880185},
-        {0x0000a01c, 0x018a0189},
-        {0x0000a020, 0x02850284},
-        {0x0000a024, 0x02890288},
-        {0x0000a028, 0x028b028a},
-        {0x0000a02c, 0x03850384},
-        {0x0000a030, 0x03890388},
-        {0x0000a034, 0x038b038a},
-        {0x0000a038, 0x038d038c},
-        {0x0000a03c, 0x03910390},
-        {0x0000a040, 0x03930392},
-        {0x0000a044, 0x03950394},
-        {0x0000a048, 0x00000396},
-        {0x0000a04c, 0x00000000},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x28282828},
-        {0x0000a084, 0x28282828},
-        {0x0000a088, 0x28282828},
-        {0x0000a08c, 0x28282828},
-        {0x0000a090, 0x28282828},
-        {0x0000a094, 0x24242428},
-        {0x0000a098, 0x171e1e1e},
-        {0x0000a09c, 0x02020b0b},
-        {0x0000a0a0, 0x02020202},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x22072208},
-        {0x0000a0c4, 0x22052206},
-        {0x0000a0c8, 0x22032204},
-        {0x0000a0cc, 0x22012202},
-        {0x0000a0d0, 0x221f2200},
-        {0x0000a0d4, 0x221d221e},
-        {0x0000a0d8, 0x33023303},
-        {0x0000a0dc, 0x33003301},
-        {0x0000a0e0, 0x331e331f},
-        {0x0000a0e4, 0x4402331d},
-        {0x0000a0e8, 0x44004401},
-        {0x0000a0ec, 0x441e441f},
-        {0x0000a0f0, 0x55025503},
-        {0x0000a0f4, 0x55005501},
-        {0x0000a0f8, 0x551e551f},
-        {0x0000a0fc, 0x6602551d},
-        {0x0000a100, 0x66006601},
-        {0x0000a104, 0x661e661f},
-        {0x0000a108, 0x7703661d},
-        {0x0000a10c, 0x77017702},
-        {0x0000a110, 0x00007700},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x111f1100},
-        {0x0000a148, 0x111d111e},
-        {0x0000a14c, 0x111b111c},
-        {0x0000a150, 0x22032204},
-        {0x0000a154, 0x22012202},
-        {0x0000a158, 0x221f2200},
-        {0x0000a15c, 0x221d221e},
-        {0x0000a160, 0x33013302},
-        {0x0000a164, 0x331f3300},
-        {0x0000a168, 0x4402331e},
-        {0x0000a16c, 0x44004401},
-        {0x0000a170, 0x441e441f},
-        {0x0000a174, 0x55015502},
-        {0x0000a178, 0x551f5500},
-        {0x0000a17c, 0x6602551e},
-        {0x0000a180, 0x66006601},
-        {0x0000a184, 0x661e661f},
-        {0x0000a188, 0x7703661d},
-        {0x0000a18c, 0x77017702},
-        {0x0000a190, 0x00007700},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000296},
+static const u32 ar9485_1_1_soc_preamble[][2] = {
+        /* Addr      allmodes  */
+        {0x00004014, 0xba280400},
+        {0x00004090, 0x00aa10aa},
+        {0x000040a4, 0x00a0c9c9},
+        {0x00007010, 0x00000022},
+        {0x00007020, 0x00000000},
+        {0x00007034, 0x00000002},
+        {0x00007038, 0x000004c2},
+        {0x00007048, 0x00000002},
+};
+
+static const u32 ar9485_fast_clock_1_1_baseband_postamble[][3] = {
+        /* Addr      5G_HT20     5G_HT40   */
+        {0x00009e00, 0x03721821, 0x03721821},
+        {0x0000a230, 0x0000400b, 0x00004016},
+        {0x0000a254, 0x00000898, 0x00001130},
+};
+
+static const u32 ar9485_1_1_baseband_postamble[][5] = {
+        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
+        {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8005, 0xd00a8005},
+        {0x00009820, 0x206a002e, 0x206a002e, 0x206a002e, 0x206a002e},
+        {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
+        {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
+        {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
+        {0x00009830, 0x0000059c, 0x0000059c, 0x0000059c, 0x0000059c},
+        {0x00009c00, 0x00000044, 0x00000044, 0x00000044, 0x00000044},
+        {0x00009e00, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0},
+        {0x00009e04, 0x00182020, 0x00182020, 0x00182020, 0x00182020},
+        {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
+        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec80d2e, 0x7ec80d2e},
+        {0x00009e14, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e},
+        {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
+        {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
+        {0x00009e2c, 0x0000001c, 0x0000001c, 0x00000021, 0x00000021},
+        {0x00009e3c, 0xcf946220, 0xcf946220, 0xcf946222, 0xcf946222},
+        {0x00009e44, 0x02321e27, 0x02321e27, 0x02282324, 0x02282324},
+        {0x00009e48, 0x5030201a, 0x5030201a, 0x50302010, 0x50302010},
+        {0x00009fc8, 0x0003f000, 0x0003f000, 0x0001a000, 0x0001a000},
+        {0x0000a204, 0x01303fc0, 0x01303fc4, 0x01303fc4, 0x01303fc0},
+        {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
+        {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
+        {0x0000a234, 0x10000fff, 0x10000fff, 0x10000fff, 0x10000fff},
+        {0x0000a238, 0xffb81018, 0xffb81018, 0xffb81018, 0xffb81018},
+        {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
+        {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
+        {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
+        {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
+        {0x0000a260, 0x3a021501, 0x3a021501, 0x3a021501, 0x3a021501},
+        {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
+        {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
+        {0x0000a284, 0x00000000, 0x00000000, 0x000002a0, 0x000002a0},
+        {0x0000a288, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a28c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
+        {0x0000a2d0, 0x00071981, 0x00071981, 0x00071982, 0x00071982},
+        {0x0000a2d8, 0xf999a83a, 0xf999a83a, 0xf999a83a, 0xf999a83a},
+        {0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+        {0x0000be04, 0x00802020, 0x00802020, 0x00802020, 0x00802020},
+        {0x0000be18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+};
+
+static const u32 ar9485_1_1_pcie_phy_clkreq_disable_L1[][2] = {
+        /* Addr      allmodes  */
+        {0x00018c00, 0x18013e5e},
+        {0x00018c04, 0x000801d8},
+        {0x00018c08, 0x0000080c},
+};
+
+static const u32 ar9485_1_1_radio_postamble[][2] = {
+        /* Addr      allmodes  */
+        {0x0001609c, 0x0b283f31},
+        {0x000160ac, 0x24611800},
+        {0x000160b0, 0x03284f3e},
+        {0x0001610c, 0x00170000},
+        {0x00016140, 0x50804008},
+};
+
+static const u32 ar9485_1_1_mac_core[][2] = {
+        /* Addr      allmodes  */
+        {0x00000008, 0x00000000},
+        {0x00000030, 0x00020085},
+        {0x00000034, 0x00000005},
+        {0x00000040, 0x00000000},
+        {0x00000044, 0x00000000},
+        {0x00000048, 0x00000008},
+        {0x0000004c, 0x00000010},
+        {0x00000050, 0x00000000},
+        {0x00001040, 0x002ffc0f},
+        {0x00001044, 0x002ffc0f},
+        {0x00001048, 0x002ffc0f},
+        {0x0000104c, 0x002ffc0f},
+        {0x00001050, 0x002ffc0f},
+        {0x00001054, 0x002ffc0f},
+        {0x00001058, 0x002ffc0f},
+        {0x0000105c, 0x002ffc0f},
+        {0x00001060, 0x002ffc0f},
+        {0x00001064, 0x002ffc0f},
+        {0x000010f0, 0x00000100},
+        {0x00001270, 0x00000000},
+        {0x000012b0, 0x00000000},
+        {0x000012f0, 0x00000000},
+        {0x0000143c, 0x00000000},
+        {0x0000147c, 0x00000000},
+        {0x00008000, 0x00000000},
+        {0x00008004, 0x00000000},
+        {0x00008008, 0x00000000},
+        {0x0000800c, 0x00000000},
+        {0x00008018, 0x00000000},
+        {0x00008020, 0x00000000},
+        {0x00008038, 0x00000000},
+        {0x0000803c, 0x00000000},
+        {0x00008040, 0x00000000},
+        {0x00008044, 0x00000000},
+        {0x00008048, 0x00000000},
+        {0x0000804c, 0xffffffff},
+        {0x00008054, 0x00000000},
+        {0x00008058, 0x00000000},
+        {0x0000805c, 0x000fc78f},
+        {0x00008060, 0x0000000f},
+        {0x00008064, 0x00000000},
+        {0x00008070, 0x00000310},
+        {0x00008074, 0x00000020},
+        {0x00008078, 0x00000000},
+        {0x0000809c, 0x0000000f},
+        {0x000080a0, 0x00000000},
+        {0x000080a4, 0x02ff0000},
+        {0x000080a8, 0x0e070605},
+        {0x000080ac, 0x0000000d},
+        {0x000080b0, 0x00000000},
+        {0x000080b4, 0x00000000},
+        {0x000080b8, 0x00000000},
+        {0x000080bc, 0x00000000},
+        {0x000080c0, 0x2a800000},
+        {0x000080c4, 0x06900168},
+        {0x000080c8, 0x13881c22},
+        {0x000080cc, 0x01f40000},
+        {0x000080d0, 0x00252500},
+        {0x000080d4, 0x00a00000},
+        {0x000080d8, 0x00400000},
+        {0x000080dc, 0x00000000},
+        {0x000080e0, 0xffffffff},
+        {0x000080e4, 0x0000ffff},
+        {0x000080e8, 0x3f3f3f3f},
+        {0x000080ec, 0x00000000},
+        {0x000080f0, 0x00000000},
+        {0x000080f4, 0x00000000},
+        {0x000080fc, 0x00020000},
+        {0x00008100, 0x00000000},
+        {0x00008108, 0x00000052},
+        {0x0000810c, 0x00000000},
+        {0x00008110, 0x00000000},
+        {0x00008114, 0x000007ff},
+        {0x00008118, 0x000000aa},
+        {0x0000811c, 0x00003210},
+        {0x00008124, 0x00000000},
+        {0x00008128, 0x00000000},
+        {0x0000812c, 0x00000000},
+        {0x00008130, 0x00000000},
+        {0x00008134, 0x00000000},
+        {0x00008138, 0x00000000},
+        {0x0000813c, 0x0000ffff},
+        {0x00008144, 0xffffffff},
+        {0x00008168, 0x00000000},
+        {0x0000816c, 0x00000000},
+        {0x00008170, 0x18486200},
+        {0x00008174, 0x33332210},
+        {0x00008178, 0x00000000},
+        {0x0000817c, 0x00020000},
+        {0x000081c0, 0x00000000},
+        {0x000081c4, 0x33332210},
+        {0x000081d4, 0x00000000},
+        {0x000081ec, 0x00000000},
+        {0x000081f0, 0x00000000},
+        {0x000081f4, 0x00000000},
+        {0x000081f8, 0x00000000},
+        {0x000081fc, 0x00000000},
+        {0x00008240, 0x00100000},
+        {0x00008244, 0x0010f400},
+        {0x00008248, 0x00000800},
+        {0x0000824c, 0x0001e800},
+        {0x00008250, 0x00000000},
+        {0x00008254, 0x00000000},
+        {0x00008258, 0x00000000},
+        {0x0000825c, 0x40000000},
+        {0x00008260, 0x00080922},
+        {0x00008264, 0x9ca00010},
+        {0x00008268, 0xffffffff},
+        {0x0000826c, 0x0000ffff},
+        {0x00008270, 0x00000000},
+        {0x00008274, 0x40000000},
+        {0x00008278, 0x003e4180},
+        {0x0000827c, 0x00000004},
+        {0x00008284, 0x0000002c},
+        {0x00008288, 0x0000002c},
+        {0x0000828c, 0x000000ff},
+        {0x00008294, 0x00000000},
+        {0x00008298, 0x00000000},
+        {0x0000829c, 0x00000000},
+        {0x00008300, 0x00000140},
+        {0x00008314, 0x00000000},
+        {0x0000831c, 0x0000010d},
+        {0x00008328, 0x00000000},
+        {0x0000832c, 0x00000007},
+        {0x00008330, 0x00000302},
+        {0x00008334, 0x00000700},
+        {0x00008338, 0x00ff0000},
+        {0x0000833c, 0x02400000},
+        {0x00008340, 0x000107ff},
+        {0x00008344, 0xa248105b},
+        {0x00008348, 0x008f0000},
+        {0x0000835c, 0x00000000},
+        {0x00008360, 0xffffffff},
+        {0x00008364, 0xffffffff},
+        {0x00008368, 0x00000000},
+        {0x00008370, 0x00000000},
+        {0x00008374, 0x000000ff},
+        {0x00008378, 0x00000000},
+        {0x0000837c, 0x00000000},
+        {0x00008380, 0xffffffff},
+        {0x00008384, 0xffffffff},
+        {0x00008390, 0xffffffff},
+        {0x00008394, 0xffffffff},
+        {0x00008398, 0x00000000},
+        {0x0000839c, 0x00000000},
+        {0x000083a0, 0x00000000},
+        {0x000083a4, 0x0000fa14},
+        {0x000083a8, 0x000f0c00},
+        {0x000083ac, 0x33332210},
+        {0x000083b0, 0x33332210},
+        {0x000083b4, 0x33332210},
+        {0x000083b8, 0x33332210},
+        {0x000083bc, 0x00000000},
+        {0x000083c0, 0x00000000},
+        {0x000083c4, 0x00000000},
+        {0x000083c8, 0x00000000},
+        {0x000083cc, 0x00000200},
+        {0x000083d0, 0x000301ff},
 };
 
-#endif
+#endif /* INITVALS_9485_H */
diff --git a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
index 06b3f0df9fad..6e1915aee712 100644
--- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2010 Atheros Communications Inc.
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ * Copyright (c) 2011-2012 Qualcomm Atheros Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,18 +20,7 @@
 
 /* AR9580 1.0 */
 
-static const u32 ar9580_1p0_modes_fast_clock[][3] = {
-        /* Addr      5G_HT20     5G_HT40   */
-        {0x00001030, 0x00000268, 0x000004d0},
-        {0x00001070, 0x0000018c, 0x00000318},
-        {0x000010b0, 0x00000fd0, 0x00001fa0},
-        {0x00008014, 0x044c044c, 0x08980898},
-        {0x0000801c, 0x148ec02b, 0x148ec057},
-        {0x00008318, 0x000044c0, 0x00008980},
-        {0x00009e00, 0x0372131c, 0x0372131c},
-        {0x0000a230, 0x0000000b, 0x00000016},
-        {0x0000a254, 0x00000898, 0x00001130},
-};
+#define ar9580_1p0_modes_fast_clock ar9300Modes_fast_clock_2p2
 
 static const u32 ar9580_1p0_radio_postamble[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
@@ -208,17 +198,7 @@ static const u32 ar9580_1p0_baseband_core[][2] = {
         {0x0000c420, 0x00000000},
 };
 
-static const u32 ar9580_1p0_mac_postamble[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160},
-        {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c},
-        {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38},
-        {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00},
-        {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b},
-        {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810},
-        {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a},
-        {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440},
-};
+#define ar9580_1p0_mac_postamble ar9300_2p2_mac_postamble
 
 static const u32 ar9580_1p0_low_ob_db_tx_gain_table[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
@@ -326,111 +306,7 @@ static const u32 ar9580_1p0_low_ob_db_tx_gain_table[][5] = {
         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
 };
 
-static const u32 ar9580_1p0_high_power_tx_gain_table[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-        {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-        {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
-        {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
-        {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x1c000223, 0x1c000223, 0x12000400, 0x12000400},
-        {0x0000a518, 0x21002220, 0x21002220, 0x16000402, 0x16000402},
-        {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
-        {0x0000a520, 0x2b022220, 0x2b022220, 0x1c000603, 0x1c000603},
-        {0x0000a524, 0x2f022222, 0x2f022222, 0x21000a02, 0x21000a02},
-        {0x0000a528, 0x34022225, 0x34022225, 0x25000a04, 0x25000a04},
-        {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x28000a20, 0x28000a20},
-        {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2c000e20, 0x2c000e20},
-        {0x0000a534, 0x4202242a, 0x4202242a, 0x30000e22, 0x30000e22},
-        {0x0000a538, 0x4702244a, 0x4702244a, 0x34000e24, 0x34000e24},
-        {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x38001640, 0x38001640},
-        {0x0000a540, 0x4e02246c, 0x4e02246c, 0x3c001660, 0x3c001660},
-        {0x0000a544, 0x5302266c, 0x5302266c, 0x3f001861, 0x3f001861},
-        {0x0000a548, 0x5702286c, 0x5702286c, 0x43001a81, 0x43001a81},
-        {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x47001a83, 0x47001a83},
-        {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4a001c84, 0x4a001c84},
-        {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4e001ce3, 0x4e001ce3},
-        {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x52001ce5, 0x52001ce5},
-        {0x0000a55c, 0x7002708c, 0x7002708c, 0x56001ce9, 0x56001ce9},
-        {0x0000a560, 0x7302b08a, 0x7302b08a, 0x5a001ceb, 0x5a001ceb},
-        {0x0000a564, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a568, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a570, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a574, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a578, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x5d001eec, 0x5d001eec},
-        {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
-        {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
-        {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x1c800223, 0x1c800223, 0x12800400, 0x12800400},
-        {0x0000a598, 0x21802220, 0x21802220, 0x16800402, 0x16800402},
-        {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1c800603, 0x1c800603},
-        {0x0000a5a4, 0x2f822222, 0x2f822222, 0x21800a02, 0x21800a02},
-        {0x0000a5a8, 0x34822225, 0x34822225, 0x25800a04, 0x25800a04},
-        {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x28800a20, 0x28800a20},
-        {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2c800e20, 0x2c800e20},
-        {0x0000a5b4, 0x4282242a, 0x4282242a, 0x30800e22, 0x30800e22},
-        {0x0000a5b8, 0x4782244a, 0x4782244a, 0x34800e24, 0x34800e24},
-        {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x38801640, 0x38801640},
-        {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x3c801660, 0x3c801660},
-        {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3f801861, 0x3f801861},
-        {0x0000a5c8, 0x5782286c, 0x5782286c, 0x43801a81, 0x43801a81},
-        {0x0000a5cc, 0x5c82486b, 0x5c82486b, 0x47801a83, 0x47801a83},
-        {0x0000a5d0, 0x61824a6c, 0x61824a6c, 0x4a801c84, 0x4a801c84},
-        {0x0000a5d4, 0x66826a6c, 0x66826a6c, 0x4e801ce3, 0x4e801ce3},
-        {0x0000a5d8, 0x6b826e6c, 0x6b826e6c, 0x52801ce5, 0x52801ce5},
-        {0x0000a5dc, 0x7082708c, 0x7082708c, 0x56801ce9, 0x56801ce9},
-        {0x0000a5e0, 0x7382b08a, 0x7382b08a, 0x5a801ceb, 0x5a801ceb},
-        {0x0000a5e4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5e8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5ec, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5f0, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5f4, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5f8, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a5fc, 0x7782b08c, 0x7782b08c, 0x5d801eec, 0x5d801eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x01404000, 0x01404000, 0x01404000, 0x01404000},
-        {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
-        {0x0000a61c, 0x02008802, 0x02008802, 0x02008501, 0x02008501},
-        {0x0000a620, 0x0300cc03, 0x0300cc03, 0x0280ca03, 0x0280ca03},
-        {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
-        {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04014c04, 0x04014c04},
-        {0x0000a62c, 0x03810c03, 0x03810c03, 0x04015005, 0x04015005},
-        {0x0000a630, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-        {0x0000a634, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-        {0x0000a638, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-        {0x0000a63c, 0x03810e04, 0x03810e04, 0x04015005, 0x04015005},
-        {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-        {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-        {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000c2dc, 0x0380c7fc, 0x0380c7fc, 0x03aaa352, 0x03aaa352},
-        {0x0000c2e0, 0x0000f800, 0x0000f800, 0x03ccc584, 0x03ccc584},
-        {0x0000c2e4, 0x03ff0000, 0x03ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-        {0x00016048, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-        {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-        {0x00016448, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-        {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
-        {0x00016848, 0x66480001, 0x66480001, 0x66480001, 0x66480001},
-        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-};
+#define ar9580_1p0_high_power_tx_gain_table ar9580_1p0_low_ob_db_tx_gain_table
 
 static const u32 ar9580_1p0_lowest_ob_db_tx_gain_table[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
@@ -538,12 +414,7 @@ static const u32 ar9580_1p0_lowest_ob_db_tx_gain_table[][5] = {
         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
 };
 
-static const u32 ar9580_1p0_baseband_core_txfir_coeff_japan_2484[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a398, 0x00000000},
-        {0x0000a39c, 0x6f7f0301},
-        {0x0000a3a0, 0xca9228ee},
-};
+#define ar9580_1p0_baseband_core_txfir_coeff_japan_2484 ar9462_2p0_baseband_core_txfir_coeff_japan_2484
 
 static const u32 ar9580_1p0_mac_core[][2] = {
         /* Addr      allmodes  */
@@ -808,376 +679,11 @@ static const u32 ar9580_1p0_mixed_ob_db_tx_gain_table[][5] = {
         {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
 };
 
-static const u32 ar9580_1p0_wo_xlna_rx_gain_table[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x00830082},
-        {0x0000a014, 0x01810180},
-        {0x0000a018, 0x01830182},
-        {0x0000a01c, 0x01850184},
-        {0x0000a020, 0x01890188},
-        {0x0000a024, 0x018b018a},
-        {0x0000a028, 0x018d018c},
-        {0x0000a02c, 0x03820190},
-        {0x0000a030, 0x03840383},
-        {0x0000a034, 0x03880385},
-        {0x0000a038, 0x038a0389},
-        {0x0000a03c, 0x038c038b},
-        {0x0000a040, 0x0390038d},
-        {0x0000a044, 0x03920391},
-        {0x0000a048, 0x03940393},
-        {0x0000a04c, 0x03960395},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x29292929},
-        {0x0000a084, 0x29292929},
-        {0x0000a088, 0x29292929},
-        {0x0000a08c, 0x29292929},
-        {0x0000a090, 0x22292929},
-        {0x0000a094, 0x1d1d2222},
-        {0x0000a098, 0x0c111117},
-        {0x0000a09c, 0x00030303},
-        {0x0000a0a0, 0x00000000},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x01000101},
-        {0x0000a0c8, 0x011e011f},
-        {0x0000a0cc, 0x011c011d},
-        {0x0000a0d0, 0x02030204},
-        {0x0000a0d4, 0x02010202},
-        {0x0000a0d8, 0x021f0200},
-        {0x0000a0dc, 0x0302021e},
-        {0x0000a0e0, 0x03000301},
-        {0x0000a0e4, 0x031e031f},
-        {0x0000a0e8, 0x0402031d},
-        {0x0000a0ec, 0x04000401},
-        {0x0000a0f0, 0x041e041f},
-        {0x0000a0f4, 0x0502041d},
-        {0x0000a0f8, 0x05000501},
-        {0x0000a0fc, 0x051e051f},
-        {0x0000a100, 0x06010602},
-        {0x0000a104, 0x061f0600},
-        {0x0000a108, 0x061d061e},
-        {0x0000a10c, 0x07020703},
-        {0x0000a110, 0x07000701},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x01000101},
-        {0x0000a148, 0x011e011f},
-        {0x0000a14c, 0x011c011d},
-        {0x0000a150, 0x02030204},
-        {0x0000a154, 0x02010202},
-        {0x0000a158, 0x021f0200},
-        {0x0000a15c, 0x0302021e},
-        {0x0000a160, 0x03000301},
-        {0x0000a164, 0x031e031f},
-        {0x0000a168, 0x0402031d},
-        {0x0000a16c, 0x04000401},
-        {0x0000a170, 0x041e041f},
-        {0x0000a174, 0x0502041d},
-        {0x0000a178, 0x05000501},
-        {0x0000a17c, 0x051e051f},
-        {0x0000a180, 0x06010602},
-        {0x0000a184, 0x061f0600},
-        {0x0000a188, 0x061d061e},
-        {0x0000a18c, 0x07020703},
-        {0x0000a190, 0x07000701},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000196},
-        {0x0000b000, 0x00010000},
-        {0x0000b004, 0x00030002},
-        {0x0000b008, 0x00050004},
-        {0x0000b00c, 0x00810080},
-        {0x0000b010, 0x00830082},
-        {0x0000b014, 0x01810180},
-        {0x0000b018, 0x01830182},
-        {0x0000b01c, 0x01850184},
-        {0x0000b020, 0x02810280},
-        {0x0000b024, 0x02830282},
-        {0x0000b028, 0x02850284},
-        {0x0000b02c, 0x02890288},
-        {0x0000b030, 0x028b028a},
-        {0x0000b034, 0x0388028c},
-        {0x0000b038, 0x038a0389},
-        {0x0000b03c, 0x038c038b},
-        {0x0000b040, 0x0390038d},
-        {0x0000b044, 0x03920391},
-        {0x0000b048, 0x03940393},
-        {0x0000b04c, 0x03960395},
-        {0x0000b050, 0x00000000},
-        {0x0000b054, 0x00000000},
-        {0x0000b058, 0x00000000},
-        {0x0000b05c, 0x00000000},
-        {0x0000b060, 0x00000000},
-        {0x0000b064, 0x00000000},
-        {0x0000b068, 0x00000000},
-        {0x0000b06c, 0x00000000},
-        {0x0000b070, 0x00000000},
-        {0x0000b074, 0x00000000},
-        {0x0000b078, 0x00000000},
-        {0x0000b07c, 0x00000000},
-        {0x0000b080, 0x32323232},
-        {0x0000b084, 0x2f2f3232},
-        {0x0000b088, 0x23282a2d},
-        {0x0000b08c, 0x1c1e2123},
-        {0x0000b090, 0x14171919},
-        {0x0000b094, 0x0e0e1214},
-        {0x0000b098, 0x03050707},
-        {0x0000b09c, 0x00030303},
-        {0x0000b0a0, 0x00000000},
-        {0x0000b0a4, 0x00000000},
-        {0x0000b0a8, 0x00000000},
-        {0x0000b0ac, 0x00000000},
-        {0x0000b0b0, 0x00000000},
-        {0x0000b0b4, 0x00000000},
-        {0x0000b0b8, 0x00000000},
-        {0x0000b0bc, 0x00000000},
-        {0x0000b0c0, 0x003f0020},
-        {0x0000b0c4, 0x00400041},
-        {0x0000b0c8, 0x0140005f},
-        {0x0000b0cc, 0x0160015f},
-        {0x0000b0d0, 0x017e017f},
-        {0x0000b0d4, 0x02410242},
-        {0x0000b0d8, 0x025f0240},
-        {0x0000b0dc, 0x027f0260},
-        {0x0000b0e0, 0x0341027e},
-        {0x0000b0e4, 0x035f0340},
-        {0x0000b0e8, 0x037f0360},
-        {0x0000b0ec, 0x04400441},
-        {0x0000b0f0, 0x0460045f},
-        {0x0000b0f4, 0x0541047f},
-        {0x0000b0f8, 0x055f0540},
-        {0x0000b0fc, 0x057f0560},
-        {0x0000b100, 0x06400641},
-        {0x0000b104, 0x0660065f},
-        {0x0000b108, 0x067e067f},
-        {0x0000b10c, 0x07410742},
-        {0x0000b110, 0x075f0740},
-        {0x0000b114, 0x077f0760},
-        {0x0000b118, 0x07800781},
-        {0x0000b11c, 0x07a0079f},
-        {0x0000b120, 0x07c107bf},
-        {0x0000b124, 0x000007c0},
-        {0x0000b128, 0x00000000},
-        {0x0000b12c, 0x00000000},
-        {0x0000b130, 0x00000000},
-        {0x0000b134, 0x00000000},
-        {0x0000b138, 0x00000000},
-        {0x0000b13c, 0x00000000},
-        {0x0000b140, 0x003f0020},
-        {0x0000b144, 0x00400041},
-        {0x0000b148, 0x0140005f},
-        {0x0000b14c, 0x0160015f},
-        {0x0000b150, 0x017e017f},
-        {0x0000b154, 0x02410242},
-        {0x0000b158, 0x025f0240},
-        {0x0000b15c, 0x027f0260},
-        {0x0000b160, 0x0341027e},
-        {0x0000b164, 0x035f0340},
-        {0x0000b168, 0x037f0360},
-        {0x0000b16c, 0x04400441},
-        {0x0000b170, 0x0460045f},
-        {0x0000b174, 0x0541047f},
-        {0x0000b178, 0x055f0540},
-        {0x0000b17c, 0x057f0560},
-        {0x0000b180, 0x06400641},
-        {0x0000b184, 0x0660065f},
-        {0x0000b188, 0x067e067f},
-        {0x0000b18c, 0x07410742},
-        {0x0000b190, 0x075f0740},
-        {0x0000b194, 0x077f0760},
-        {0x0000b198, 0x07800781},
-        {0x0000b19c, 0x07a0079f},
-        {0x0000b1a0, 0x07c107bf},
-        {0x0000b1a4, 0x000007c0},
-        {0x0000b1a8, 0x00000000},
-        {0x0000b1ac, 0x00000000},
-        {0x0000b1b0, 0x00000000},
-        {0x0000b1b4, 0x00000000},
-        {0x0000b1b8, 0x00000000},
-        {0x0000b1bc, 0x00000000},
-        {0x0000b1c0, 0x00000000},
-        {0x0000b1c4, 0x00000000},
-        {0x0000b1c8, 0x00000000},
-        {0x0000b1cc, 0x00000000},
-        {0x0000b1d0, 0x00000000},
-        {0x0000b1d4, 0x00000000},
-        {0x0000b1d8, 0x00000000},
-        {0x0000b1dc, 0x00000000},
-        {0x0000b1e0, 0x00000000},
-        {0x0000b1e4, 0x00000000},
-        {0x0000b1e8, 0x00000000},
-        {0x0000b1ec, 0x00000000},
-        {0x0000b1f0, 0x00000396},
-        {0x0000b1f4, 0x00000396},
-        {0x0000b1f8, 0x00000396},
-        {0x0000b1fc, 0x00000196},
-};
+#define ar9580_1p0_wo_xlna_rx_gain_table ar9300Common_wo_xlna_rx_gain_table_2p2
 
-static const u32 ar9580_1p0_soc_postamble[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x00007010, 0x00000023, 0x00000023, 0x00000023, 0x00000023},
-};
+#define ar9580_1p0_soc_postamble ar9300_2p2_soc_postamble
 
-static const u32 ar9580_1p0_high_ob_db_tx_gain_table[][5] = {
-        /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x0000a2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
-        {0x0000a2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
-        {0x0000a2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000a410, 0x000050d8, 0x000050d8, 0x000050d9, 0x000050d9},
-        {0x0000a500, 0x00002220, 0x00002220, 0x00000000, 0x00000000},
-        {0x0000a504, 0x04002222, 0x04002222, 0x04000002, 0x04000002},
-        {0x0000a508, 0x09002421, 0x09002421, 0x08000004, 0x08000004},
-        {0x0000a50c, 0x0d002621, 0x0d002621, 0x0b000200, 0x0b000200},
-        {0x0000a510, 0x13004620, 0x13004620, 0x0f000202, 0x0f000202},
-        {0x0000a514, 0x19004a20, 0x19004a20, 0x11000400, 0x11000400},
-        {0x0000a518, 0x1d004e20, 0x1d004e20, 0x15000402, 0x15000402},
-        {0x0000a51c, 0x21005420, 0x21005420, 0x19000404, 0x19000404},
-        {0x0000a520, 0x26005e20, 0x26005e20, 0x1b000603, 0x1b000603},
-        {0x0000a524, 0x2b005e40, 0x2b005e40, 0x1f000a02, 0x1f000a02},
-        {0x0000a528, 0x2f005e42, 0x2f005e42, 0x23000a04, 0x23000a04},
-        {0x0000a52c, 0x33005e44, 0x33005e44, 0x26000a20, 0x26000a20},
-        {0x0000a530, 0x38005e65, 0x38005e65, 0x2a000e20, 0x2a000e20},
-        {0x0000a534, 0x3c005e69, 0x3c005e69, 0x2e000e22, 0x2e000e22},
-        {0x0000a538, 0x40005e6b, 0x40005e6b, 0x31000e24, 0x31000e24},
-        {0x0000a53c, 0x44005e6d, 0x44005e6d, 0x34001640, 0x34001640},
-        {0x0000a540, 0x49005e72, 0x49005e72, 0x38001660, 0x38001660},
-        {0x0000a544, 0x4e005eb2, 0x4e005eb2, 0x3b001861, 0x3b001861},
-        {0x0000a548, 0x53005f12, 0x53005f12, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5e025f12, 0x5e025f12, 0x44001c84, 0x44001c84},
-        {0x0000a554, 0x61027f12, 0x61027f12, 0x48001ce3, 0x48001ce3},
-        {0x0000a558, 0x6702bf12, 0x6702bf12, 0x4c001ce5, 0x4c001ce5},
-        {0x0000a55c, 0x6b02bf14, 0x6b02bf14, 0x50001ce9, 0x50001ce9},
-        {0x0000a560, 0x6f02bf16, 0x6f02bf16, 0x54001ceb, 0x54001ceb},
-        {0x0000a564, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a568, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a56c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a570, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a574, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a578, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a57c, 0x6f02bf16, 0x6f02bf16, 0x56001eec, 0x56001eec},
-        {0x0000a580, 0x00802220, 0x00802220, 0x00800000, 0x00800000},
-        {0x0000a584, 0x04802222, 0x04802222, 0x04800002, 0x04800002},
-        {0x0000a588, 0x09802421, 0x09802421, 0x08800004, 0x08800004},
-        {0x0000a58c, 0x0d802621, 0x0d802621, 0x0b800200, 0x0b800200},
-        {0x0000a590, 0x13804620, 0x13804620, 0x0f800202, 0x0f800202},
-        {0x0000a594, 0x19804a20, 0x19804a20, 0x11800400, 0x11800400},
-        {0x0000a598, 0x1d804e20, 0x1d804e20, 0x15800402, 0x15800402},
-        {0x0000a59c, 0x21805420, 0x21805420, 0x19800404, 0x19800404},
-        {0x0000a5a0, 0x26805e20, 0x26805e20, 0x1b800603, 0x1b800603},
-        {0x0000a5a4, 0x2b805e40, 0x2b805e40, 0x1f800a02, 0x1f800a02},
-        {0x0000a5a8, 0x2f805e42, 0x2f805e42, 0x23800a04, 0x23800a04},
-        {0x0000a5ac, 0x33805e44, 0x33805e44, 0x26800a20, 0x26800a20},
-        {0x0000a5b0, 0x38805e65, 0x38805e65, 0x2a800e20, 0x2a800e20},
-        {0x0000a5b4, 0x3c805e69, 0x3c805e69, 0x2e800e22, 0x2e800e22},
-        {0x0000a5b8, 0x40805e6b, 0x40805e6b, 0x31800e24, 0x31800e24},
-        {0x0000a5bc, 0x44805e6d, 0x44805e6d, 0x34801640, 0x34801640},
-        {0x0000a5c0, 0x49805e72, 0x49805e72, 0x38801660, 0x38801660},
-        {0x0000a5c4, 0x4e805eb2, 0x4e805eb2, 0x3b801861, 0x3b801861},
-        {0x0000a5c8, 0x53805f12, 0x53805f12, 0x3e801a81, 0x3e801a81},
-        {0x0000a5cc, 0x59825eb2, 0x59825eb2, 0x42801a83, 0x42801a83},
-        {0x0000a5d0, 0x5e825f12, 0x5e825f12, 0x44801c84, 0x44801c84},
-        {0x0000a5d4, 0x61827f12, 0x61827f12, 0x48801ce3, 0x48801ce3},
-        {0x0000a5d8, 0x6782bf12, 0x6782bf12, 0x4c801ce5, 0x4c801ce5},
-        {0x0000a5dc, 0x6b82bf14, 0x6b82bf14, 0x50801ce9, 0x50801ce9},
-        {0x0000a5e0, 0x6f82bf16, 0x6f82bf16, 0x54801ceb, 0x54801ceb},
-        {0x0000a5e4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5e8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5ec, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f0, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f4, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5f8, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a5fc, 0x6f82bf16, 0x6f82bf16, 0x56801eec, 0x56801eec},
-        {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
-        {0x0000a610, 0x00804000, 0x00804000, 0x00000000, 0x00000000},
-        {0x0000a614, 0x00804201, 0x00804201, 0x01404000, 0x01404000},
-        {0x0000a618, 0x0280c802, 0x0280c802, 0x01404501, 0x01404501},
-        {0x0000a61c, 0x0280ca03, 0x0280ca03, 0x02008501, 0x02008501},
-        {0x0000a620, 0x04c15104, 0x04c15104, 0x0280ca03, 0x0280ca03},
-        {0x0000a624, 0x04c15305, 0x04c15305, 0x03010c04, 0x03010c04},
-        {0x0000a628, 0x04c15305, 0x04c15305, 0x04014c04, 0x04014c04},
-        {0x0000a62c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000a630, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000a634, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000a638, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000a63c, 0x04c15305, 0x04c15305, 0x04015005, 0x04015005},
-        {0x0000b2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
-        {0x0000b2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
-        {0x0000b2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x0000c2dc, 0x01feee00, 0x01feee00, 0x03aaa352, 0x03aaa352},
-        {0x0000c2e0, 0x0000f000, 0x0000f000, 0x03ccc584, 0x03ccc584},
-        {0x0000c2e4, 0x01ff0000, 0x01ff0000, 0x03f0f800, 0x03f0f800},
-        {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
-        {0x00016044, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-        {0x00016048, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-        {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-        {0x00016444, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-        {0x00016448, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-        {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-        {0x00016844, 0x056db2e4, 0x056db2e4, 0x056db2e4, 0x056db2e4},
-        {0x00016848, 0x8e480001, 0x8e480001, 0x8e480001, 0x8e480001},
-        {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
-};
+#define ar9580_1p0_high_ob_db_tx_gain_table ar9300Modes_high_ob_db_tx_gain_table_2p2
 
 static const u32 ar9580_1p0_soc_preamble[][2] = {
         /* Addr      allmodes  */
@@ -1189,265 +695,7 @@ static const u32 ar9580_1p0_soc_preamble[][2] = {
         {0x00007048, 0x00000008},
 };
 
-static const u32 ar9580_1p0_rx_gain_table[][2] = {
-        /* Addr      allmodes  */
-        {0x0000a000, 0x00010000},
-        {0x0000a004, 0x00030002},
-        {0x0000a008, 0x00050004},
-        {0x0000a00c, 0x00810080},
-        {0x0000a010, 0x00830082},
-        {0x0000a014, 0x01810180},
-        {0x0000a018, 0x01830182},
-        {0x0000a01c, 0x01850184},
-        {0x0000a020, 0x01890188},
-        {0x0000a024, 0x018b018a},
-        {0x0000a028, 0x018d018c},
-        {0x0000a02c, 0x01910190},
-        {0x0000a030, 0x01930192},
-        {0x0000a034, 0x01950194},
-        {0x0000a038, 0x038a0196},
-        {0x0000a03c, 0x038c038b},
-        {0x0000a040, 0x0390038d},
-        {0x0000a044, 0x03920391},
-        {0x0000a048, 0x03940393},
-        {0x0000a04c, 0x03960395},
-        {0x0000a050, 0x00000000},
-        {0x0000a054, 0x00000000},
-        {0x0000a058, 0x00000000},
-        {0x0000a05c, 0x00000000},
-        {0x0000a060, 0x00000000},
-        {0x0000a064, 0x00000000},
-        {0x0000a068, 0x00000000},
-        {0x0000a06c, 0x00000000},
-        {0x0000a070, 0x00000000},
-        {0x0000a074, 0x00000000},
-        {0x0000a078, 0x00000000},
-        {0x0000a07c, 0x00000000},
-        {0x0000a080, 0x22222229},
-        {0x0000a084, 0x1d1d1d1d},
-        {0x0000a088, 0x1d1d1d1d},
-        {0x0000a08c, 0x1d1d1d1d},
-        {0x0000a090, 0x171d1d1d},
-        {0x0000a094, 0x11111717},
-        {0x0000a098, 0x00030311},
-        {0x0000a09c, 0x00000000},
-        {0x0000a0a0, 0x00000000},
-        {0x0000a0a4, 0x00000000},
-        {0x0000a0a8, 0x00000000},
-        {0x0000a0ac, 0x00000000},
-        {0x0000a0b0, 0x00000000},
-        {0x0000a0b4, 0x00000000},
-        {0x0000a0b8, 0x00000000},
-        {0x0000a0bc, 0x00000000},
-        {0x0000a0c0, 0x001f0000},
-        {0x0000a0c4, 0x01000101},
-        {0x0000a0c8, 0x011e011f},
-        {0x0000a0cc, 0x011c011d},
-        {0x0000a0d0, 0x02030204},
-        {0x0000a0d4, 0x02010202},
-        {0x0000a0d8, 0x021f0200},
-        {0x0000a0dc, 0x0302021e},
-        {0x0000a0e0, 0x03000301},
-        {0x0000a0e4, 0x031e031f},
-        {0x0000a0e8, 0x0402031d},
-        {0x0000a0ec, 0x04000401},
-        {0x0000a0f0, 0x041e041f},
-        {0x0000a0f4, 0x0502041d},
-        {0x0000a0f8, 0x05000501},
-        {0x0000a0fc, 0x051e051f},
-        {0x0000a100, 0x06010602},
-        {0x0000a104, 0x061f0600},
-        {0x0000a108, 0x061d061e},
-        {0x0000a10c, 0x07020703},
-        {0x0000a110, 0x07000701},
-        {0x0000a114, 0x00000000},
-        {0x0000a118, 0x00000000},
-        {0x0000a11c, 0x00000000},
-        {0x0000a120, 0x00000000},
-        {0x0000a124, 0x00000000},
-        {0x0000a128, 0x00000000},
-        {0x0000a12c, 0x00000000},
-        {0x0000a130, 0x00000000},
-        {0x0000a134, 0x00000000},
-        {0x0000a138, 0x00000000},
-        {0x0000a13c, 0x00000000},
-        {0x0000a140, 0x001f0000},
-        {0x0000a144, 0x01000101},
-        {0x0000a148, 0x011e011f},
-        {0x0000a14c, 0x011c011d},
-        {0x0000a150, 0x02030204},
-        {0x0000a154, 0x02010202},
-        {0x0000a158, 0x021f0200},
-        {0x0000a15c, 0x0302021e},
-        {0x0000a160, 0x03000301},
-        {0x0000a164, 0x031e031f},
-        {0x0000a168, 0x0402031d},
-        {0x0000a16c, 0x04000401},
-        {0x0000a170, 0x041e041f},
-        {0x0000a174, 0x0502041d},
-        {0x0000a178, 0x05000501},
-        {0x0000a17c, 0x051e051f},
-        {0x0000a180, 0x06010602},
-        {0x0000a184, 0x061f0600},
-        {0x0000a188, 0x061d061e},
-        {0x0000a18c, 0x07020703},
-        {0x0000a190, 0x07000701},
-        {0x0000a194, 0x00000000},
-        {0x0000a198, 0x00000000},
-        {0x0000a19c, 0x00000000},
-        {0x0000a1a0, 0x00000000},
-        {0x0000a1a4, 0x00000000},
-        {0x0000a1a8, 0x00000000},
-        {0x0000a1ac, 0x00000000},
-        {0x0000a1b0, 0x00000000},
-        {0x0000a1b4, 0x00000000},
-        {0x0000a1b8, 0x00000000},
-        {0x0000a1bc, 0x00000000},
-        {0x0000a1c0, 0x00000000},
-        {0x0000a1c4, 0x00000000},
-        {0x0000a1c8, 0x00000000},
-        {0x0000a1cc, 0x00000000},
-        {0x0000a1d0, 0x00000000},
-        {0x0000a1d4, 0x00000000},
-        {0x0000a1d8, 0x00000000},
-        {0x0000a1dc, 0x00000000},
-        {0x0000a1e0, 0x00000000},
-        {0x0000a1e4, 0x00000000},
-        {0x0000a1e8, 0x00000000},
-        {0x0000a1ec, 0x00000000},
-        {0x0000a1f0, 0x00000396},
-        {0x0000a1f4, 0x00000396},
-        {0x0000a1f8, 0x00000396},
-        {0x0000a1fc, 0x00000196},
-        {0x0000b000, 0x00010000},
-        {0x0000b004, 0x00030002},
-        {0x0000b008, 0x00050004},
-        {0x0000b00c, 0x00810080},
-        {0x0000b010, 0x00830082},
-        {0x0000b014, 0x01810180},
-        {0x0000b018, 0x01830182},
-        {0x0000b01c, 0x01850184},
-        {0x0000b020, 0x02810280},
-        {0x0000b024, 0x02830282},
-        {0x0000b028, 0x02850284},
-        {0x0000b02c, 0x02890288},
-        {0x0000b030, 0x028b028a},
-        {0x0000b034, 0x0388028c},
-        {0x0000b038, 0x038a0389},
-        {0x0000b03c, 0x038c038b},
-        {0x0000b040, 0x0390038d},
-        {0x0000b044, 0x03920391},
-        {0x0000b048, 0x03940393},
-        {0x0000b04c, 0x03960395},
-        {0x0000b050, 0x00000000},
-        {0x0000b054, 0x00000000},
-        {0x0000b058, 0x00000000},
-        {0x0000b05c, 0x00000000},
-        {0x0000b060, 0x00000000},
-        {0x0000b064, 0x00000000},
-        {0x0000b068, 0x00000000},
-        {0x0000b06c, 0x00000000},
-        {0x0000b070, 0x00000000},
-        {0x0000b074, 0x00000000},
-        {0x0000b078, 0x00000000},
-        {0x0000b07c, 0x00000000},
-        {0x0000b080, 0x2a2d2f32},
-        {0x0000b084, 0x21232328},
-        {0x0000b088, 0x19191c1e},
-        {0x0000b08c, 0x12141417},
-        {0x0000b090, 0x07070e0e},
-        {0x0000b094, 0x03030305},
-        {0x0000b098, 0x00000003},
-        {0x0000b09c, 0x00000000},
-        {0x0000b0a0, 0x00000000},
-        {0x0000b0a4, 0x00000000},
-        {0x0000b0a8, 0x00000000},
-        {0x0000b0ac, 0x00000000},
-        {0x0000b0b0, 0x00000000},
-        {0x0000b0b4, 0x00000000},
-        {0x0000b0b8, 0x00000000},
-        {0x0000b0bc, 0x00000000},
-        {0x0000b0c0, 0x003f0020},
-        {0x0000b0c4, 0x00400041},
-        {0x0000b0c8, 0x0140005f},
-        {0x0000b0cc, 0x0160015f},
-        {0x0000b0d0, 0x017e017f},
-        {0x0000b0d4, 0x02410242},
-        {0x0000b0d8, 0x025f0240},
-        {0x0000b0dc, 0x027f0260},
-        {0x0000b0e0, 0x0341027e},
-        {0x0000b0e4, 0x035f0340},
-        {0x0000b0e8, 0x037f0360},
-        {0x0000b0ec, 0x04400441},
-        {0x0000b0f0, 0x0460045f},
-        {0x0000b0f4, 0x0541047f},
-        {0x0000b0f8, 0x055f0540},
-        {0x0000b0fc, 0x057f0560},
-        {0x0000b100, 0x06400641},
-        {0x0000b104, 0x0660065f},
-        {0x0000b108, 0x067e067f},
-        {0x0000b10c, 0x07410742},
-        {0x0000b110, 0x075f0740},
-        {0x0000b114, 0x077f0760},
-        {0x0000b118, 0x07800781},
-        {0x0000b11c, 0x07a0079f},
-        {0x0000b120, 0x07c107bf},
-        {0x0000b124, 0x000007c0},
-        {0x0000b128, 0x00000000},
-        {0x0000b12c, 0x00000000},
-        {0x0000b130, 0x00000000},
-        {0x0000b134, 0x00000000},
-        {0x0000b138, 0x00000000},
-        {0x0000b13c, 0x00000000},
-        {0x0000b140, 0x003f0020},
-        {0x0000b144, 0x00400041},
-        {0x0000b148, 0x0140005f},
-        {0x0000b14c, 0x0160015f},
-        {0x0000b150, 0x017e017f},
-        {0x0000b154, 0x02410242},
-        {0x0000b158, 0x025f0240},
-        {0x0000b15c, 0x027f0260},
-        {0x0000b160, 0x0341027e},
-        {0x0000b164, 0x035f0340},
-        {0x0000b168, 0x037f0360},
-        {0x0000b16c, 0x04400441},
-        {0x0000b170, 0x0460045f},
-        {0x0000b174, 0x0541047f},
-        {0x0000b178, 0x055f0540},
-        {0x0000b17c, 0x057f0560},
-        {0x0000b180, 0x06400641},
-        {0x0000b184, 0x0660065f},
-        {0x0000b188, 0x067e067f},
-        {0x0000b18c, 0x07410742},
-        {0x0000b190, 0x075f0740},
-        {0x0000b194, 0x077f0760},
-        {0x0000b198, 0x07800781},
-        {0x0000b19c, 0x07a0079f},
-        {0x0000b1a0, 0x07c107bf},
-        {0x0000b1a4, 0x000007c0},
-        {0x0000b1a8, 0x00000000},
-        {0x0000b1ac, 0x00000000},
-        {0x0000b1b0, 0x00000000},
-        {0x0000b1b4, 0x00000000},
-        {0x0000b1b8, 0x00000000},
-        {0x0000b1bc, 0x00000000},
-        {0x0000b1c0, 0x00000000},
-        {0x0000b1c4, 0x00000000},
-        {0x0000b1c8, 0x00000000},
-        {0x0000b1cc, 0x00000000},
-        {0x0000b1d0, 0x00000000},
-        {0x0000b1d4, 0x00000000},
-        {0x0000b1d8, 0x00000000},
-        {0x0000b1dc, 0x00000000},
-        {0x0000b1e0, 0x00000000},
-        {0x0000b1e4, 0x00000000},
-        {0x0000b1e8, 0x00000000},
-        {0x0000b1ec, 0x00000000},
-        {0x0000b1f0, 0x00000396},
-        {0x0000b1f4, 0x00000396},
-        {0x0000b1f8, 0x00000396},
-        {0x0000b1fc, 0x00000196},
-};
+#define ar9580_1p0_rx_gain_table ar9462_common_rx_gain_table_2p0
 
 static const u32 ar9580_1p0_radio_core[][2] = {
         /* Addr      allmodes  */
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index f72c4a36d01b..fe39eb4c42a1 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -722,6 +722,7 @@ extern int ath9k_modparam_nohwcrypt;
 extern int led_blink;
 extern bool is_ath9k_unloaded;
 
+u8 ath9k_parse_mpdudensity(u8 mpdudensity);
 irqreturn_t ath_isr(int irq, void *dev);
 int ath9k_init_device(u16 devid, struct ath_softc *sc,
                     const struct ath_bus_ops *bus_ops);
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 2831258d9507..5c3192ffc196 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -348,8 +348,6 @@ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status)
                 sc->debug.stats.istats.txok++;
         if (status & ATH9K_INT_TXURN)
                 sc->debug.stats.istats.txurn++;
-        if (status & ATH9K_INT_MIB)
-                sc->debug.stats.istats.mib++;
         if (status & ATH9K_INT_RXPHY)
                 sc->debug.stats.istats.rxphyerr++;
         if (status & ATH9K_INT_RXKCM)
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 26032cb59b8a..9ae6a4d97691 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -416,7 +416,7 @@ int ath9k_init_btcoex(struct ath_softc *sc)
                 txq = sc->tx.txq_map[WME_AC_BE];
                 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);
                 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
-                if (AR_SREV_9462(ah)) {
+                if (ath9k_hw_mci_is_enabled(ah)) {
                         sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
                         INIT_LIST_HEAD(&sc->btcoex.mci.info);
 
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 135795257d95..936e920fb88e 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -453,7 +453,6 @@ struct ath9k_htc_priv {
         u8 num_sta_assoc_vif;
         u8 num_ap_vif;
 
-        u16 op_flags;
         u16 curtxpow;
         u16 txpowlimit;
         u16 nvifs;
@@ -461,6 +460,7 @@ struct ath9k_htc_priv {
         bool rearm_ani;
         bool reconfig_beacon;
         unsigned int rxfilter;
+        unsigned long op_flags;
 
         struct ath9k_hw_cal_data caldata;
         struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
@@ -572,8 +572,6 @@ bool ath9k_htc_setpower(struct ath9k_htc_priv *priv,
 
 void ath9k_start_rfkill_poll(struct ath9k_htc_priv *priv);
 void ath9k_htc_rfkill_poll_state(struct ieee80211_hw *hw);
-void ath9k_htc_radio_enable(struct ieee80211_hw *hw);
-void ath9k_htc_radio_disable(struct ieee80211_hw *hw);
 
 #ifdef CONFIG_MAC80211_LEDS
 void ath9k_init_leds(struct ath9k_htc_priv *priv);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 2eadffb7971c..77d541feb910 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -207,9 +207,9 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
         else
                 priv->ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
 
-        if (priv->op_flags & OP_TSF_RESET) {
+        if (test_bit(OP_TSF_RESET, &priv->op_flags)) {
                 ath9k_hw_reset_tsf(priv->ah);
-                priv->op_flags &= ~OP_TSF_RESET;
+                clear_bit(OP_TSF_RESET, &priv->op_flags);
         } else {
                 /*
                  * Pull nexttbtt forward to reflect the current TSF.
@@ -221,7 +221,7 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
                 } while (nexttbtt < tsftu);
         }
 
-        if (priv->op_flags & OP_ENABLE_BEACON)
+        if (test_bit(OP_ENABLE_BEACON, &priv->op_flags))
                 imask |= ATH9K_INT_SWBA;
 
         ath_dbg(common, CONFIG,
@@ -269,7 +269,7 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
         else
                 priv->ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
 
-        if (priv->op_flags & OP_ENABLE_BEACON)
+        if (test_bit(OP_ENABLE_BEACON, &priv->op_flags))
                 imask |= ATH9K_INT_SWBA;
 
         ath_dbg(common, CONFIG,
@@ -365,7 +365,7 @@ static void ath9k_htc_send_beacon(struct ath9k_htc_priv *priv,
         vif = priv->cur_beacon_conf.bslot[slot];
         avp = (struct ath9k_htc_vif *)vif->drv_priv;
 
-        if (unlikely(priv->op_flags & OP_SCANNING)) {
+        if (unlikely(test_bit(OP_SCANNING, &priv->op_flags))) {
                 spin_unlock_bh(&priv->beacon_lock);
                 return;
         }
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
index 1c10e2e5c237..07df279c8d46 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
@@ -37,17 +37,18 @@ static void ath_detect_bt_priority(struct ath9k_htc_priv *priv)
 
         if (time_after(jiffies, btcoex->bt_priority_time +
                         msecs_to_jiffies(ATH_BT_PRIORITY_TIME_THRESHOLD))) {
-                priv->op_flags &= ~(OP_BT_PRIORITY_DETECTED | OP_BT_SCAN);
+                clear_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags);
+                clear_bit(OP_BT_SCAN, &priv->op_flags);
                 /* Detect if colocated bt started scanning */
                 if (btcoex->bt_priority_cnt >= ATH_BT_CNT_SCAN_THRESHOLD) {
                         ath_dbg(ath9k_hw_common(ah), BTCOEX,
                                 "BT scan detected\n");
-                        priv->op_flags |= (OP_BT_SCAN |
-                                         OP_BT_PRIORITY_DETECTED);
+                        set_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags);
+                        set_bit(OP_BT_SCAN, &priv->op_flags);
                 } else if (btcoex->bt_priority_cnt >= ATH_BT_CNT_THRESHOLD) {
                         ath_dbg(ath9k_hw_common(ah), BTCOEX,
                                 "BT priority traffic detected\n");
-                        priv->op_flags |= OP_BT_PRIORITY_DETECTED;
+                        set_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags);
                 }
 
                 btcoex->bt_priority_cnt = 0;
@@ -67,26 +68,23 @@ static void ath_btcoex_period_work(struct work_struct *work)
         struct ath_btcoex *btcoex = &priv->btcoex;
         struct ath_common *common = ath9k_hw_common(priv->ah);
         u32 timer_period;
-        bool is_btscan;
         int ret;
 
         ath_detect_bt_priority(priv);
 
-        is_btscan = !!(priv->op_flags & OP_BT_SCAN);
-
         ret = ath9k_htc_update_cap_target(priv,
-                                  !!(priv->op_flags & OP_BT_PRIORITY_DETECTED));
+                          test_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags));
         if (ret) {
                 ath_err(common, "Unable to set BTCOEX parameters\n");
                 return;
         }
 
-        ath9k_hw_btcoex_bt_stomp(priv->ah, is_btscan ? ATH_BTCOEX_STOMP_ALL :
-                        btcoex->bt_stomp_type);
+        ath9k_hw_btcoex_bt_stomp(priv->ah, test_bit(OP_BT_SCAN, &priv->op_flags) ?
+                                 ATH_BTCOEX_STOMP_ALL : btcoex->bt_stomp_type);
 
         ath9k_hw_btcoex_enable(priv->ah);
-        timer_period = is_btscan ? btcoex->btscan_no_stomp :
-                btcoex->btcoex_no_stomp;
+        timer_period = test_bit(OP_BT_SCAN, &priv->op_flags) ?
+                btcoex->btscan_no_stomp : btcoex->btcoex_no_stomp;
         ieee80211_queue_delayed_work(priv->hw, &priv->duty_cycle_work,
                                      msecs_to_jiffies(timer_period));
         ieee80211_queue_delayed_work(priv->hw, &priv->coex_period_work,
@@ -104,14 +102,15 @@ static void ath_btcoex_duty_cycle_work(struct work_struct *work)
         struct ath_hw *ah = priv->ah;
         struct ath_btcoex *btcoex = &priv->btcoex;
         struct ath_common *common = ath9k_hw_common(ah);
-        bool is_btscan = priv->op_flags & OP_BT_SCAN;
 
         ath_dbg(common, BTCOEX, "time slice work for bt and wlan\n");
 
-        if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW || is_btscan)
+        if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_LOW ||
+            test_bit(OP_BT_SCAN, &priv->op_flags))
                 ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_NONE);
         else if (btcoex->bt_stomp_type == ATH_BTCOEX_STOMP_ALL)
                 ath9k_hw_btcoex_bt_stomp(ah, ATH_BTCOEX_STOMP_LOW);
+
         ath9k_hw_btcoex_enable(priv->ah);
 }
 
@@ -141,7 +140,8 @@ static void ath_htc_resume_btcoex_work(struct ath9k_htc_priv *priv)
 
         btcoex->bt_priority_cnt = 0;
         btcoex->bt_priority_time = jiffies;
-        priv->op_flags &= ~(OP_BT_PRIORITY_DETECTED | OP_BT_SCAN);
+        clear_bit(OP_BT_PRIORITY_DETECTED, &priv->op_flags);
+        clear_bit(OP_BT_SCAN, &priv->op_flags);
         ieee80211_queue_delayed_work(priv->hw, &priv->coex_period_work, 0);
 }
 
@@ -310,95 +310,3 @@ void ath9k_start_rfkill_poll(struct ath9k_htc_priv *priv)
         if (priv->ah->caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
                 wiphy_rfkill_start_polling(priv->hw->wiphy);
 }
-
-void ath9k_htc_radio_enable(struct ieee80211_hw *hw)
-{
-        struct ath9k_htc_priv *priv = hw->priv;
-        struct ath_hw *ah = priv->ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        int ret;
-        u8 cmd_rsp;
-
-        if (!ah->curchan)
-                ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
-
-        /* Reset the HW */
-        ret = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
-        if (ret) {
-                ath_err(common,
-                        "Unable to reset hardware; reset status %d (freq %u MHz)\n",
-                        ret, ah->curchan->channel);
-        }
-
-        ath9k_cmn_update_txpow(ah, priv->curtxpow, priv->txpowlimit,
-                               &priv->curtxpow);
-
-        /* Start RX */
-        WMI_CMD(WMI_START_RECV_CMDID);
-        ath9k_host_rx_init(priv);
-
-        /* Start TX */
-        htc_start(priv->htc);
-        spin_lock_bh(&priv->tx.tx_lock);
-        priv->tx.flags &= ~ATH9K_HTC_OP_TX_QUEUES_STOP;
-        spin_unlock_bh(&priv->tx.tx_lock);
-        ieee80211_wake_queues(hw);
-
-        WMI_CMD(WMI_ENABLE_INTR_CMDID);
-
-        /* Enable LED */
-        ath9k_hw_cfg_output(ah, ah->led_pin,
-                            AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-        ath9k_hw_set_gpio(ah, ah->led_pin, 0);
-}
-
-void ath9k_htc_radio_disable(struct ieee80211_hw *hw)
-{
-        struct ath9k_htc_priv *priv = hw->priv;
-        struct ath_hw *ah = priv->ah;
-        struct ath_common *common = ath9k_hw_common(ah);
-        int ret;
-        u8 cmd_rsp;
-
-        ath9k_htc_ps_wakeup(priv);
-
-        /* Disable LED */
-        ath9k_hw_set_gpio(ah, ah->led_pin, 1);
-        ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
-
-        WMI_CMD(WMI_DISABLE_INTR_CMDID);
-
-        /* Stop TX */
-        ieee80211_stop_queues(hw);
-        ath9k_htc_tx_drain(priv);
-        WMI_CMD(WMI_DRAIN_TXQ_ALL_CMDID);
-
-        /* Stop RX */
-        WMI_CMD(WMI_STOP_RECV_CMDID);
-
-        /* Clear the WMI event queue */
-        ath9k_wmi_event_drain(priv);
-
-        /*
-         * The MIB counters have to be disabled here,
-         * since the target doesn't do it.
-         */
-        ath9k_hw_disable_mib_counters(ah);
-
-        if (!ah->curchan)
-                ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
-
-        /* Reset the HW */
-        ret = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
-        if (ret) {
-                ath_err(common,
-                        "Unable to reset hardware; reset status %d (freq %u MHz)\n",
-                        ret, ah->curchan->channel);
-        }
-
-        /* Disable the PHY */
-        ath9k_hw_phy_disable(ah);
-
-        ath9k_htc_ps_restore(priv);
-        ath9k_htc_setpower(priv, ATH9K_PM_FULL_SLEEP);
-}
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 25213d521bc2..a035a380d669 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -611,7 +611,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
         struct ath_common *common;
         int i, ret = 0, csz = 0;
 
-        priv->op_flags |= OP_INVALID;
+        set_bit(OP_INVALID, &priv->op_flags);
 
         ah = kzalloc(sizeof(struct ath_hw), GFP_KERNEL);
         if (!ah)
@@ -718,7 +718,7 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
 
         hw->queues = 4;
         hw->channel_change_time = 5000;
-        hw->max_listen_interval = 10;
+        hw->max_listen_interval = 1;
 
         hw->vif_data_size = sizeof(struct ath9k_htc_vif);
         hw->sta_data_size = sizeof(struct ath9k_htc_sta);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index abbd6effd60d..374c32ed905a 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -75,14 +75,19 @@ unlock:
 
 void ath9k_htc_ps_restore(struct ath9k_htc_priv *priv)
 {
+        bool reset;
+
         mutex_lock(&priv->htc_pm_lock);
         if (--priv->ps_usecount != 0)
                 goto unlock;
 
-        if (priv->ps_idle)
+        if (priv->ps_idle) {
+                ath9k_hw_setrxabort(priv->ah, true);
+                ath9k_hw_stopdmarecv(priv->ah, &reset);
                 ath9k_hw_setpower(priv->ah, ATH9K_PM_FULL_SLEEP);
-        else if (priv->ps_enabled)
+        } else if (priv->ps_enabled) {
                 ath9k_hw_setpower(priv->ah, ATH9K_PM_NETWORK_SLEEP);
+        }
 
 unlock:
         mutex_unlock(&priv->htc_pm_lock);
@@ -250,7 +255,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
         u8 cmd_rsp;
         int ret;
 
-        if (priv->op_flags & OP_INVALID)
+        if (test_bit(OP_INVALID, &priv->op_flags))
                 return -EIO;
 
         fastcc = !!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL);
@@ -304,7 +309,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
 
         htc_start(priv->htc);
 
-        if (!(priv->op_flags & OP_SCANNING) &&
+        if (!test_bit(OP_SCANNING, &priv->op_flags) &&
             !(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL))
                 ath9k_htc_vif_reconfig(priv);
 
@@ -750,7 +755,7 @@ void ath9k_htc_start_ani(struct ath9k_htc_priv *priv)
         common->ani.shortcal_timer = timestamp;
         common->ani.checkani_timer = timestamp;
 
-        priv->op_flags |= OP_ANI_RUNNING;
+        set_bit(OP_ANI_RUNNING, &priv->op_flags);
 
         ieee80211_queue_delayed_work(common->hw, &priv->ani_work,
                                      msecs_to_jiffies(ATH_ANI_POLLINTERVAL));
@@ -759,7 +764,7 @@ void ath9k_htc_start_ani(struct ath9k_htc_priv *priv)
 void ath9k_htc_stop_ani(struct ath9k_htc_priv *priv)
 {
         cancel_delayed_work_sync(&priv->ani_work);
-        priv->op_flags &= ~OP_ANI_RUNNING;
+        clear_bit(OP_ANI_RUNNING, &priv->op_flags);
 }
 
 void ath9k_htc_ani_work(struct work_struct *work)
@@ -944,7 +949,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
                 ath_dbg(common, CONFIG,
                         "Failed to update capability in target\n");
 
-        priv->op_flags &= ~OP_INVALID;
+        clear_bit(OP_INVALID, &priv->op_flags);
         htc_start(priv->htc);
 
         spin_lock_bh(&priv->tx.tx_lock);
@@ -973,7 +978,7 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)
 
         mutex_lock(&priv->mutex);
 
-        if (priv->op_flags & OP_INVALID) {
+        if (test_bit(OP_INVALID, &priv->op_flags)) {
                 ath_dbg(common, ANY, "Device not present\n");
                 mutex_unlock(&priv->mutex);
                 return;
@@ -1015,7 +1020,7 @@ static void ath9k_htc_stop(struct ieee80211_hw *hw)
         ath9k_htc_ps_restore(priv);
         ath9k_htc_setpower(priv, ATH9K_PM_FULL_SLEEP);
 
-        priv->op_flags |= OP_INVALID;
+        set_bit(OP_INVALID, &priv->op_flags);
 
         ath_dbg(common, CONFIG, "Driver halt\n");
         mutex_unlock(&priv->mutex);
@@ -1105,7 +1110,7 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
         ath9k_htc_set_opmode(priv);
 
         if ((priv->ah->opmode == NL80211_IFTYPE_AP) &&
-            !(priv->op_flags & OP_ANI_RUNNING)) {
+            !test_bit(OP_ANI_RUNNING, &priv->op_flags)) {
                 ath9k_hw_set_tsfadjust(priv->ah, 1);
                 ath9k_htc_start_ani(priv);
         }
@@ -1178,24 +1183,20 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
         struct ath9k_htc_priv *priv = hw->priv;
         struct ath_common *common = ath9k_hw_common(priv->ah);
         struct ieee80211_conf *conf = &hw->conf;
+        bool chip_reset = false;
+        int ret = 0;
 
         mutex_lock(&priv->mutex);
+        ath9k_htc_ps_wakeup(priv);
 
         if (changed & IEEE80211_CONF_CHANGE_IDLE) {
-                bool enable_radio = false;
-                bool idle = !!(conf->flags & IEEE80211_CONF_IDLE);
-
                 mutex_lock(&priv->htc_pm_lock);
-                if (!idle && priv->ps_idle)
-                        enable_radio = true;
-                priv->ps_idle = idle;
-                mutex_unlock(&priv->htc_pm_lock);
 
-                if (enable_radio) {
-                        ath_dbg(common, CONFIG, "not-idle: enabling radio\n");
-                        ath9k_htc_setpower(priv, ATH9K_PM_AWAKE);
-                        ath9k_htc_radio_enable(hw);
-                }
+                priv->ps_idle = !!(conf->flags & IEEE80211_CONF_IDLE);
+                if (priv->ps_idle)
+                        chip_reset = true;
+
+                mutex_unlock(&priv->htc_pm_lock);
         }
 
         /*
@@ -1210,7 +1211,7 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
                         ath9k_htc_remove_monitor_interface(priv);
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+        if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || chip_reset) {
                 struct ieee80211_channel *curchan = hw->conf.channel;
                 int pos = curchan->hw_value;
 
@@ -1223,8 +1224,8 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
 
                 if (ath9k_htc_set_channel(priv, hw, &priv->ah->channels[pos]) < 0) {
                         ath_err(common, "Unable to set channel\n");
-                        mutex_unlock(&priv->mutex);
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto out;
                 }
 
         }
@@ -1246,21 +1247,10 @@ static int ath9k_htc_config(struct ieee80211_hw *hw, u32 changed)
                                        priv->txpowlimit, &priv->curtxpow);
         }
 
-        if (changed & IEEE80211_CONF_CHANGE_IDLE) {
-                mutex_lock(&priv->htc_pm_lock);
-                if (!priv->ps_idle) {
-                        mutex_unlock(&priv->htc_pm_lock);
-                        goto out;
-                }
-                mutex_unlock(&priv->htc_pm_lock);
-
-                ath_dbg(common, CONFIG, "idle: disabling radio\n");
-                ath9k_htc_radio_disable(hw);
-        }
-
 out:
+        ath9k_htc_ps_restore(priv);
         mutex_unlock(&priv->mutex);
-        return 0;
+        return ret;
 }
 
 #define SUPPORTED_FILTERS                       \
@@ -1285,7 +1275,7 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,
         changed_flags &= SUPPORTED_FILTERS;
         *total_flags &= SUPPORTED_FILTERS;
 
-        if (priv->op_flags & OP_INVALID) {
+        if (test_bit(OP_INVALID, &priv->op_flags)) {
                 ath_dbg(ath9k_hw_common(priv->ah), ANY,
                         "Unable to configure filter on invalid state\n");
                 mutex_unlock(&priv->mutex);
@@ -1516,7 +1506,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                 ath_dbg(common, CONFIG, "Beacon enabled for BSS: %pM\n",
                         bss_conf->bssid);
                 ath9k_htc_set_tsfadjust(priv, vif);
-                priv->op_flags |= OP_ENABLE_BEACON;
+                set_bit(OP_ENABLE_BEACON, &priv->op_flags);
                 ath9k_htc_beacon_config(priv, vif);
         }
 
@@ -1529,7 +1519,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                         ath_dbg(common, CONFIG,
                                 "Beacon disabled for BSS: %pM\n",
                                 bss_conf->bssid);
-                        priv->op_flags &= ~OP_ENABLE_BEACON;
+                        clear_bit(OP_ENABLE_BEACON, &priv->op_flags);
                         ath9k_htc_beacon_config(priv, vif);
                 }
         }
@@ -1542,7 +1532,7 @@ static void ath9k_htc_bss_info_changed(struct ieee80211_hw *hw,
                     (priv->nvifs == 1) &&
                     (priv->num_ap_vif == 1) &&
                     (vif->type == NL80211_IFTYPE_AP)) {
-                        priv->op_flags |= OP_TSF_RESET;
+                        set_bit(OP_TSF_RESET, &priv->op_flags);
                 }
                 ath_dbg(common, CONFIG,
                         "Beacon interval changed for BSS: %pM\n",
@@ -1654,7 +1644,7 @@ static void ath9k_htc_sw_scan_start(struct ieee80211_hw *hw)
 
         mutex_lock(&priv->mutex);
         spin_lock_bh(&priv->beacon_lock);
-        priv->op_flags |= OP_SCANNING;
+        set_bit(OP_SCANNING, &priv->op_flags);
         spin_unlock_bh(&priv->beacon_lock);
         cancel_work_sync(&priv->ps_work);
         ath9k_htc_stop_ani(priv);
@@ -1667,7 +1657,7 @@ static void ath9k_htc_sw_scan_complete(struct ieee80211_hw *hw)
 
         mutex_lock(&priv->mutex);
         spin_lock_bh(&priv->beacon_lock);
-        priv->op_flags &= ~OP_SCANNING;
+        clear_bit(OP_SCANNING, &priv->op_flags);
         spin_unlock_bh(&priv->beacon_lock);
         ath9k_htc_ps_wakeup(priv);
         ath9k_htc_vif_reconfig(priv);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index 3e40a6461512..47e61d0da33b 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -916,7 +916,7 @@ void ath9k_host_rx_init(struct ath9k_htc_priv *priv)
 {
         ath9k_hw_rxena(priv->ah);
         ath9k_htc_opmode_init(priv);
-        ath9k_hw_startpcureceive(priv->ah, (priv->op_flags & OP_SCANNING));
+        ath9k_hw_startpcureceive(priv->ah, test_bit(OP_SCANNING, &priv->op_flags));
         priv->rx.last_rssi = ATH_RSSI_DUMMY_MARKER;
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 03d590924c64..94096607cbdd 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -1019,16 +1019,8 @@ void ar9002_hw_attach_ops(struct ath_hw *ah);
 void ar9003_hw_attach_ops(struct ath_hw *ah);
 
 void ar9002_hw_load_ani_reg(struct ath_hw *ah, struct ath9k_channel *chan);
-/*
- * ANI work can be shared between all families but a next
- * generation implementation of ANI will be used only for AR9003 only
- * for now as the other families still need to be tested with the same
- * next generation ANI. Feel free to start testing it though for the
- * older families (AR5008, AR9001, AR9002) by using modparam_force_new_ani.
- */
-extern int modparam_force_new_ani;
+
 void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning);
-void ath9k_hw_proc_mib_event(struct ath_hw *ah);
 void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan);
 
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
@@ -1038,7 +1030,8 @@ static inline bool ath9k_hw_btcoex_is_enabled(struct ath_hw *ah)
 }
 static inline bool ath9k_hw_mci_is_enabled(struct ath_hw *ah)
 {
-        return ah->btcoex_hw.enabled && (ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
+        return ah->common.btcoex_enabled &&
+               (ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
 
 }
 void ath9k_hw_btcoex_enable(struct ath_hw *ah);
diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c
index a105c9426251..91650fe50461 100644
--- a/drivers/net/wireless/ath/ath9k/link.c
+++ b/drivers/net/wireless/ath/ath9k/link.c
@@ -407,6 +407,7 @@ void ath_ani_calibrate(unsigned long data)
                 longcal ? "long" : "", shortcal ? "short" : "",
                 aniflag ? "ani" : "", common->ani.caldone ? "true" : "false");
 
+        ath9k_debug_samp_bb_mac(sc);
         ath9k_ps_restore(sc);
 
 set_timer:
@@ -415,7 +416,6 @@ set_timer:
         * The interval must be the shortest necessary to satisfy ANI,
         * short calibration and long calibration.
         */
-        ath9k_debug_samp_bb_mac(sc);
         cal_interval = ATH_LONG_CALINTERVAL;
         if (sc->sc_ah->config.enable_ani)
                 cal_interval = min(cal_interval,
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 52561b341d68..e4e73f061a22 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -19,7 +19,7 @@
 #include "ath9k.h"
 #include "btcoex.h"
 
-static u8 parse_mpdudensity(u8 mpdudensity)
+u8 ath9k_parse_mpdudensity(u8 mpdudensity)
 {
         /*
          * 802.11n D2.0 defined values for "Minimum MPDU Start Spacing":
@@ -150,8 +150,10 @@ static void __ath_cancel_work(struct ath_softc *sc)
         cancel_work_sync(&sc->hw_check_work);
         cancel_delayed_work_sync(&sc->tx_complete_work);
         cancel_delayed_work_sync(&sc->hw_pll_work);
+
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
-        cancel_work_sync(&sc->mci_work);
+        if (ath9k_hw_mci_is_enabled(sc->sc_ah))
+                cancel_work_sync(&sc->mci_work);
 #endif
 }
 
@@ -320,6 +322,7 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
                             struct ieee80211_vif *vif)
 {
         struct ath_node *an;
+        u8 density;
         an = (struct ath_node *)sta->drv_priv;
 
 #ifdef CONFIG_ATH9K_DEBUGFS
@@ -334,7 +337,8 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
                 ath_tx_node_init(sc, an);
                 an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
                                      sta->ht_cap.ampdu_factor);
-                an->mpdudensity = parse_mpdudensity(sta->ht_cap.ampdu_density);
+                density = ath9k_parse_mpdudensity(sta->ht_cap.ampdu_density);
+                an->mpdudensity = density;
         }
 }
 
@@ -516,24 +520,6 @@ irqreturn_t ath_isr(int irq, void *dev)
                 ath9k_hw_set_interrupts(ah);
         }
 
-        if (status & ATH9K_INT_MIB) {
-                /*
-                 * Disable interrupts until we service the MIB
-                 * interrupt; otherwise it will continue to
-                 * fire.
-                 */
-                ath9k_hw_disable_interrupts(ah);
-                /*
-                 * Let the hal handle the event. We assume
-                 * it will clear whatever condition caused
-                 * the interrupt.
-                 */
-                spin_lock(&common->cc_lock);
-                ath9k_hw_proc_mib_event(ah);
-                spin_unlock(&common->cc_lock);
-                ath9k_hw_enable_interrupts(ah);
-        }
-
         if (!(ah->caps.hw_caps & ATH9K_HW_CAP_AUTOSLEEP))
                 if (status & ATH9K_INT_TIM_TIMER) {
                         if (ATH_DBG_WARN_ON_ONCE(sc->ps_idle))
@@ -959,14 +945,10 @@ static void ath9k_calculate_summary_state(struct ieee80211_hw *hw,
         /*
          * Enable MIB interrupts when there are hardware phy counters.
          */
-        if ((iter_data.nstations + iter_data.nadhocs + iter_data.nmeshes) > 0) {
-                if (ah->config.enable_ani)
-                        ah->imask |= ATH9K_INT_MIB;
+        if ((iter_data.nstations + iter_data.nadhocs + iter_data.nmeshes) > 0)
                 ah->imask |= ATH9K_INT_TSFOOR;
-        } else {
-                ah->imask &= ~ATH9K_INT_MIB;
+        else
                 ah->imask &= ~ATH9K_INT_TSFOOR;
-        }
 
         ath9k_hw_set_interrupts(ah);
 
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index 7d34a504d617..64cc782587d8 100644
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -233,8 +233,21 @@ static void ath_mci_process_profile(struct ath_softc *sc,
         struct ath_mci_profile_info *entry = NULL;
 
         entry = ath_mci_find_profile(mci, info);
-        if (entry)
+        if (entry) {
+                /*
+                 * Two MCI interrupts are generated while connecting to
+                 * headset and A2DP profile, but only one MCI interrupt
+                 * is generated with last added profile type while disconnecting
+                 * both profiles.
+                 * So while adding second profile type decrement
+                 * the first one.
+                 */
+                if (entry->type != info->type) {
+                        DEC_PROF(mci, entry);
+                        INC_PROF(mci, info);
+                }
                 memcpy(entry, info, 10);
+        }
 
         if (info->start) {
                 if (!entry && !ath_mci_add_profile(common, mci, info))
@@ -335,7 +348,7 @@ static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
 
                 seq_num = *((u32 *)(rx_payload + 12));
                 ath_dbg(common, MCI,
-                        "BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%d\n",
+                        "BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%u\n",
                         profile_status.is_link, profile_status.conn_handle,
                         profile_status.is_critical, seq_num);
 
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index 75acefbd4937..5046b282a93c 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -2162,10 +2162,6 @@ enum {
 #define AR_BTCOEX_CTRL_SPDT_POLARITY                    0x80000000
 #define AR_BTCOEX_CTRL_SPDT_POLARITY_S                  31
 
-#define AR_BTCOEX_WL_WEIGHTS0                           0x18b0
-#define AR_BTCOEX_WL_WEIGHTS1                           0x18b4
-#define AR_BTCOEX_WL_WEIGHTS2                           0x18b8
-#define AR_BTCOEX_WL_WEIGHTS3                           0x18bc
 #define AR_BTCOEX_MAX_TXPWR(_x)                         (0x18c0 + ((_x) << 2))
 #define AR_BTCOEX_WL_LNA                                0x1940
 #define AR_BTCOEX_RFGAIN_CTRL                           0x1944
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 8d8306039edb..cafb4a09729a 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1165,6 +1165,7 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
 {
         struct ath_atx_tid *txtid;
         struct ath_node *an;
+        u8 density;
 
         an = (struct ath_node *)sta->drv_priv;
         txtid = ATH_AN_2_TID(an, tid);
@@ -1172,6 +1173,17 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
         if (txtid->state & (AGGR_CLEANUP | AGGR_ADDBA_COMPLETE))
                 return -EAGAIN;
 
+        /* update ampdu factor/density, they may have changed. This may happen
+         * in HT IBSS when a beacon with HT-info is received after the station
+         * has already been added.
+         */
+        if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) {
+                an->maxampdu = 1 << (IEEE80211_HT_MAX_AMPDU_FACTOR +
+                                     sta->ht_cap.ampdu_factor);
+                density = ath9k_parse_mpdudensity(sta->ht_cap.ampdu_density);
+                an->mpdudensity = density;
+        }
+
         txtid->state |= AGGR_ADDBA_PROGRESS;
         txtid->paused = true;
         *ssn = txtid->seq_start = txtid->seq_next;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 82f51dbd0d66..49765d34b4e0 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -44,6 +44,7 @@
 
 #define SDIO_DEVICE_ID_BROADCOM_4329    0x4329
 #define SDIO_DEVICE_ID_BROADCOM_4330    0x4330
+#define SDIO_DEVICE_ID_BROADCOM_4334    0x4334
 
 #define SDIO_FUNC1_BLOCKSIZE            64
 #define SDIO_FUNC2_BLOCKSIZE            512
@@ -52,6 +53,7 @@
 static const struct sdio_device_id brcmf_sdmmc_ids[] = {
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4329)},
         {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4330)},
+        {SDIO_DEVICE(SDIO_VENDOR_ID_BROADCOM, SDIO_DEVICE_ID_BROADCOM_4334)},
         { /* end: all zeroes */ },
 };
 MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index 366916494be4..537f499cc5d2 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -36,6 +36,13 @@ struct dngl_stats {
         unsigned long multicast;        /* multicast packets received */
 };
 
+struct brcmf_bus_dcmd {
+        char *name;
+        char *param;
+        int param_len;
+        struct list_head list;
+};
+
 /* interface structure between common and bus layer */
 struct brcmf_bus {
         u8 type;                /* bus type */
@@ -50,6 +57,7 @@ struct brcmf_bus {
         unsigned long tx_realloc;       /* Tx packets realloced for headroom */
         struct dngl_stats dstats;       /* Stats for dongle-based data */
         u8 align;               /* bus alignment requirement */
+        struct list_head dcmd_list;
 
         /* interface functions pointers */
         /* Stop bus module: clear pending frames, disable data flow */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 236cb9fa460c..2621dd3d7dcd 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -800,13 +800,13 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
         char iovbuf[BRCMF_EVENTING_MASK_LEN + 12];      /*  Room for
                                  "event_msgs" + '\0' + bitvec  */
         char buf[128], *ptr;
-        u32 dongle_align = drvr->bus_if->align;
-        u32 glom = 0;
         u32 roaming = 1;
         uint bcn_timeout = 3;
         int scan_assoc_time = 40;
         int scan_unassoc_time = 40;
         int i;
+        struct brcmf_bus_dcmd *cmdlst;
+        struct list_head *cur, *q;
 
         mutex_lock(&drvr->proto_block);
 
@@ -827,17 +827,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
         /* Print fw version info */
         brcmf_dbg(ERROR, "Firmware version = %s\n", buf);
 
-        /* Match Host and Dongle rx alignment */
-        brcmf_c_mkiovar("bus:txglomalign", (char *)&dongle_align, 4, iovbuf,
-                    sizeof(iovbuf));
-        brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf,
-                                  sizeof(iovbuf));
-
-        /* disable glom option per default */
-        brcmf_c_mkiovar("bus:txglom", (char *)&glom, 4, iovbuf, sizeof(iovbuf));
-        brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR, iovbuf,
-                                  sizeof(iovbuf));
-
         /* Setup timeout if Beacons are lost and roam is off to report
                  link down */
         brcmf_c_mkiovar("bcn_timeout", (char *)&bcn_timeout, 4, iovbuf,
@@ -874,6 +863,20 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
                                                  0, true);
         }
 
+        /* set bus specific command if there is any */
+        list_for_each_safe(cur, q, &drvr->bus_if->dcmd_list) {
+                cmdlst = list_entry(cur, struct brcmf_bus_dcmd, list);
+                if (cmdlst->name && cmdlst->param && cmdlst->param_len) {
+                        brcmf_c_mkiovar(cmdlst->name, cmdlst->param,
+                                        cmdlst->param_len, iovbuf,
+                                        sizeof(iovbuf));
+                        brcmf_proto_cdc_set_dcmd(drvr, 0, BRCMF_C_SET_VAR,
+                                                 iovbuf, sizeof(iovbuf));
+                }
+                list_del(cur);
+                kfree(cmdlst);
+        }
+
         mutex_unlock(&drvr->proto_block);
 
         return 0;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 01cf6c03390b..57bf1d7ee80f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -1020,6 +1020,8 @@ int brcmf_attach(uint bus_hdrlen, struct device *dev)
         INIT_WORK(&drvr->setmacaddr_work, _brcmf_set_mac_address);
         INIT_WORK(&drvr->multicast_work, _brcmf_set_multicast_list);
 
+        INIT_LIST_HEAD(&drvr->bus_if->dcmd_list);
+
         return ret;
 
 fail:
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index b023766954a6..472f2ef5c652 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -31,6 +31,8 @@
 #include <linux/firmware.h>
 #include <linux/module.h>
 #include <linux/bcma/bcma.h>
+#include <linux/debugfs.h>
+#include <linux/vmalloc.h>
 #include <asm/unaligned.h>
 #include <defs.h>
 #include <brcmu_wifi.h>
@@ -48,6 +50,9 @@
 
 #define CBUF_LEN        (128)
 
+/* Device console log buffer state */
+#define CONSOLE_BUFFER_MAX      2024
+
 struct rte_log_le {
         __le32 buf;             /* Can't be pointer on (64-bit) hosts */
         __le32 buf_size;
@@ -281,7 +286,7 @@ struct rte_console {
  * Shared structure between dongle and the host.
  * The structure contains pointers to trap or assert information.
  */
-#define SDPCM_SHARED_VERSION       0x0002
+#define SDPCM_SHARED_VERSION       0x0003
 #define SDPCM_SHARED_VERSION_MASK  0x00FF
 #define SDPCM_SHARED_ASSERT_BUILT  0x0100
 #define SDPCM_SHARED_ASSERT        0x0200
@@ -428,6 +433,29 @@ struct brcmf_console {
         u8 *buf;                /* Log buffer (host copy) */
         uint last;              /* Last buffer read index */
 };
+
+struct brcmf_trap_info {
+        __le32          type;
+        __le32          epc;
+        __le32          cpsr;
+        __le32          spsr;
+        __le32          r0;     /* a1 */
+        __le32          r1;     /* a2 */
+        __le32          r2;     /* a3 */
+        __le32          r3;     /* a4 */
+        __le32          r4;     /* v1 */
+        __le32          r5;     /* v2 */
+        __le32          r6;     /* v3 */
+        __le32          r7;     /* v4 */
+        __le32          r8;     /* v5 */
+        __le32          r9;     /* sb/v6 */
+        __le32          r10;    /* sl/v7 */
+        __le32          r11;    /* fp/v8 */
+        __le32          r12;    /* ip */
+        __le32          r13;    /* sp */
+        __le32          r14;    /* lr */
+        __le32          pc;     /* r15 */
+};
 #endif                          /* DEBUG */
 
 struct sdpcm_shared {
@@ -439,6 +467,7 @@ struct sdpcm_shared {
         u32 console_addr;       /* Address of struct rte_console */
         u32 msgtrace_addr;
         u8 tag[32];
+        u32 brpt_addr;
 };
 
 struct sdpcm_shared_le {
@@ -450,6 +479,7 @@ struct sdpcm_shared_le {
         __le32 console_addr;    /* Address of struct rte_console */
         __le32 msgtrace_addr;
         u8 tag[32];
+        __le32 brpt_addr;
 };
 
 
@@ -2953,13 +2983,311 @@ brcmf_sdbrcm_bus_txctl(struct device *dev, unsigned char *msg, uint msglen)
 }
 
 #ifdef DEBUG
+static inline bool brcmf_sdio_valid_shared_address(u32 addr)
+{
+        return !(addr == 0 || ((~addr >> 16) & 0xffff) == (addr & 0xffff));
+}
+
+static int brcmf_sdio_readshared(struct brcmf_sdio *bus,
+                                 struct sdpcm_shared *sh)
+{
+        u32 addr;
+        int rv;
+        u32 shaddr = 0;
+        struct sdpcm_shared_le sh_le;
+        __le32 addr_le;
+
+        shaddr = bus->ramsize - 4;
+
+        /*
+         * Read last word in socram to determine
+         * address of sdpcm_shared structure
+         */
+        rv = brcmf_sdbrcm_membytes(bus, false, shaddr,
+                                   (u8 *)&addr_le, 4);
+        if (rv < 0)
+                return rv;
+
+        addr = le32_to_cpu(addr_le);
+
+        brcmf_dbg(INFO, "sdpcm_shared address 0x%08X\n", addr);
+
+        /*
+         * Check if addr is valid.
+         * NVRAM length at the end of memory should have been overwritten.
+         */
+        if (!brcmf_sdio_valid_shared_address(addr)) {
+                        brcmf_dbg(ERROR, "invalid sdpcm_shared address 0x%08X\n",
+                                  addr);
+                        return -EINVAL;
+        }
+
+        /* Read hndrte_shared structure */
+        rv = brcmf_sdbrcm_membytes(bus, false, addr, (u8 *)&sh_le,
+                                   sizeof(struct sdpcm_shared_le));
+        if (rv < 0)
+                return rv;
+
+        /* Endianness */
+        sh->flags = le32_to_cpu(sh_le.flags);
+        sh->trap_addr = le32_to_cpu(sh_le.trap_addr);
+        sh->assert_exp_addr = le32_to_cpu(sh_le.assert_exp_addr);
+        sh->assert_file_addr = le32_to_cpu(sh_le.assert_file_addr);
+        sh->assert_line = le32_to_cpu(sh_le.assert_line);
+        sh->console_addr = le32_to_cpu(sh_le.console_addr);
+        sh->msgtrace_addr = le32_to_cpu(sh_le.msgtrace_addr);
+
+        if ((sh->flags & SDPCM_SHARED_VERSION_MASK) != SDPCM_SHARED_VERSION) {
+                brcmf_dbg(ERROR,
+                          "sdpcm_shared version mismatch: dhd %d dongle %d\n",
+                          SDPCM_SHARED_VERSION,
+                          sh->flags & SDPCM_SHARED_VERSION_MASK);
+                return -EPROTO;
+        }
+
+        return 0;
+}
+
+static int brcmf_sdio_dump_console(struct brcmf_sdio *bus,
+                                   struct sdpcm_shared *sh, char __user *data,
+                                   size_t count)
+{
+        u32 addr, console_ptr, console_size, console_index;
+        char *conbuf = NULL;
+        __le32 sh_val;
+        int rv;
+        loff_t pos = 0;
+        int nbytes = 0;
+
+        /* obtain console information from device memory */
+        addr = sh->console_addr + offsetof(struct rte_console, log_le);
+        rv = brcmf_sdbrcm_membytes(bus, false, addr,
+                        (u8 *)&sh_val, sizeof(u32));
+        if (rv < 0)
+                return rv;
+        console_ptr = le32_to_cpu(sh_val);
+
+        addr = sh->console_addr + offsetof(struct rte_console, log_le.buf_size);
+        rv = brcmf_sdbrcm_membytes(bus, false, addr,
+                        (u8 *)&sh_val, sizeof(u32));
+        if (rv < 0)
+                return rv;
+        console_size = le32_to_cpu(sh_val);
+
+        addr = sh->console_addr + offsetof(struct rte_console, log_le.idx);
+        rv = brcmf_sdbrcm_membytes(bus, false, addr,
+                        (u8 *)&sh_val, sizeof(u32));
+        if (rv < 0)
+                return rv;
+        console_index = le32_to_cpu(sh_val);
+
+        /* allocate buffer for console data */
+        if (console_size <= CONSOLE_BUFFER_MAX)
+                conbuf = vzalloc(console_size+1);
+
+        if (!conbuf)
+                return -ENOMEM;
+
+        /* obtain the console data from device */
+        conbuf[console_size] = '\0';
+        rv = brcmf_sdbrcm_membytes(bus, false, console_ptr, (u8 *)conbuf,
+                                   console_size);
+        if (rv < 0)
+                goto done;
+
+        rv = simple_read_from_buffer(data, count, &pos,
+                                     conbuf + console_index,
+                                     console_size - console_index);
+        if (rv < 0)
+                goto done;
+
+        nbytes = rv;
+        if (console_index > 0) {
+                pos = 0;
+                rv = simple_read_from_buffer(data+nbytes, count, &pos,
+                                             conbuf, console_index - 1);
+                if (rv < 0)
+                        goto done;
+                rv += nbytes;
+        }
+done:
+        vfree(conbuf);
+        return rv;
+}
+
+static int brcmf_sdio_trap_info(struct brcmf_sdio *bus, struct sdpcm_shared *sh,
+                                char __user *data, size_t count)
+{
+        int error, res;
+        char buf[350];
+        struct brcmf_trap_info tr;
+        int nbytes;
+        loff_t pos = 0;
+
+        if ((sh->flags & SDPCM_SHARED_TRAP) == 0)
+                return 0;
+
+        error = brcmf_sdbrcm_membytes(bus, false, sh->trap_addr, (u8 *)&tr,
+                                      sizeof(struct brcmf_trap_info));
+        if (error < 0)
+                return error;
+
+        nbytes = brcmf_sdio_dump_console(bus, sh, data, count);
+        if (nbytes < 0)
+                return nbytes;
+
+        res = scnprintf(buf, sizeof(buf),
+                        "dongle trap info: type 0x%x @ epc 0x%08x\n"
+                        "  cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
+                        "  lr   0x%08x pc   0x%08x offset 0x%x\n"
+                        "  r0   0x%08x r1   0x%08x r2 0x%08x r3 0x%08x\n"
+                        "  r4   0x%08x r5   0x%08x r6 0x%08x r7 0x%08x\n",
+                        le32_to_cpu(tr.type), le32_to_cpu(tr.epc),
+                        le32_to_cpu(tr.cpsr), le32_to_cpu(tr.spsr),
+                        le32_to_cpu(tr.r13), le32_to_cpu(tr.r14),
+                        le32_to_cpu(tr.pc), sh->trap_addr,
+                        le32_to_cpu(tr.r0), le32_to_cpu(tr.r1),
+                        le32_to_cpu(tr.r2), le32_to_cpu(tr.r3),
+                        le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),
+                        le32_to_cpu(tr.r6), le32_to_cpu(tr.r7));
+
+        error = simple_read_from_buffer(data+nbytes, count, &pos, buf, res);
+        if (error < 0)
+                return error;
+
+        nbytes += error;
+        return nbytes;
+}
+
+static int brcmf_sdio_assert_info(struct brcmf_sdio *bus,
+                                  struct sdpcm_shared *sh, char __user *data,
+                                  size_t count)
+{
+        int error = 0;
+        char buf[200];
+        char file[80] = "?";
+        char expr[80] = "<???>";
+        int res;
+        loff_t pos = 0;
+
+        if ((sh->flags & SDPCM_SHARED_ASSERT_BUILT) == 0) {
+                brcmf_dbg(INFO, "firmware not built with -assert\n");
+                return 0;
+        } else if ((sh->flags & SDPCM_SHARED_ASSERT) == 0) {
+                brcmf_dbg(INFO, "no assert in dongle\n");
+                return 0;
+        }
+
+        if (sh->assert_file_addr != 0) {
+                error = brcmf_sdbrcm_membytes(bus, false, sh->assert_file_addr,
+                                              (u8 *)file, 80);
+                if (error < 0)
+                        return error;
+        }
+        if (sh->assert_exp_addr != 0) {
+                error = brcmf_sdbrcm_membytes(bus, false, sh->assert_exp_addr,
+                                              (u8 *)expr, 80);
+                if (error < 0)
+                        return error;
+        }
+
+        res = scnprintf(buf, sizeof(buf),
+                        "dongle assert: %s:%d: assert(%s)\n",
+                        file, sh->assert_line, expr);
+        return simple_read_from_buffer(data, count, &pos, buf, res);
+}
+
+static int brcmf_sdbrcm_checkdied(struct brcmf_sdio *bus)
+{
+        int error;
+        struct sdpcm_shared sh;
+
+        down(&bus->sdsem);
+        error = brcmf_sdio_readshared(bus, &sh);
+        up(&bus->sdsem);
+
+        if (error < 0)
+                return error;
+
+        if ((sh.flags & SDPCM_SHARED_ASSERT_BUILT) == 0)
+                brcmf_dbg(INFO, "firmware not built with -assert\n");
+        else if (sh.flags & SDPCM_SHARED_ASSERT)
+                brcmf_dbg(ERROR, "assertion in dongle\n");
+
+        if (sh.flags & SDPCM_SHARED_TRAP)
+                brcmf_dbg(ERROR, "firmware trap in dongle\n");
+
+        return 0;
+}
+
+static int brcmf_sdbrcm_died_dump(struct brcmf_sdio *bus, char __user *data,
+                                  size_t count, loff_t *ppos)
+{
+        int error = 0;
+        struct sdpcm_shared sh;
+        int nbytes = 0;
+        loff_t pos = *ppos;
+
+        if (pos != 0)
+                return 0;
+
+        down(&bus->sdsem);
+        error = brcmf_sdio_readshared(bus, &sh);
+        if (error < 0)
+                goto done;
+
+        error = brcmf_sdio_assert_info(bus, &sh, data, count);
+        if (error < 0)
+                goto done;
+
+        nbytes = error;
+        error = brcmf_sdio_trap_info(bus, &sh, data, count);
+        if (error < 0)
+                goto done;
+
+        error += nbytes;
+        *ppos += error;
+done:
+        up(&bus->sdsem);
+        return error;
+}
+
+static ssize_t brcmf_sdio_forensic_read(struct file *f, char __user *data,
+                                        size_t count, loff_t *ppos)
+{
+        struct brcmf_sdio *bus = f->private_data;
+        int res;
+
+        res = brcmf_sdbrcm_died_dump(bus, data, count, ppos);
+        if (res > 0)
+                *ppos += res;
+        return (ssize_t)res;
+}
+
+static const struct file_operations brcmf_sdio_forensic_ops = {
+        .owner = THIS_MODULE,
+        .open = simple_open,
+        .read = brcmf_sdio_forensic_read
+};
+
 static void brcmf_sdio_debugfs_create(struct brcmf_sdio *bus)
 {
         struct brcmf_pub *drvr = bus->sdiodev->bus_if->drvr;
+        struct dentry *dentry = brcmf_debugfs_get_devdir(drvr);
 
+        if (IS_ERR_OR_NULL(dentry))
+                return;
+
+        debugfs_create_file("forensics", S_IRUGO, dentry, bus,
+                            &brcmf_sdio_forensic_ops);
         brcmf_debugfs_create_sdio_count(drvr, &bus->sdcnt);
 }
 #else
+static int brcmf_sdbrcm_checkdied(struct brcmf_sdio *bus)
+{
+        return 0;
+}
+
 static void brcmf_sdio_debugfs_create(struct brcmf_sdio *bus)
 {
 }
@@ -2991,11 +3319,13 @@ brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
                           rxlen, msglen);
         } else if (timeleft == 0) {
                 brcmf_dbg(ERROR, "resumed on timeout\n");
+                brcmf_sdbrcm_checkdied(bus);
         } else if (pending) {
                 brcmf_dbg(CTL, "cancelled\n");
                 return -ERESTARTSYS;
         } else {
                 brcmf_dbg(CTL, "resumed for unknown reason?\n");
+                brcmf_sdbrcm_checkdied(bus);
         }
 
         if (rxlen)
@@ -3006,45 +3336,10 @@ brcmf_sdbrcm_bus_rxctl(struct device *dev, unsigned char *msg, uint msglen)
         return rxlen ? (int)rxlen : -ETIMEDOUT;
 }
 
-static int brcmf_sdbrcm_downloadvars(struct brcmf_sdio *bus, void *arg, int len)
-{
-        int bcmerror = 0;
-
-        brcmf_dbg(TRACE, "Enter\n");
-
-        /* Basic sanity checks */
-        if (bus->sdiodev->bus_if->drvr_up) {
-                bcmerror = -EISCONN;
-                goto err;
-        }
-        if (!len) {
-                bcmerror = -EOVERFLOW;
-                goto err;
-        }
-
-        /* Free the old ones and replace with passed variables */
-        kfree(bus->vars);
-
-        bus->vars = kmalloc(len, GFP_ATOMIC);
-        bus->varsz = bus->vars ? len : 0;
-        if (bus->vars == NULL) {
-                bcmerror = -ENOMEM;
-                goto err;
-        }
-
-        /* Copy the passed variables, which should include the
-                 terminating double-null */
-        memcpy(bus->vars, arg, bus->varsz);
-err:
-        return bcmerror;
-}
-
 static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
 {
         int bcmerror = 0;
-        u32 varsize;
         u32 varaddr;
-        u8 *vbuffer;
         u32 varsizew;
         __le32 varsizew_le;
 #ifdef DEBUG
@@ -3053,56 +3348,44 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
 
         /* Even if there are no vars are to be written, we still
                  need to set the ramsize. */
-        varsize = bus->varsz ? roundup(bus->varsz, 4) : 0;
-        varaddr = (bus->ramsize - 4) - varsize;
+        varaddr = (bus->ramsize - 4) - bus->varsz;
 
         if (bus->vars) {
-                vbuffer = kzalloc(varsize, GFP_ATOMIC);
-                if (!vbuffer)
-                        return -ENOMEM;
-
-                memcpy(vbuffer, bus->vars, bus->varsz);
-
                 /* Write the vars list */
-                bcmerror =
-                    brcmf_sdbrcm_membytes(bus, true, varaddr, vbuffer, varsize);
+                bcmerror = brcmf_sdbrcm_membytes(bus, true, varaddr,
+                                                 bus->vars, bus->varsz);
 #ifdef DEBUG
                 /* Verify NVRAM bytes */
-                brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize);
-                nvram_ularray = kmalloc(varsize, GFP_ATOMIC);
-                if (!nvram_ularray) {
-                        kfree(vbuffer);
+                brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n",
+                          bus->varsz);
+                nvram_ularray = kmalloc(bus->varsz, GFP_ATOMIC);
+                if (!nvram_ularray)
                         return -ENOMEM;
-                }
 
                 /* Upload image to verify downloaded contents. */
-                memset(nvram_ularray, 0xaa, varsize);
+                memset(nvram_ularray, 0xaa, bus->varsz);
 
                 /* Read the vars list to temp buffer for comparison */
-                bcmerror =
-                    brcmf_sdbrcm_membytes(bus, false, varaddr, nvram_ularray,
-                                     varsize);
+                bcmerror = brcmf_sdbrcm_membytes(bus, false, varaddr,
+                                                 nvram_ularray, bus->varsz);
                 if (bcmerror) {
                         brcmf_dbg(ERROR, "error %d on reading %d nvram bytes at 0x%08x\n",
-                                  bcmerror, varsize, varaddr);
+                                  bcmerror, bus->varsz, varaddr);
                 }
                 /* Compare the org NVRAM with the one read from RAM */
-                if (memcmp(vbuffer, nvram_ularray, varsize))
+                if (memcmp(bus->vars, nvram_ularray, bus->varsz))
                         brcmf_dbg(ERROR, "Downloaded NVRAM image is corrupted\n");
                 else
                         brcmf_dbg(ERROR, "Download/Upload/Compare of NVRAM ok\n");
 
                 kfree(nvram_ularray);
 #endif                          /* DEBUG */
-
-                kfree(vbuffer);
         }
 
         /* adjust to the user specified RAM */
         brcmf_dbg(INFO, "Physical memory size: %d\n", bus->ramsize);
         brcmf_dbg(INFO, "Vars are at %d, orig varsize is %d\n",
-                  varaddr, varsize);
-        varsize = ((bus->ramsize - 4) - varaddr);
+                  varaddr, bus->varsz);
 
         /*
          * Determine the length token:
@@ -3113,13 +3396,13 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus)
                 varsizew = 0;
                 varsizew_le = cpu_to_le32(0);
         } else {
-                varsizew = varsize / 4;
+                varsizew = bus->varsz / 4;
                 varsizew = (~varsizew << 16) | (varsizew & 0x0000FFFF);
                 varsizew_le = cpu_to_le32(varsizew);
         }
 
         brcmf_dbg(INFO, "New varsize is %d, length token=0x%08x\n",
-                  varsize, varsizew);
+                  bus->varsz, varsizew);
 
         /* Write the length token to the last word */
         bcmerror = brcmf_sdbrcm_membytes(bus, true, (bus->ramsize - 4),
@@ -3243,13 +3526,21 @@ err:
  * by two NULs.
 */
 
-static uint brcmf_process_nvram_vars(char *varbuf, uint len)
+static int brcmf_process_nvram_vars(struct brcmf_sdio *bus)
 {
+        char *varbuf;
         char *dp;
         bool findNewline;
         int column;
-        uint buf_len, n;
+        int ret = 0;
+        uint buf_len, n, len;
+
+        len = bus->firmware->size;
+        varbuf = vmalloc(len);
+        if (!varbuf)
+                return -ENOMEM;
 
+        memcpy(varbuf, bus->firmware->data, len);
         dp = varbuf;
 
         findNewline = false;
@@ -3278,56 +3569,44 @@ static uint brcmf_process_nvram_vars(char *varbuf, uint len)
                 column++;
         }
         buf_len = dp - varbuf;
-
         while (dp < varbuf + n)
                 *dp++ = 0;
 
-        return buf_len;
+        kfree(bus->vars);
+        /* roundup needed for download to device */
+        bus->varsz = roundup(buf_len + 1, 4);
+        bus->vars = kmalloc(bus->varsz, GFP_KERNEL);
+        if (bus->vars == NULL) {
+                bus->varsz = 0;
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        /* copy the processed variables and add null termination */
+        memcpy(bus->vars, varbuf, buf_len);
+        bus->vars[buf_len] = 0;
+err:
+        vfree(varbuf);
+        return ret;
 }
 
 static int brcmf_sdbrcm_download_nvram(struct brcmf_sdio *bus)
 {
-        uint len;
-        char *memblock = NULL;
-        char *bufp;
         int ret;
 
+        if (bus->sdiodev->bus_if->drvr_up)
+                return -EISCONN;
+
         ret = request_firmware(&bus->firmware, BRCMF_SDIO_NV_NAME,
                                &bus->sdiodev->func[2]->dev);
         if (ret) {
                 brcmf_dbg(ERROR, "Fail to request nvram %d\n", ret);
                 return ret;
         }
-        bus->fw_ptr = 0;
 
-        memblock = kmalloc(MEMBLOCK, GFP_ATOMIC);
-        if (memblock == NULL) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        len = brcmf_sdbrcm_get_image(memblock, MEMBLOCK, bus);
-
-        if (len > 0 && len < MEMBLOCK) {
-                bufp = memblock;
-                bufp[len] = 0;
-                len = brcmf_process_nvram_vars(bufp, len);
-                bufp += len;
-                *bufp++ = 0;
-                if (len)
-                        ret = brcmf_sdbrcm_downloadvars(bus, memblock, len + 1);
-                if (ret)
-                        brcmf_dbg(ERROR, "error downloading vars: %d\n", ret);
-        } else {
-                brcmf_dbg(ERROR, "error reading nvram file: %d\n", len);
-                ret = -EIO;
-        }
-
-err:
-        kfree(memblock);
+        ret = brcmf_process_nvram_vars(bus);
 
         release_firmware(bus->firmware);
-        bus->fw_ptr = 0;
 
         return ret;
 }
@@ -3606,6 +3885,8 @@ static bool brcmf_sdbrcm_chipmatch(u16 chipid)
                 return true;
         if (chipid == BCM4330_CHIP_ID)
                 return true;
+        if (chipid == BCM4334_CHIP_ID)
+                return true;
         return false;
 }
 
@@ -3817,6 +4098,7 @@ static void brcmf_sdbrcm_release_dongle(struct brcmf_sdio *bus)
 static void brcmf_sdbrcm_release(struct brcmf_sdio *bus)
 {
         brcmf_dbg(TRACE, "Enter\n");
+
         if (bus) {
                 /* De-register interrupt handler */
                 brcmf_sdio_intr_unregister(bus->sdiodev);
@@ -3838,6 +4120,10 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
 {
         int ret;
         struct brcmf_sdio *bus;
+        struct brcmf_bus_dcmd *dlst;
+        u32 dngl_txglom;
+        u32 dngl_txglomalign;
+        u8 idx;
 
         brcmf_dbg(TRACE, "Enter\n");
 
@@ -3923,6 +4209,26 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
         brcmf_sdio_debugfs_create(bus);
         brcmf_dbg(INFO, "completed!!\n");
 
+        /* sdio bus core specific dcmd */
+        idx = brcmf_sdio_chip_getinfidx(bus->ci, BCMA_CORE_SDIO_DEV);
+        dlst = kzalloc(sizeof(struct brcmf_bus_dcmd), GFP_KERNEL);
+        if (dlst) {
+                if (bus->ci->c_inf[idx].rev < 12) {
+                        /* for sdio core rev < 12, disable txgloming */
+                        dngl_txglom = 0;
+                        dlst->name = "bus:txglom";
+                        dlst->param = (char *)&dngl_txglom;
+                        dlst->param_len = sizeof(u32);
+                } else {
+                        /* otherwise, set txglomalign */
+                        dngl_txglomalign = bus->sdiodev->bus_if->align;
+                        dlst->name = "bus:txglomalign";
+                        dlst->param = (char *)&dngl_txglomalign;
+                        dlst->param_len = sizeof(u32);
+                }
+                list_add(&dlst->list, &bus->sdiodev->bus_if->dcmd_list);
+        }
+
         /* if firmware path present try to download and bring up bus */
         ret = brcmf_bus_start(bus->sdiodev->dev);
         if (ret != 0) {
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index f8e1f1c84d08..58155e23d220 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -403,6 +403,23 @@ static int brcmf_sdio_chip_recognition(struct brcmf_sdio_dev *sdiodev,
                 ci->c_inf[3].cib = 0x03004211;
                 ci->ramsize = 0x48000;
                 break;
+        case BCM4334_CHIP_ID:
+                ci->c_inf[0].wrapbase = 0x18100000;
+                ci->c_inf[0].cib = 0x29004211;
+                ci->c_inf[1].id = BCMA_CORE_SDIO_DEV;
+                ci->c_inf[1].base = 0x18002000;
+                ci->c_inf[1].wrapbase = 0x18102000;
+                ci->c_inf[1].cib = 0x0d004211;
+                ci->c_inf[2].id = BCMA_CORE_INTERNAL_MEM;
+                ci->c_inf[2].base = 0x18004000;
+                ci->c_inf[2].wrapbase = 0x18104000;
+                ci->c_inf[2].cib = 0x13080401;
+                ci->c_inf[3].id = BCMA_CORE_ARM_CM3;
+                ci->c_inf[3].base = 0x18003000;
+                ci->c_inf[3].wrapbase = 0x18103000;
+                ci->c_inf[3].cib = 0x07004211;
+                ci->ramsize = 0x80000;
+                break;
         default:
                 brcmf_dbg(ERROR, "chipid 0x%x is not supported\n", ci->chip);
                 return -ENODEV;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
index eb77ac3cfb6b..2d365d3486df 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
@@ -15,7 +15,9 @@
  */
 
 #include <linux/types.h>
+#include <net/cfg80211.h>
 #include <net/mac80211.h>
+#include <net/regulatory.h>
 
 #include <defs.h>
 #include "pub.h"
@@ -23,73 +25,17 @@
 #include "main.h"
 #include "stf.h"
 #include "channel.h"
+#include "mac80211_if.h"
 
 /* QDB() macro takes a dB value and converts to a quarter dB value */
 #define QDB(n) ((n) * BRCMS_TXPWR_DB_FACTOR)
 
-#define  LOCALE_CHAN_01_11       (1<<0)
-#define  LOCALE_CHAN_12_13       (1<<1)
-#define  LOCALE_CHAN_14          (1<<2)
-#define  LOCALE_SET_5G_LOW_JP1   (1<<3) /* 34-48, step 2 */
-#define  LOCALE_SET_5G_LOW_JP2   (1<<4) /* 34-46, step 4 */
-#define  LOCALE_SET_5G_LOW1      (1<<5) /* 36-48, step 4 */
-#define  LOCALE_SET_5G_LOW2      (1<<6) /* 52 */
-#define  LOCALE_SET_5G_LOW3      (1<<7) /* 56-64, step 4 */
-#define  LOCALE_SET_5G_MID1      (1<<8) /* 100-116, step 4 */
-#define  LOCALE_SET_5G_MID2      (1<<9) /* 120-124, step 4 */
-#define  LOCALE_SET_5G_MID3      (1<<10)        /* 128 */
-#define  LOCALE_SET_5G_HIGH1     (1<<11)        /* 132-140, step 4 */
-#define  LOCALE_SET_5G_HIGH2     (1<<12)        /* 149-161, step 4 */
-#define  LOCALE_SET_5G_HIGH3     (1<<13)        /* 165 */
-#define  LOCALE_CHAN_52_140_ALL  (1<<14)
-#define  LOCALE_SET_5G_HIGH4     (1<<15)        /* 184-216 */
-
-#define  LOCALE_CHAN_36_64      (LOCALE_SET_5G_LOW1 | \
-                                 LOCALE_SET_5G_LOW2 | \
-                                 LOCALE_SET_5G_LOW3)
-#define  LOCALE_CHAN_52_64      (LOCALE_SET_5G_LOW2 | LOCALE_SET_5G_LOW3)
-#define  LOCALE_CHAN_100_124    (LOCALE_SET_5G_MID1 | LOCALE_SET_5G_MID2)
-#define  LOCALE_CHAN_100_140    (LOCALE_SET_5G_MID1 | LOCALE_SET_5G_MID2 | \
-                                  LOCALE_SET_5G_MID3 | LOCALE_SET_5G_HIGH1)
-#define  LOCALE_CHAN_149_165    (LOCALE_SET_5G_HIGH2 | LOCALE_SET_5G_HIGH3)
-#define  LOCALE_CHAN_184_216    LOCALE_SET_5G_HIGH4
-
-#define  LOCALE_CHAN_01_14      (LOCALE_CHAN_01_11 | \
-                                 LOCALE_CHAN_12_13 | \
-                                 LOCALE_CHAN_14)
-
-#define  LOCALE_RADAR_SET_NONE            0
-#define  LOCALE_RADAR_SET_1               1
-
-#define  LOCALE_RESTRICTED_NONE           0
-#define  LOCALE_RESTRICTED_SET_2G_SHORT   1
-#define  LOCALE_RESTRICTED_CHAN_165       2
-#define  LOCALE_CHAN_ALL_5G               3
-#define  LOCALE_RESTRICTED_JAPAN_LEGACY   4
-#define  LOCALE_RESTRICTED_11D_2G         5
-#define  LOCALE_RESTRICTED_11D_5G         6
-#define  LOCALE_RESTRICTED_LOW_HI         7
-#define  LOCALE_RESTRICTED_12_13_14       8
-
-#define LOCALE_2G_IDX_i                 0
-#define LOCALE_5G_IDX_11                0
 #define LOCALE_MIMO_IDX_bn              0
 #define LOCALE_MIMO_IDX_11n             0
 
-/* max of BAND_5G_PWR_LVLS and 6 for 2.4 GHz */
-#define BRCMS_MAXPWR_TBL_SIZE           6
 /* max of BAND_5G_PWR_LVLS and 14 for 2.4 GHz */
 #define BRCMS_MAXPWR_MIMO_TBL_SIZE      14
 
-/* power level in group of 2.4GHz band channels:
- * maxpwr[0] - CCK  channels [1]
- * maxpwr[1] - CCK  channels [2-10]
- * maxpwr[2] - CCK  channels [11-14]
- * maxpwr[3] - OFDM channels [1]
- * maxpwr[4] - OFDM channels [2-10]
- * maxpwr[5] - OFDM channels [11-14]
- */
-
 /* maxpwr mapping to 5GHz band channels:
  * maxpwr[0] - channels [34-48]
  * maxpwr[1] - channels [52-60]
@@ -101,16 +47,8 @@
 
 #define LC(id)  LOCALE_MIMO_IDX_ ## id
 
-#define LC_2G(id)       LOCALE_2G_IDX_ ## id
-
-#define LC_5G(id)       LOCALE_5G_IDX_ ## id
-
-#define LOCALES(band2, band5, mimo2, mimo5) \
-                {LC_2G(band2), LC_5G(band5), LC(mimo2), LC(mimo5)}
-
-/* macro to get 2.4 GHz channel group index for tx power */
-#define CHANNEL_POWER_IDX_2G_CCK(c) (((c) < 2) ? 0 : (((c) < 11) ? 1 : 2))
-#define CHANNEL_POWER_IDX_2G_OFDM(c) (((c) < 2) ? 3 : (((c) < 11) ? 4 : 5))
+#define LOCALES(mimo2, mimo5) \
+                {LC(mimo2), LC(mimo5)}
 
 /* macro to get 5 GHz channel group index for tx power */
 #define CHANNEL_POWER_IDX_5G(c) (((c) < 52) ? 0 : \
@@ -118,18 +56,37 @@
                                  (((c) < 100) ? 2 : \
                                  (((c) < 149) ? 3 : 4))))
 
-#define ISDFS_EU(fl)            (((fl) & BRCMS_DFS_EU) == BRCMS_DFS_EU)
-
-struct brcms_cm_band {
-        /* struct locale_info flags */
-        u8 locale_flags;
-        /* List of valid channels in the country */
-        struct brcms_chanvec valid_channels;
-        /* List of restricted use channels */
-        const struct brcms_chanvec *restricted_channels;
-        /* List of radar sensitive channels */
-        const struct brcms_chanvec *radar_channels;
-        u8 PAD[8];
+#define BRCM_2GHZ_2412_2462     REG_RULE(2412-10, 2462+10, 40, 0, 19, 0)
+#define BRCM_2GHZ_2467_2472     REG_RULE(2467-10, 2472+10, 20, 0, 19, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_NO_IBSS)
+
+#define BRCM_5GHZ_5180_5240     REG_RULE(5180-10, 5240+10, 40, 0, 21, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_NO_IBSS)
+#define BRCM_5GHZ_5260_5320     REG_RULE(5260-10, 5320+10, 40, 0, 21, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_DFS | \
+                                         NL80211_RRF_NO_IBSS)
+#define BRCM_5GHZ_5500_5700     REG_RULE(5500-10, 5700+10, 40, 0, 21, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_DFS | \
+                                         NL80211_RRF_NO_IBSS)
+#define BRCM_5GHZ_5745_5825     REG_RULE(5745-10, 5825+10, 40, 0, 21, \
+                                         NL80211_RRF_PASSIVE_SCAN | \
+                                         NL80211_RRF_NO_IBSS)
+
+static const struct ieee80211_regdomain brcms_regdom_x2 = {
+        .n_reg_rules = 7,
+        .alpha2 = "X2",
+        .reg_rules = {
+                BRCM_2GHZ_2412_2462,
+                BRCM_2GHZ_2467_2472,
+                BRCM_5GHZ_5180_5240,
+                BRCM_5GHZ_5260_5320,
+                BRCM_5GHZ_5500_5700,
+                BRCM_5GHZ_5745_5825,
+        }
 };
 
  /* locale per-channel tx power limits for MIMO frames
@@ -141,337 +98,23 @@ struct locale_mimo_info {
         s8 maxpwr20[BRCMS_MAXPWR_MIMO_TBL_SIZE];
         /* tx 40 MHz power limits, qdBm units */
         s8 maxpwr40[BRCMS_MAXPWR_MIMO_TBL_SIZE];
-        u8 flags;
 };
 
 /* Country names and abbreviations with locale defined from ISO 3166 */
 struct country_info {
-        const u8 locale_2G;     /* 2.4G band locale */
-        const u8 locale_5G;     /* 5G band locale */
         const u8 locale_mimo_2G;        /* 2.4G mimo info */
         const u8 locale_mimo_5G;        /* 5G mimo info */
 };
 
+struct brcms_regd {
+        struct country_info country;
+        const struct ieee80211_regdomain *regdomain;
+};
+
 struct brcms_cm_info {
         struct brcms_pub *pub;
         struct brcms_c_info *wlc;
-        char srom_ccode[BRCM_CNTRY_BUF_SZ];     /* Country Code in SROM */
-        uint srom_regrev;       /* Regulatory Rev for the SROM ccode */
-        const struct country_info *country;     /* current country def */
-        char ccode[BRCM_CNTRY_BUF_SZ];  /* current internal Country Code */
-        uint regrev;            /* current Regulatory Revision */
-        char country_abbrev[BRCM_CNTRY_BUF_SZ]; /* current advertised ccode */
-        /* per-band state (one per phy/radio) */
-        struct brcms_cm_band bandstate[MAXBANDS];
-        /* quiet channels currently for radar sensitivity or 11h support */
-        /* channels on which we cannot transmit */
-        struct brcms_chanvec quiet_channels;
-};
-
-/* locale channel and power info. */
-struct locale_info {
-        u32 valid_channels;
-        /* List of radar sensitive channels */
-        u8 radar_channels;
-        /* List of channels used only if APs are detected */
-        u8 restricted_channels;
-        /* Max tx pwr in qdBm for each sub-band */
-        s8 maxpwr[BRCMS_MAXPWR_TBL_SIZE];
-        /* Country IE advertised max tx pwr in dBm per sub-band */
-        s8 pub_maxpwr[BAND_5G_PWR_LVLS];
-        u8 flags;
-};
-
-/* Regulatory Matrix Spreadsheet (CLM) MIMO v3.7.9 */
-
-/*
- * Some common channel sets
- */
-
-/* No channels */
-static const struct brcms_chanvec chanvec_none = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* All 2.4 GHz HW channels */
-static const struct brcms_chanvec chanvec_all_2G = {
-        {0xfe, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* All 5 GHz HW channels */
-static const struct brcms_chanvec chanvec_all_5G = {
-        {0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x11, 0x11,
-         0x01, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x11,
-         0x11, 0x11, 0x20, 0x22, 0x22, 0x00, 0x00, 0x11,
-         0x11, 0x11, 0x11, 0x01}
-};
-
-/*
- * Radar channel sets
- */
-
-/* Channels 52 - 64, 100 - 140 */
-static const struct brcms_chanvec radar_set1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11,  /* 52 - 60 */
-         0x01, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x11,  /* 64, 100 - 124 */
-         0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 128 - 140 */
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/*
- * Restricted channel sets
- */
-
-/* Channels 34, 38, 42, 46 */
-static const struct brcms_chanvec restricted_set_japan_legacy = {
-        {0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* Channels 12, 13 */
-static const struct brcms_chanvec restricted_set_2g_short = {
-        {0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* Channel 165 */
-static const struct brcms_chanvec restricted_chan_165 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* Channels 36 - 48 & 149 - 165 */
-static const struct brcms_chanvec restricted_low_hi = {
-        {0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x01, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x20, 0x22, 0x22, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* Channels 12 - 14 */
-static const struct brcms_chanvec restricted_set_12_13_14 = {
-        {0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-/* global memory to provide working buffer for expanded locale */
-
-static const struct brcms_chanvec *g_table_radar_set[] = {
-        &chanvec_none,
-        &radar_set1
-};
-
-static const struct brcms_chanvec *g_table_restricted_chan[] = {
-        &chanvec_none,          /* restricted_set_none */
-        &restricted_set_2g_short,
-        &restricted_chan_165,
-        &chanvec_all_5G,
-        &restricted_set_japan_legacy,
-        &chanvec_all_2G,        /* restricted_set_11d_2G */
-        &chanvec_all_5G,        /* restricted_set_11d_5G */
-        &restricted_low_hi,
-        &restricted_set_12_13_14
-};
-
-static const struct brcms_chanvec locale_2g_01_11 = {
-        {0xfe, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_2g_12_13 = {
-        {0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_2g_14 = {
-        {0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW_JP1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x54, 0x55, 0x01, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW_JP2 = {
-        {0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x01, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW2 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_LOW3 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
-         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_MID1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_MID2 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_MID3 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_HIGH1 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x10, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_HIGH2 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x20, 0x22, 0x02, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_HIGH3 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_52_140_ALL = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x11,
-         0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
-         0x11, 0x11, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00}
-};
-
-static const struct brcms_chanvec locale_5g_HIGH4 = {
-        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
-         0x11, 0x11, 0x11, 0x11}
-};
-
-static const struct brcms_chanvec *g_table_locale_base[] = {
-        &locale_2g_01_11,
-        &locale_2g_12_13,
-        &locale_2g_14,
-        &locale_5g_LOW_JP1,
-        &locale_5g_LOW_JP2,
-        &locale_5g_LOW1,
-        &locale_5g_LOW2,
-        &locale_5g_LOW3,
-        &locale_5g_MID1,
-        &locale_5g_MID2,
-        &locale_5g_MID3,
-        &locale_5g_HIGH1,
-        &locale_5g_HIGH2,
-        &locale_5g_HIGH3,
-        &locale_5g_52_140_ALL,
-        &locale_5g_HIGH4
-};
-
-static void brcms_c_locale_add_channels(struct brcms_chanvec *target,
-                                    const struct brcms_chanvec *channels)
-{
-        u8 i;
-        for (i = 0; i < sizeof(struct brcms_chanvec); i++)
-                target->vec[i] |= channels->vec[i];
-}
-
-static void brcms_c_locale_get_channels(const struct locale_info *locale,
-                                    struct brcms_chanvec *channels)
-{
-        u8 i;
-
-        memset(channels, 0, sizeof(struct brcms_chanvec));
-
-        for (i = 0; i < ARRAY_SIZE(g_table_locale_base); i++) {
-                if (locale->valid_channels & (1 << i))
-                        brcms_c_locale_add_channels(channels,
-                                                g_table_locale_base[i]);
-        }
-}
-
-/*
- * Locale Definitions - 2.4 GHz
- */
-static const struct locale_info locale_i = {    /* locale i. channel 1 - 13 */
-        LOCALE_CHAN_01_11 | LOCALE_CHAN_12_13,
-        LOCALE_RADAR_SET_NONE,
-        LOCALE_RESTRICTED_SET_2G_SHORT,
-        {QDB(19), QDB(19), QDB(19),
-         QDB(19), QDB(19), QDB(19)},
-        {20, 20, 20, 0},
-        BRCMS_EIRP
-};
-
-/*
- * Locale Definitions - 5 GHz
- */
-static const struct locale_info locale_11 = {
-        /* locale 11. channel 36 - 48, 52 - 64, 100 - 140, 149 - 165 */
-        LOCALE_CHAN_36_64 | LOCALE_CHAN_100_140 | LOCALE_CHAN_149_165,
-        LOCALE_RADAR_SET_1,
-        LOCALE_RESTRICTED_NONE,
-        {QDB(21), QDB(21), QDB(21), QDB(21), QDB(21)},
-        {23, 23, 23, 30, 30},
-        BRCMS_EIRP | BRCMS_DFS_EU
-};
-
-static const struct locale_info *g_locale_2g_table[] = {
-        &locale_i
-};
-
-static const struct locale_info *g_locale_5g_table[] = {
-        &locale_11
+        const struct brcms_regd *world_regd;
 };
 
 /*
@@ -484,7 +127,6 @@ static const struct locale_mimo_info locale_bn = {
         {0, 0, QDB(13), QDB(13), QDB(13),
          QDB(13), QDB(13), QDB(13), QDB(13), QDB(13),
          QDB(13), 0, 0},
-        0
 };
 
 static const struct locale_mimo_info *g_mimo_2g_table[] = {
@@ -497,114 +139,20 @@ static const struct locale_mimo_info *g_mimo_2g_table[] = {
 static const struct locale_mimo_info locale_11n = {
         { /* 12.5 dBm */ 50, 50, 50, QDB(15), QDB(15)},
         {QDB(14), QDB(15), QDB(15), QDB(15), QDB(15)},
-        0
 };
 
 static const struct locale_mimo_info *g_mimo_5g_table[] = {
         &locale_11n
 };
 
-static const struct {
-        char abbrev[BRCM_CNTRY_BUF_SZ]; /* country abbreviation */
-        struct country_info country;
-} cntry_locales[] = {
+static const struct brcms_regd cntry_locales[] = {
+        /* Worldwide RoW 2, must always be at index 0 */
         {
-        "X2", LOCALES(i, 11, bn, 11n)}, /* Worldwide RoW 2 */
-};
-
-#ifdef SUPPORT_40MHZ
-/* 20MHz channel info for 40MHz pairing support */
-struct chan20_info {
-        u8 sb;
-        u8 adj_sbs;
+                .country = LOCALES(bn, 11n),
+                .regdomain = &brcms_regdom_x2,
+        },
 };
 
-/* indicates adjacent channels that are allowed for a 40 Mhz channel and
- * those that permitted by the HT
- */
-struct chan20_info chan20_info[] = {
-        /* 11b/11g */
-/* 0 */ {1, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 1 */ {2, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 2 */ {3, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 3 */ {4, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 4 */ {5, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 5 */ {6, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 6 */ {7, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 7 */ {8, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 8 */ {9, (CH_UPPER_SB | CH_LOWER_SB | CH_EWA_VALID)},
-/* 9 */ {10, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 10 */ {11, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 11 */ {12, (CH_LOWER_SB)},
-/* 12 */ {13, (CH_LOWER_SB)},
-/* 13 */ {14, (CH_LOWER_SB)},
-
-/* 11a japan high */
-/* 14 */ {34, (CH_UPPER_SB)},
-/* 15 */ {38, (CH_LOWER_SB)},
-/* 16 */ {42, (CH_LOWER_SB)},
-/* 17 */ {46, (CH_LOWER_SB)},
-
-/* 11a usa low */
-/* 18 */ {36, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 19 */ {40, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 20 */ {44, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 21 */ {48, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 22 */ {52, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 23 */ {56, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 24 */ {60, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 25 */ {64, (CH_LOWER_SB | CH_EWA_VALID)},
-
-/* 11a Europe */
-/* 26 */ {100, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 27 */ {104, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 28 */ {108, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 29 */ {112, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 30 */ {116, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 31 */ {120, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 32 */ {124, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 33 */ {128, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 34 */ {132, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 35 */ {136, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 36 */ {140, (CH_LOWER_SB)},
-
-/* 11a usa high, ref5 only */
-/* The 0x80 bit in pdiv means these are REF5, other entries are REF20 */
-/* 37 */ {149, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 38 */ {153, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 39 */ {157, (CH_UPPER_SB | CH_EWA_VALID)},
-/* 40 */ {161, (CH_LOWER_SB | CH_EWA_VALID)},
-/* 41 */ {165, (CH_LOWER_SB)},
-
-/* 11a japan */
-/* 42 */ {184, (CH_UPPER_SB)},
-/* 43 */ {188, (CH_LOWER_SB)},
-/* 44 */ {192, (CH_UPPER_SB)},
-/* 45 */ {196, (CH_LOWER_SB)},
-/* 46 */ {200, (CH_UPPER_SB)},
-/* 47 */ {204, (CH_LOWER_SB)},
-/* 48 */ {208, (CH_UPPER_SB)},
-/* 49 */ {212, (CH_LOWER_SB)},
-/* 50 */ {216, (CH_LOWER_SB)}
-};
-#endif                          /* SUPPORT_40MHZ */
-
-static const struct locale_info *brcms_c_get_locale_2g(u8 locale_idx)
-{
-        if (locale_idx >= ARRAY_SIZE(g_locale_2g_table))
-                return NULL; /* error condition */
-
-        return g_locale_2g_table[locale_idx];
-}
-
-static const struct locale_info *brcms_c_get_locale_5g(u8 locale_idx)
-{
-        if (locale_idx >= ARRAY_SIZE(g_locale_5g_table))
-                return NULL; /* error condition */
-
-        return g_locale_5g_table[locale_idx];
-}
-
 static const struct locale_mimo_info *brcms_c_get_mimo_2g(u8 locale_idx)
 {
         if (locale_idx >= ARRAY_SIZE(g_mimo_2g_table))
@@ -621,13 +169,6 @@ static const struct locale_mimo_info *brcms_c_get_mimo_5g(u8 locale_idx)
         return g_mimo_5g_table[locale_idx];
 }
 
-static int
-brcms_c_country_aggregate_map(struct brcms_cm_info *wlc_cm, const char *ccode,
-                          char *mapped_ccode, uint *mapped_regrev)
-{
-        return false;
-}
-
 /*
  * Indicates whether the country provided is valid to pass
  * to cfg80211 or not.
@@ -662,155 +203,24 @@ static bool brcms_c_country_valid(const char *ccode)
         return true;
 }
 
-/* Lookup a country info structure from a null terminated country
- * abbreviation and regrev directly with no translation.
- */
-static const struct country_info *
-brcms_c_country_lookup_direct(const char *ccode, uint regrev)
+static const struct brcms_regd *brcms_world_regd(const char *regdom, int len)
 {
-        uint size, i;
-
-        /* Should just return 0 for single locale driver. */
-        /* Keep it this way in case we add more locales. (for now anyway) */
-
-        /*
-         * all other country def arrays are for regrev == 0, so if
-         * regrev is non-zero, fail
-         */
-        if (regrev > 0)
-                return NULL;
-
-        /* find matched table entry from country code */
-        size = ARRAY_SIZE(cntry_locales);
-        for (i = 0; i < size; i++) {
-                if (strcmp(ccode, cntry_locales[i].abbrev) == 0)
-                        return &cntry_locales[i].country;
-        }
-        return NULL;
-}
-
-static const struct country_info *
-brcms_c_countrycode_map(struct brcms_cm_info *wlc_cm, const char *ccode,
-                        char *mapped_ccode, uint *mapped_regrev)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-        const struct country_info *country;
-        uint srom_regrev = wlc_cm->srom_regrev;
-        const char *srom_ccode = wlc_cm->srom_ccode;
-        int mapped;
-
-        /* check for currently supported ccode size */
-        if (strlen(ccode) > (BRCM_CNTRY_BUF_SZ - 1)) {
-                wiphy_err(wlc->wiphy, "wl%d: %s: ccode \"%s\" too long for "
-                          "match\n", wlc->pub->unit, __func__, ccode);
-                return NULL;
-        }
-
-        /* default mapping is the given ccode and regrev 0 */
-        strncpy(mapped_ccode, ccode, BRCM_CNTRY_BUF_SZ);
-        *mapped_regrev = 0;
-
-        /* If the desired country code matches the srom country code,
-         * then the mapped country is the srom regulatory rev.
-         * Otherwise look for an aggregate mapping.
-         */
-        if (!strcmp(srom_ccode, ccode)) {
-                *mapped_regrev = srom_regrev;
-                mapped = 0;
-                wiphy_err(wlc->wiphy, "srom_code == ccode %s\n", __func__);
-        } else {
-                mapped =
-                    brcms_c_country_aggregate_map(wlc_cm, ccode, mapped_ccode,
-                                              mapped_regrev);
-        }
-
-        /* find the matching built-in country definition */
-        country = brcms_c_country_lookup_direct(mapped_ccode, *mapped_regrev);
-
-        /* if there is not an exact rev match, default to rev zero */
-        if (country == NULL && *mapped_regrev != 0) {
-                *mapped_regrev = 0;
-                country =
-                    brcms_c_country_lookup_direct(mapped_ccode, *mapped_regrev);
-        }
-
-        return country;
-}
-
-/* Lookup a country info structure from a null terminated country code
- * The lookup is case sensitive.
- */
-static const struct country_info *
-brcms_c_country_lookup(struct brcms_c_info *wlc, const char *ccode)
-{
-        const struct country_info *country;
-        char mapped_ccode[BRCM_CNTRY_BUF_SZ];
-        uint mapped_regrev;
-
-        /*
-         * map the country code to a built-in country code, regrev, and
-         * country_info struct
-         */
-        country = brcms_c_countrycode_map(wlc->cmi, ccode, mapped_ccode,
-                                          &mapped_regrev);
-
-        return country;
-}
-
-/*
- * reset the quiet channels vector to the union
- * of the restricted and radar channel sets
- */
-static void brcms_c_quiet_channels_reset(struct brcms_cm_info *wlc_cm)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-        uint i, j;
-        struct brcms_band *band;
-        const struct brcms_chanvec *chanvec;
-
-        memset(&wlc_cm->quiet_channels, 0, sizeof(struct brcms_chanvec));
-
-        band = wlc->band;
-        for (i = 0; i < wlc->pub->_nbands;
-             i++, band = wlc->bandstate[OTHERBANDUNIT(wlc)]) {
-
-                /* initialize quiet channels for restricted channels */
-                chanvec = wlc_cm->bandstate[band->bandunit].restricted_channels;
-                for (j = 0; j < sizeof(struct brcms_chanvec); j++)
-                        wlc_cm->quiet_channels.vec[j] |= chanvec->vec[j];
+        const struct brcms_regd *regd = NULL;
+        int i;
 
+        for (i = 0; i < ARRAY_SIZE(cntry_locales); i++) {
+                if (!strncmp(regdom, cntry_locales[i].regdomain->alpha2, len)) {
+                        regd = &cntry_locales[i];
+                        break;
+                }
         }
-}
-
-/* Is the channel valid for the current locale and current band? */
-static bool brcms_c_valid_channel20(struct brcms_cm_info *wlc_cm, uint val)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
 
-        return ((val < MAXCHANNEL) &&
-                isset(wlc_cm->bandstate[wlc->band->bandunit].valid_channels.vec,
-                      val));
+        return regd;
 }
 
-/* Is the channel valid for the current locale and specified band? */
-static bool brcms_c_valid_channel20_in_band(struct brcms_cm_info *wlc_cm,
-                                            uint bandunit, uint val)
-{
-        return ((val < MAXCHANNEL)
-                && isset(wlc_cm->bandstate[bandunit].valid_channels.vec, val));
-}
-
-/* Is the channel valid for the current locale? (but don't consider channels not
- *   available due to bandlocking)
- */
-static bool brcms_c_valid_channel20_db(struct brcms_cm_info *wlc_cm, uint val)
+static const struct brcms_regd *brcms_default_world_regd(void)
 {
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-
-        return brcms_c_valid_channel20(wlc->cmi, val) ||
-                (!wlc->bandlocked
-                 && brcms_c_valid_channel20_in_band(wlc->cmi,
-                                                    OTHERBANDUNIT(wlc), val));
+        return &cntry_locales[0];
 }
 
 /* JP, J1 - J10 are Japan ccodes */
@@ -820,12 +230,6 @@ static bool brcms_c_japan_ccode(const char *ccode)
                 (ccode[1] == 'P' || (ccode[1] >= '1' && ccode[1] <= '9')));
 }
 
-/* Returns true if currently set country is Japan or variant */
-static bool brcms_c_japan(struct brcms_c_info *wlc)
-{
-        return brcms_c_japan_ccode(wlc->cmi->country_abbrev);
-}
-
 static void
 brcms_c_channel_min_txpower_limits_with_local_constraint(
                 struct brcms_cm_info *wlc_cm, struct txpwr_limits *txpwr,
@@ -901,140 +305,16 @@ brcms_c_channel_min_txpower_limits_with_local_constraint(
 
 }
 
-/* Update the radio state (enable/disable) and tx power targets
- * based on a new set of channel/regulatory information
- */
-static void brcms_c_channels_commit(struct brcms_cm_info *wlc_cm)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-        uint chan;
-        struct txpwr_limits txpwr;
-
-        /* search for the existence of any valid channel */
-        for (chan = 0; chan < MAXCHANNEL; chan++) {
-                if (brcms_c_valid_channel20_db(wlc->cmi, chan))
-                        break;
-        }
-        if (chan == MAXCHANNEL)
-                chan = INVCHANNEL;
-
-        /*
-         * based on the channel search above, set or
-         * clear WL_RADIO_COUNTRY_DISABLE.
-         */
-        if (chan == INVCHANNEL) {
-                /*
-                 * country/locale with no valid channels, set
-                 * the radio disable bit
-                 */
-                mboolset(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
-                wiphy_err(wlc->wiphy, "wl%d: %s: no valid channel for \"%s\" "
-                          "nbands %d bandlocked %d\n", wlc->pub->unit,
-                          __func__, wlc_cm->country_abbrev, wlc->pub->_nbands,
-                          wlc->bandlocked);
-        } else if (mboolisset(wlc->pub->radio_disabled,
-                              WL_RADIO_COUNTRY_DISABLE)) {
-                /*
-                 * country/locale with valid channel, clear
-                 * the radio disable bit
-                 */
-                mboolclr(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
-        }
-
-        /*
-         * Now that the country abbreviation is set, if the radio supports 2G,
-         * then set channel 14 restrictions based on the new locale.
-         */
-        if (wlc->pub->_nbands > 1 || wlc->band->bandtype == BRCM_BAND_2G)
-                wlc_phy_chanspec_ch14_widefilter_set(wlc->band->pi,
-                                                     brcms_c_japan(wlc) ? true :
-                                                     false);
-
-        if (wlc->pub->up && chan != INVCHANNEL) {
-                brcms_c_channel_reg_limits(wlc_cm, wlc->chanspec, &txpwr);
-                brcms_c_channel_min_txpower_limits_with_local_constraint(wlc_cm,
-                        &txpwr, BRCMS_TXPWR_MAX);
-                wlc_phy_txpower_limit_set(wlc->band->pi, &txpwr, wlc->chanspec);
-        }
-}
-
-static int
-brcms_c_channels_init(struct brcms_cm_info *wlc_cm,
-                      const struct country_info *country)
-{
-        struct brcms_c_info *wlc = wlc_cm->wlc;
-        uint i, j;
-        struct brcms_band *band;
-        const struct locale_info *li;
-        struct brcms_chanvec sup_chan;
-        const struct locale_mimo_info *li_mimo;
-
-        band = wlc->band;
-        for (i = 0; i < wlc->pub->_nbands;
-             i++, band = wlc->bandstate[OTHERBANDUNIT(wlc)]) {
-
-                li = (band->bandtype == BRCM_BAND_5G) ?
-                    brcms_c_get_locale_5g(country->locale_5G) :
-                    brcms_c_get_locale_2g(country->locale_2G);
-                wlc_cm->bandstate[band->bandunit].locale_flags = li->flags;
-                li_mimo = (band->bandtype == BRCM_BAND_5G) ?
-                    brcms_c_get_mimo_5g(country->locale_mimo_5G) :
-                    brcms_c_get_mimo_2g(country->locale_mimo_2G);
-
-                /* merge the mimo non-mimo locale flags */
-                wlc_cm->bandstate[band->bandunit].locale_flags |=
-                    li_mimo->flags;
-
-                wlc_cm->bandstate[band->bandunit].restricted_channels =
-                    g_table_restricted_chan[li->restricted_channels];
-                wlc_cm->bandstate[band->bandunit].radar_channels =
-                    g_table_radar_set[li->radar_channels];
-
-                /*
-                 * set the channel availability, masking out the channels
-                 * that may not be supported on this phy.
-                 */
-                wlc_phy_chanspec_band_validch(band->pi, band->bandtype,
-                                              &sup_chan);
-                brcms_c_locale_get_channels(li,
-                                        &wlc_cm->bandstate[band->bandunit].
-                                        valid_channels);
-                for (j = 0; j < sizeof(struct brcms_chanvec); j++)
-                        wlc_cm->bandstate[band->bandunit].valid_channels.
-                            vec[j] &= sup_chan.vec[j];
-        }
-
-        brcms_c_quiet_channels_reset(wlc_cm);
-        brcms_c_channels_commit(wlc_cm);
-
-        return 0;
-}
-
 /*
  * set the driver's current country and regulatory information
  * using a country code as the source. Look up built in country
  * information found with the country code.
  */
 static void
-brcms_c_set_country_common(struct brcms_cm_info *wlc_cm,
-                       const char *country_abbrev,
-                       const char *ccode, uint regrev,
-                       const struct country_info *country)
+brcms_c_set_country(struct brcms_cm_info *wlc_cm,
+                    const struct brcms_regd *regd)
 {
-        const struct locale_info *locale;
         struct brcms_c_info *wlc = wlc_cm->wlc;
-        char prev_country_abbrev[BRCM_CNTRY_BUF_SZ];
-
-        /* save current country state */
-        wlc_cm->country = country;
-
-        memset(&prev_country_abbrev, 0, BRCM_CNTRY_BUF_SZ);
-        strncpy(prev_country_abbrev, wlc_cm->country_abbrev,
-                BRCM_CNTRY_BUF_SZ - 1);
-
-        strncpy(wlc_cm->country_abbrev, country_abbrev, BRCM_CNTRY_BUF_SZ - 1);
-        strncpy(wlc_cm->ccode, ccode, BRCM_CNTRY_BUF_SZ - 1);
-        wlc_cm->regrev = regrev;
 
         if ((wlc->pub->_n_enab & SUPPORT_11N) !=
             wlc->protection->nmode_user)
@@ -1042,75 +322,19 @@ brcms_c_set_country_common(struct brcms_cm_info *wlc_cm,
 
         brcms_c_stf_ss_update(wlc, wlc->bandstate[BAND_2G_INDEX]);
         brcms_c_stf_ss_update(wlc, wlc->bandstate[BAND_5G_INDEX]);
-        /* set or restore gmode as required by regulatory */
-        locale = brcms_c_get_locale_2g(country->locale_2G);
-        if (locale && (locale->flags & BRCMS_NO_OFDM))
-                brcms_c_set_gmode(wlc, GMODE_LEGACY_B, false);
-        else
-                brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
 
-        brcms_c_channels_init(wlc_cm, country);
+        brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
 
         return;
 }
 
-static int
-brcms_c_set_countrycode_rev(struct brcms_cm_info *wlc_cm,
-                        const char *country_abbrev,
-                        const char *ccode, int regrev)
-{
-        const struct country_info *country;
-        char mapped_ccode[BRCM_CNTRY_BUF_SZ];
-        uint mapped_regrev;
-
-        /* if regrev is -1, lookup the mapped country code,
-         * otherwise use the ccode and regrev directly
-         */
-        if (regrev == -1) {
-                /*
-                 * map the country code to a built-in country
-                 * code, regrev, and country_info
-                 */
-                country =
-                    brcms_c_countrycode_map(wlc_cm, ccode, mapped_ccode,
-                                        &mapped_regrev);
-        } else {
-                /* find the matching built-in country definition */
-                country = brcms_c_country_lookup_direct(ccode, regrev);
-                strncpy(mapped_ccode, ccode, BRCM_CNTRY_BUF_SZ);
-                mapped_regrev = regrev;
-        }
-
-        if (country == NULL)
-                return -EINVAL;
-
-        /* set the driver state for the country */
-        brcms_c_set_country_common(wlc_cm, country_abbrev, mapped_ccode,
-                               mapped_regrev, country);
-
-        return 0;
-}
-
-/*
- * set the driver's current country and regulatory information using
- * a country code as the source. Lookup built in country information
- * found with the country code.
- */
-static int
-brcms_c_set_countrycode(struct brcms_cm_info *wlc_cm, const char *ccode)
-{
-        char country_abbrev[BRCM_CNTRY_BUF_SZ];
-        strncpy(country_abbrev, ccode, BRCM_CNTRY_BUF_SZ);
-        return brcms_c_set_countrycode_rev(wlc_cm, country_abbrev, ccode, -1);
-}
-
 struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)
 {
         struct brcms_cm_info *wlc_cm;
-        char country_abbrev[BRCM_CNTRY_BUF_SZ];
-        const struct country_info *country;
         struct brcms_pub *pub = wlc->pub;
         struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;
+        const char *ccode = sprom->alpha2;
+        int ccode_len = sizeof(sprom->alpha2);
 
         BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
@@ -1122,24 +346,27 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)
         wlc->cmi = wlc_cm;
 
         /* store the country code for passing up as a regulatory hint */
-        if (sprom->alpha2 && brcms_c_country_valid(sprom->alpha2))
-                strncpy(wlc->pub->srom_ccode, sprom->alpha2, sizeof(sprom->alpha2));
+        wlc_cm->world_regd = brcms_world_regd(ccode, ccode_len);
+        if (brcms_c_country_valid(ccode))
+                strncpy(wlc->pub->srom_ccode, ccode, ccode_len);
 
         /*
-         * internal country information which must match
-         * regulatory constraints in firmware
+         * If no custom world domain is found in the SROM, use the
+         * default "X2" domain.
          */
-        memset(country_abbrev, 0, BRCM_CNTRY_BUF_SZ);
-        strncpy(country_abbrev, "X2", sizeof(country_abbrev) - 1);
-        country = brcms_c_country_lookup(wlc, country_abbrev);
+        if (!wlc_cm->world_regd) {
+                wlc_cm->world_regd = brcms_default_world_regd();
+                ccode = wlc_cm->world_regd->regdomain->alpha2;
+                ccode_len = BRCM_CNTRY_BUF_SZ - 1;
+        }
 
         /* save default country for exiting 11d regulatory mode */
-        strncpy(wlc->country_default, country_abbrev, BRCM_CNTRY_BUF_SZ - 1);
+        strncpy(wlc->country_default, ccode, ccode_len);
 
         /* initialize autocountry_default to driver default */
-        strncpy(wlc->autocountry_default, "X2", BRCM_CNTRY_BUF_SZ - 1);
+        strncpy(wlc->autocountry_default, ccode, ccode_len);
 
-        brcms_c_set_countrycode(wlc_cm, country_abbrev);
+        brcms_c_set_country(wlc_cm, wlc_cm->world_regd);
 
         return wlc_cm;
 }
@@ -1149,31 +376,15 @@ void brcms_c_channel_mgr_detach(struct brcms_cm_info *wlc_cm)
         kfree(wlc_cm);
 }
 
-u8
-brcms_c_channel_locale_flags_in_band(struct brcms_cm_info *wlc_cm,
-                                     uint bandunit)
-{
-        return wlc_cm->bandstate[bandunit].locale_flags;
-}
-
-static bool
-brcms_c_quiet_chanspec(struct brcms_cm_info *wlc_cm, u16 chspec)
-{
-        return (wlc_cm->wlc->pub->_n_enab & SUPPORT_11N) &&
-                CHSPEC_IS40(chspec) ?
-                (isset(wlc_cm->quiet_channels.vec,
-                       lower_20_sb(CHSPEC_CHANNEL(chspec))) ||
-                 isset(wlc_cm->quiet_channels.vec,
-                       upper_20_sb(CHSPEC_CHANNEL(chspec)))) :
-                isset(wlc_cm->quiet_channels.vec, CHSPEC_CHANNEL(chspec));
-}
-
 void
 brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, u16 chanspec,
                          u8 local_constraint_qdbm)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
+        const struct ieee80211_reg_rule *reg_rule;
         struct txpwr_limits txpwr;
+        int ret;
 
         brcms_c_channel_reg_limits(wlc_cm, chanspec, &txpwr);
 
@@ -1181,8 +392,15 @@ brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm, u16 chanspec,
                 wlc_cm, &txpwr, local_constraint_qdbm
         );
 
+        /* set or restore gmode as required by regulatory */
+        ret = freq_reg_info(wlc->wiphy, ch->center_freq, 0, &reg_rule);
+        if (!ret && (reg_rule->flags & NL80211_RRF_NO_OFDM))
+                brcms_c_set_gmode(wlc, GMODE_LEGACY_B, false);
+        else
+                brcms_c_set_gmode(wlc, wlc->protection->gmode_user, false);
+
         brcms_b_set_chanspec(wlc->hw, chanspec,
-                              (brcms_c_quiet_chanspec(wlc_cm, chanspec) != 0),
+                              !!(ch->flags & IEEE80211_CHAN_PASSIVE_SCAN),
                               &txpwr);
 }
 
@@ -1191,15 +409,14 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,
                        struct txpwr_limits *txpwr)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
         uint i;
         uint chan;
         int maxpwr;
         int delta;
         const struct country_info *country;
         struct brcms_band *band;
-        const struct locale_info *li;
         int conducted_max = BRCMS_TXPWR_MAX;
-        int conducted_ofdm_max = BRCMS_TXPWR_MAX;
         const struct locale_mimo_info *li_mimo;
         int maxpwr20, maxpwr40;
         int maxpwr_idx;
@@ -1207,67 +424,35 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,
 
         memset(txpwr, 0, sizeof(struct txpwr_limits));
 
-        if (!brcms_c_valid_chanspec_db(wlc_cm, chanspec)) {
-                country = brcms_c_country_lookup(wlc, wlc->autocountry_default);
-                if (country == NULL)
-                        return;
-        } else {
-                country = wlc_cm->country;
-        }
+        if (WARN_ON(!ch))
+                return;
+
+        country = &wlc_cm->world_regd->country;
 
         chan = CHSPEC_CHANNEL(chanspec);
         band = wlc->bandstate[chspec_bandunit(chanspec)];
-        li = (band->bandtype == BRCM_BAND_5G) ?
-            brcms_c_get_locale_5g(country->locale_5G) :
-            brcms_c_get_locale_2g(country->locale_2G);
-
         li_mimo = (band->bandtype == BRCM_BAND_5G) ?
             brcms_c_get_mimo_5g(country->locale_mimo_5G) :
             brcms_c_get_mimo_2g(country->locale_mimo_2G);
 
-        if (li->flags & BRCMS_EIRP) {
-                delta = band->antgain;
-        } else {
-                delta = 0;
-                if (band->antgain > QDB(6))
-                        delta = band->antgain - QDB(6); /* Excess over 6 dB */
-        }
+        delta = band->antgain;
 
-        if (li == &locale_i) {
+        if (band->bandtype == BRCM_BAND_2G)
                 conducted_max = QDB(22);
-                conducted_ofdm_max = QDB(22);
-        }
+
+        maxpwr = QDB(ch->max_power) - delta;
+        maxpwr = max(maxpwr, 0);
+        maxpwr = min(maxpwr, conducted_max);
 
         /* CCK txpwr limits for 2.4G band */
         if (band->bandtype == BRCM_BAND_2G) {
-                maxpwr = li->maxpwr[CHANNEL_POWER_IDX_2G_CCK(chan)];
-
-                maxpwr = maxpwr - delta;
-                maxpwr = max(maxpwr, 0);
-                maxpwr = min(maxpwr, conducted_max);
-
                 for (i = 0; i < BRCMS_NUM_RATES_CCK; i++)
                         txpwr->cck[i] = (u8) maxpwr;
         }
 
-        /* OFDM txpwr limits for 2.4G or 5G bands */
-        if (band->bandtype == BRCM_BAND_2G)
-                maxpwr = li->maxpwr[CHANNEL_POWER_IDX_2G_OFDM(chan)];
-        else
-                maxpwr = li->maxpwr[CHANNEL_POWER_IDX_5G(chan)];
-
-        maxpwr = maxpwr - delta;
-        maxpwr = max(maxpwr, 0);
-        maxpwr = min(maxpwr, conducted_ofdm_max);
-
-        /* Keep OFDM lmit below CCK limit */
-        if (band->bandtype == BRCM_BAND_2G)
-                maxpwr = min_t(int, maxpwr, txpwr->cck[0]);
-
-        for (i = 0; i < BRCMS_NUM_RATES_OFDM; i++)
+        for (i = 0; i < BRCMS_NUM_RATES_OFDM; i++) {
                 txpwr->ofdm[i] = (u8) maxpwr;
 
-        for (i = 0; i < BRCMS_NUM_RATES_OFDM; i++) {
                 /*
                  * OFDM 40 MHz SISO has the same power as the corresponding
                  * MCS0-7 rate unless overriden by the locale specific code.
@@ -1282,14 +467,9 @@ brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm, u16 chanspec,
                 txpwr->ofdm_40_cdd[i] = 0;
         }
 
-        /* MIMO/HT specific limits */
-        if (li_mimo->flags & BRCMS_EIRP) {
-                delta = band->antgain;
-        } else {
-                delta = 0;
-                if (band->antgain > QDB(6))
-                        delta = band->antgain - QDB(6); /* Excess over 6 dB */
-        }
+        delta = 0;
+        if (band->antgain > QDB(6))
+                delta = band->antgain - QDB(6); /* Excess over 6 dB */
 
         if (band->bandtype == BRCM_BAND_2G)
                 maxpwr_idx = (chan - 1);
@@ -1431,8 +611,7 @@ static bool brcms_c_chspec_malformed(u16 chanspec)
  * and they are also a legal HT combination
  */
 static bool
-brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, u16 chspec,
-                           bool dualband)
+brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, u16 chspec)
 {
         struct brcms_c_info *wlc = wlc_cm->wlc;
         u8 channel = CHSPEC_CHANNEL(chspec);
@@ -1448,59 +627,166 @@ brcms_c_valid_chanspec_ext(struct brcms_cm_info *wlc_cm, u16 chspec,
             chspec_bandunit(chspec))
                 return false;
 
-        /* Check a 20Mhz channel */
-        if (CHSPEC_IS20(chspec)) {
-                if (dualband)
-                        return brcms_c_valid_channel20_db(wlc_cm->wlc->cmi,
-                                                          channel);
-                else
-                        return brcms_c_valid_channel20(wlc_cm->wlc->cmi,
-                                                       channel);
+        return true;
+}
+
+bool brcms_c_valid_chanspec_db(struct brcms_cm_info *wlc_cm, u16 chspec)
+{
+        return brcms_c_valid_chanspec_ext(wlc_cm, chspec);
+}
+
+static bool brcms_is_radar_freq(u16 center_freq)
+{
+        return center_freq >= 5260 && center_freq <= 5700;
+}
+
+static void brcms_reg_apply_radar_flags(struct wiphy *wiphy)
+{
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        int i;
+
+        sband = wiphy->bands[IEEE80211_BAND_5GHZ];
+        if (!sband)
+                return;
+
+        for (i = 0; i < sband->n_channels; i++) {
+                ch = &sband->channels[i];
+
+                if (!brcms_is_radar_freq(ch->center_freq))
+                        continue;
+
+                /*
+                 * All channels in this range should be passive and have
+                 * DFS enabled.
+                 */
+                if (!(ch->flags & IEEE80211_CHAN_DISABLED))
+                        ch->flags |= IEEE80211_CHAN_RADAR |
+                                     IEEE80211_CHAN_NO_IBSS |
+                                     IEEE80211_CHAN_PASSIVE_SCAN;
         }
-#ifdef SUPPORT_40MHZ
-        /*
-         * We know we are now checking a 40MHZ channel, so we should
-         * only be here for NPHYS
-         */
-        if (BRCMS_ISNPHY(wlc->band) || BRCMS_ISSSLPNPHY(wlc->band)) {
-                u8 upper_sideband = 0, idx;
-                u8 num_ch20_entries =
-                    sizeof(chan20_info) / sizeof(struct chan20_info);
-
-                if (!VALID_40CHANSPEC_IN_BAND(wlc, chspec_bandunit(chspec)))
-                        return false;
-
-                if (dualband) {
-                        if (!brcms_c_valid_channel20_db(wlc->cmi,
-                                                        lower_20_sb(channel)) ||
-                            !brcms_c_valid_channel20_db(wlc->cmi,
-                                                        upper_20_sb(channel)))
-                                return false;
-                } else {
-                        if (!brcms_c_valid_channel20(wlc->cmi,
-                                                     lower_20_sb(channel)) ||
-                            !brcms_c_valid_channel20(wlc->cmi,
-                                                     upper_20_sb(channel)))
-                                return false;
+}
+
+static void
+brcms_reg_apply_beaconing_flags(struct wiphy *wiphy,
+                                enum nl80211_reg_initiator initiator)
+{
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        const struct ieee80211_reg_rule *rule;
+        int band, i, ret;
+
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                sband = wiphy->bands[band];
+                if (!sband)
+                        continue;
+
+                for (i = 0; i < sband->n_channels; i++) {
+                        ch = &sband->channels[i];
+
+                        if (ch->flags &
+                            (IEEE80211_CHAN_DISABLED | IEEE80211_CHAN_RADAR))
+                                continue;
+
+                        if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) {
+                                ret = freq_reg_info(wiphy, ch->center_freq,
+                                                    0, &rule);
+                                if (ret)
+                                        continue;
+
+                                if (!(rule->flags & NL80211_RRF_NO_IBSS))
+                                        ch->flags &= ~IEEE80211_CHAN_NO_IBSS;
+                                if (!(rule->flags & NL80211_RRF_PASSIVE_SCAN))
+                                        ch->flags &=
+                                                ~IEEE80211_CHAN_PASSIVE_SCAN;
+                        } else if (ch->beacon_found) {
+                                ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |
+                                               IEEE80211_CHAN_PASSIVE_SCAN);
+                        }
                 }
+        }
+}
 
-                /* find the lower sideband info in the sideband array */
-                for (idx = 0; idx < num_ch20_entries; idx++) {
-                        if (chan20_info[idx].sb == lower_20_sb(channel))
-                                upper_sideband = chan20_info[idx].adj_sbs;
+static int brcms_reg_notifier(struct wiphy *wiphy,
+                              struct regulatory_request *request)
+{
+        struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
+        struct brcms_info *wl = hw->priv;
+        struct brcms_c_info *wlc = wl->wlc;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        int band, i;
+        bool ch_found = false;
+
+        brcms_reg_apply_radar_flags(wiphy);
+
+        if (request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)
+                brcms_reg_apply_beaconing_flags(wiphy, request->initiator);
+
+        /* Disable radio if all channels disallowed by regulatory */
+        for (band = 0; !ch_found && band < IEEE80211_NUM_BANDS; band++) {
+                sband = wiphy->bands[band];
+                if (!sband)
+                        continue;
+
+                for (i = 0; !ch_found && i < sband->n_channels; i++) {
+                        ch = &sband->channels[i];
+
+                        if (!(ch->flags & IEEE80211_CHAN_DISABLED))
+                                ch_found = true;
                 }
-                /* check that the lower sideband allows an upper sideband */
-                if ((upper_sideband & (CH_UPPER_SB | CH_EWA_VALID)) ==
-                    (CH_UPPER_SB | CH_EWA_VALID))
-                        return true;
-                return false;
         }
-#endif                          /* 40 MHZ */
 
-        return false;
+        if (ch_found) {
+                mboolclr(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
+        } else {
+                mboolset(wlc->pub->radio_disabled, WL_RADIO_COUNTRY_DISABLE);
+                wiphy_err(wlc->wiphy, "wl%d: %s: no valid channel for \"%s\"\n",
+                          wlc->pub->unit, __func__, request->alpha2);
+        }
+
+        if (wlc->pub->_nbands > 1 || wlc->band->bandtype == BRCM_BAND_2G)
+                wlc_phy_chanspec_ch14_widefilter_set(wlc->band->pi,
+                                        brcms_c_japan_ccode(request->alpha2));
+
+        return 0;
 }
 
-bool brcms_c_valid_chanspec_db(struct brcms_cm_info *wlc_cm, u16 chspec)
+void brcms_c_regd_init(struct brcms_c_info *wlc)
 {
-        return brcms_c_valid_chanspec_ext(wlc_cm, chspec, true);
+        struct wiphy *wiphy = wlc->wiphy;
+        const struct brcms_regd *regd = wlc->cmi->world_regd;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_channel *ch;
+        struct brcms_chanvec sup_chan;
+        struct brcms_band *band;
+        int band_idx, i;
+
+        /* Disable any channels not supported by the phy */
+        for (band_idx = 0; band_idx < IEEE80211_NUM_BANDS; band_idx++) {
+                if (band_idx == IEEE80211_BAND_2GHZ)
+                        band = wlc->bandstate[BAND_2G_INDEX];
+                else
+                        band = wlc->bandstate[BAND_5G_INDEX];
+
+                /* skip if band not initialized */
+                if (band->pi == NULL)
+                        continue;
+
+                wlc_phy_chanspec_band_validch(band->pi, band->bandtype,
+                                              &sup_chan);
+
+                sband = wiphy->bands[band_idx];
+                for (i = 0; i < sband->n_channels; i++) {
+                        ch = &sband->channels[i];
+                        if (!isset(sup_chan.vec, ch->hw_value))
+                                ch->flags |= IEEE80211_CHAN_DISABLED;
+                }
+        }
+
+        wlc->wiphy->reg_notifier = brcms_reg_notifier;
+        wlc->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
+                             WIPHY_FLAG_STRICT_REGULATORY;
+        wiphy_apply_custom_regulatory(wlc->wiphy, regd->regdomain);
+        brcms_reg_apply_beaconing_flags(wiphy, NL80211_REGDOM_SET_BY_DRIVER);
 }
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/channel.h b/drivers/net/wireless/brcm80211/brcmsmac/channel.h
index 808cb4fbfbe7..006483a0abe6 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/channel.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.h
@@ -37,9 +37,6 @@ brcms_c_channel_mgr_attach(struct brcms_c_info *wlc);
 
 extern void brcms_c_channel_mgr_detach(struct brcms_cm_info *wlc_cm);
 
-extern u8 brcms_c_channel_locale_flags_in_band(struct brcms_cm_info *wlc_cm,
-                                           uint bandunit);
-
 extern bool brcms_c_valid_chanspec_db(struct brcms_cm_info *wlc_cm,
                                       u16 chspec);
 
@@ -49,5 +46,6 @@ extern void brcms_c_channel_reg_limits(struct brcms_cm_info *wlc_cm,
 extern void brcms_c_channel_set_chanspec(struct brcms_cm_info *wlc_cm,
                                      u16 chanspec,
                                      u8 local_constraint_qdbm);
+extern void brcms_c_regd_init(struct brcms_c_info *wlc);
 
 #endif                          /* _WLC_CHANNEL_H */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index 341e06a0d6ec..2d5a40412690 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -1050,6 +1050,8 @@ static struct brcms_info *brcms_attach(struct bcma_device *pdev)
                 goto fail;
         }
 
+        brcms_c_regd_init(wl->wlc);
+
         memcpy(perm, &wl->pub->cur_etheraddr, ETH_ALEN);
         if (WARN_ON(!is_valid_ether_addr(perm)))
                 goto fail;
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index e67556780a31..bb00b6528d8f 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -18,6 +18,7 @@
 
 #include <linux/pci_ids.h>
 #include <linux/if_ether.h>
+#include <net/cfg80211.h>
 #include <net/mac80211.h>
 #include <brcm_hw_ids.h>
 #include <aiutils.h>
@@ -3139,20 +3140,6 @@ void brcms_c_reset(struct brcms_c_info *wlc)
         brcms_b_reset(wlc->hw);
 }
 
-/* Return the channel the driver should initialize during brcms_c_init.
- * the channel may have to be changed from the currently configured channel
- * if other configurations are in conflict (bandlocked, 11n mode disabled,
- * invalid channel for current country, etc.)
- */
-static u16 brcms_c_init_chanspec(struct brcms_c_info *wlc)
-{
-        u16 chanspec =
-            1 | WL_CHANSPEC_BW_20 | WL_CHANSPEC_CTL_SB_NONE |
-            WL_CHANSPEC_BAND_2G;
-
-        return chanspec;
-}
-
 void brcms_c_init_scb(struct scb *scb)
 {
         int i;
@@ -5129,6 +5116,8 @@ static void brcms_c_wme_retries_write(struct brcms_c_info *wlc)
 /* make interface operational */
 int brcms_c_up(struct brcms_c_info *wlc)
 {
+        struct ieee80211_channel *ch;
+
         BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
         /* HW is turned off so don't try to access it */
@@ -5195,8 +5184,9 @@ int brcms_c_up(struct brcms_c_info *wlc)
         wlc->pub->up = true;
 
         if (wlc->bandinit_pending) {
+                ch = wlc->pub->ieee_hw->conf.channel;
                 brcms_c_suspend_mac_and_wait(wlc);
-                brcms_c_set_chanspec(wlc, wlc->default_bss->chanspec);
+                brcms_c_set_chanspec(wlc, ch20mhz_chspec(ch->hw_value));
                 wlc->bandinit_pending = false;
                 brcms_c_enable_mac(wlc);
         }
@@ -5397,11 +5387,6 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
         else
                 return -EINVAL;
 
-        /* Legacy or bust when no OFDM is supported by regulatory */
-        if ((brcms_c_channel_locale_flags_in_band(wlc->cmi, band->bandunit) &
-             BRCMS_NO_OFDM) && (gmode != GMODE_LEGACY_B))
-                return -EINVAL;
-
         /* update configuration value */
         if (config)
                 brcms_c_protection_upd(wlc, BRCMS_PROT_G_USER, gmode);
@@ -8201,19 +8186,12 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
 void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
 {
         struct bcma_device *core = wlc->hw->d11core;
+        struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
         u16 chanspec;
 
         BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
-        /*
-         * This will happen if a big-hammer was executed. In
-         * that case, we want to go back to the channel that
-         * we were on and not new channel
-         */
-        if (wlc->pub->associated)
-                chanspec = wlc->home_chanspec;
-        else
-                chanspec = brcms_c_init_chanspec(wlc);
+        chanspec = ch20mhz_chspec(ch->hw_value);
 
         brcms_b_init(wlc->hw, chanspec);
 
diff --git a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
index 333193f20e1c..bcc79b4e3267 100644
--- a/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
+++ b/drivers/net/wireless/brcm80211/include/brcm_hw_ids.h
@@ -37,5 +37,6 @@
 #define BCM4329_CHIP_ID         0x4329
 #define BCM4330_CHIP_ID         0x4330
 #define BCM4331_CHIP_ID         0x4331
+#define BCM4334_CHIP_ID         0x4334
 
 #endif                          /* _BRCM_HW_IDS_H_ */
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index cbf2dc18341f..763c7529921b 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -4717,10 +4717,11 @@ il_check_stuck_queue(struct il_priv *il, int cnt)
         struct il_tx_queue *txq = &il->txq[cnt];
         struct il_queue *q = &txq->q;
         unsigned long timeout;
+        unsigned long now = jiffies;
         int ret;
 
         if (q->read_ptr == q->write_ptr) {
-                txq->time_stamp = jiffies;
+                txq->time_stamp = now;
                 return 0;
         }
 
@@ -4728,9 +4729,9 @@ il_check_stuck_queue(struct il_priv *il, int cnt)
             txq->time_stamp +
             msecs_to_jiffies(il->cfg->wd_timeout);
 
-        if (time_after(jiffies, timeout)) {
+        if (time_after(now, timeout)) {
                 IL_ERR("Queue %d stuck for %u ms.\n", q->id,
-                       il->cfg->wd_timeout);
+                       jiffies_to_msecs(now - txq->time_stamp));
                 ret = il_force_reset(il, false);
                 return (ret == -EAGAIN) ? 0 : 1;
         }
diff --git a/drivers/net/wireless/iwlwifi/dvm/agn.h b/drivers/net/wireless/iwlwifi/dvm/agn.h
index 6d102413dd94..9bb16bdf6d26 100644
--- a/drivers/net/wireless/iwlwifi/dvm/agn.h
+++ b/drivers/net/wireless/iwlwifi/dvm/agn.h
@@ -269,7 +269,7 @@ void iwl_scan_offchannel_skb_status(struct iwl_priv *priv);
 #define IWL_ACTIVE_QUIET_TIME       cpu_to_le16(10)  /* msec */
 #define IWL_PLCP_QUIET_THRESH       cpu_to_le16(1)  /* packets */
 
-#define IWL_SCAN_CHECK_WATCHDOG         (HZ * 7)
+#define IWL_SCAN_CHECK_WATCHDOG         (HZ * 15)
 
 
 /* bt coex */
diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h
index 4620b657948a..54cf085ddc89 100644
--- a/drivers/net/wireless/iwlwifi/dvm/dev.h
+++ b/drivers/net/wireless/iwlwifi/dvm/dev.h
@@ -568,7 +568,6 @@ enum iwl_scan_type {
  *
  * @tx_chains_num: Number of TX chains
  * @rx_chains_num: Number of RX chains
- * @sku: sku read from EEPROM
  * @ct_kill_threshold: temperature threshold - in hw dependent unit
  * @ct_kill_exit_threshold: when to reeable the device - in hw dependent unit
  *      relevant for 1000, 6000 and up
@@ -579,7 +578,6 @@ struct iwl_hw_params {
         u8  tx_chains_num;
         u8  rx_chains_num;
         bool use_rts_for_aggregation;
-        u16 sku;
         u32 ct_kill_threshold;
         u32 ct_kill_exit_threshold;
 
diff --git a/drivers/net/wireless/iwlwifi/dvm/devices.c b/drivers/net/wireless/iwlwifi/dvm/devices.c
index 0521a6be09d2..349c205d5f62 100644
--- a/drivers/net/wireless/iwlwifi/dvm/devices.c
+++ b/drivers/net/wireless/iwlwifi/dvm/devices.c
@@ -250,17 +250,6 @@ struct iwl_lib_ops iwl2030_lib = {
  */
 
 /* NIC configuration for 5000 series */
-static void iwl5000_nic_config(struct iwl_priv *priv)
-{
-        /* W/A : NIC is stuck in a reset state after Early PCIe power off
-         * (PCIe power is lost before PERST# is asserted),
-         * causing ME FW to lose ownership and not being able to obtain it back.
-         */
-        iwl_set_bits_mask_prph(priv->trans, APMG_PS_CTRL_REG,
-                                APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
-                                ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
-}
-
 static const struct iwl_sensitivity_ranges iwl5000_sensitivity = {
         .min_nrg_cck = 100,
         .auto_corr_min_ofdm = 90,
@@ -433,14 +422,12 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv,
 struct iwl_lib_ops iwl5000_lib = {
         .set_hw_params = iwl5000_hw_set_hw_params,
         .set_channel_switch = iwl5000_hw_channel_switch,
-        .nic_config = iwl5000_nic_config,
         .temperature = iwlagn_temperature,
 };
 
 struct iwl_lib_ops iwl5150_lib = {
         .set_hw_params = iwl5150_hw_set_hw_params,
         .set_channel_switch = iwl5000_hw_channel_switch,
-        .nic_config = iwl5000_nic_config,
         .temperature = iwl5150_temperature,
 };
 
diff --git a/drivers/net/wireless/iwlwifi/dvm/lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c
index 76f259283c3a..207ae91a83aa 100644
--- a/drivers/net/wireless/iwlwifi/dvm/lib.c
+++ b/drivers/net/wireless/iwlwifi/dvm/lib.c
@@ -160,7 +160,7 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u16 flush_control)
                                 IWL_PAN_SCD_BK_MSK | IWL_PAN_SCD_MGMT_MSK |
                                 IWL_PAN_SCD_MULTICAST_MSK;
 
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
+        if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE)
                 flush_cmd.fifo_control |= IWL_AGG_TX_QUEUE_MSK;
 
         IWL_DEBUG_INFO(priv, "fifo queue control: 0X%x\n",
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 2f10346c6ba1..a5f7bce96325 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -164,7 +164,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
         hw->max_tx_aggregation_subframes = LINK_QUAL_AGG_FRAME_LIMIT_DEF;
          */
 
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE)
+        if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE)
                 hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |
                              IEEE80211_HW_SUPPORTS_STATIC_SMPS;
 
@@ -649,7 +649,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,
         IWL_DEBUG_HT(priv, "A-MPDU action on addr %pM tid %d\n",
                      sta->addr, tid);
 
-        if (!(priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE))
+        if (!(priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE))
                 return -EACCES;
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
@@ -1048,8 +1048,18 @@ static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (test_bit(STATUS_SCAN_HW, &priv->status)) {
-                err = -EBUSY;
-                goto out;
+                /* mac80211 should not scan while ROC or ROC while scanning */
+                if (WARN_ON_ONCE(priv->scan_type != IWL_SCAN_RADIO_RESET)) {
+                        err = -EBUSY;
+                        goto out;
+                }
+
+                iwl_scan_cancel_timeout(priv, 100);
+
+                if (test_bit(STATUS_SCAN_HW, &priv->status)) {
+                        err = -EBUSY;
+                        goto out;
+                }
         }
 
         priv->hw_roc_channel = channel;
@@ -1413,13 +1423,11 @@ static void iwlagn_mac_remove_interface(struct ieee80211_hw *hw,
 }
 
 static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                enum nl80211_iftype newtype, bool newp2p)
+                                       struct ieee80211_vif *vif,
+                                       enum nl80211_iftype newtype, bool newp2p)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
-        struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
-        struct iwl_rxon_context *bss_ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        struct iwl_rxon_context *tmp;
+        struct iwl_rxon_context *ctx, *tmp;
         enum nl80211_iftype newviftype = newtype;
         u32 interface_modes;
         int err;
@@ -1430,6 +1438,18 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
 
         mutex_lock(&priv->mutex);
 
+        ctx = iwl_rxon_ctx_from_vif(vif);
+
+        /*
+         * To simplify this code, only support changes on the
+         * BSS context. The PAN context is usually reassigned
+         * by creating/removing P2P interfaces anyway.
+         */
+        if (ctx->ctxid != IWL_RXON_CTX_BSS) {
+                err = -EBUSY;
+                goto out;
+        }
+
         if (!ctx->vif || !iwl_is_ready_rf(priv)) {
                 /*
                  * Huh? But wait ... this can maybe happen when
@@ -1439,32 +1459,19 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
                 goto out;
         }
 
+        /* Check if the switch is supported in the same context */
         interface_modes = ctx->interface_modes | ctx->exclusive_interface_modes;
-
         if (!(interface_modes & BIT(newtype))) {
                 err = -EBUSY;
                 goto out;
         }
 
-        /*
-         * Refuse a change that should be done by moving from the PAN
-         * context to the BSS context instead, if the BSS context is
-         * available and can support the new interface type.
-         */
-        if (ctx->ctxid == IWL_RXON_CTX_PAN && !bss_ctx->vif &&
-            (bss_ctx->interface_modes & BIT(newtype) ||
-             bss_ctx->exclusive_interface_modes & BIT(newtype))) {
-                BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
-                err = -EBUSY;
-                goto out;
-        }
-
         if (ctx->exclusive_interface_modes & BIT(newtype)) {
                 for_each_context(priv, tmp) {
                         if (ctx == tmp)
                                 continue;
 
-                        if (!tmp->vif)
+                        if (!tmp->is_active)
                                 continue;
 
                         /*
diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
index e620af3d592d..abfd7916bde6 100644
--- a/drivers/net/wireless/iwlwifi/dvm/main.c
+++ b/drivers/net/wireless/iwlwifi/dvm/main.c
@@ -51,11 +51,13 @@
 #include "iwl-op-mode.h"
 #include "iwl-drv.h"
 #include "iwl-modparams.h"
+#include "iwl-prph.h"
 
 #include "dev.h"
 #include "calib.h"
 #include "agn.h"
 
+
 /******************************************************************************
  *
  * module boiler plate
@@ -1185,9 +1187,6 @@ static void iwl_set_hw_params(struct iwl_priv *priv)
                 priv->hw_params.use_rts_for_aggregation =
                         priv->cfg->ht_params->use_rts_for_aggregation;
 
-        if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
-                priv->hw_params.sku &= ~EEPROM_SKU_CAP_11N_ENABLE;
-
         /* Device-specific setup */
         priv->lib->set_hw_params(priv);
 }
@@ -1232,20 +1231,20 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
 {
         u16 radio_cfg;
 
-        priv->hw_params.sku = priv->eeprom_data->sku;
+        priv->eeprom_data->sku = priv->eeprom_data->sku;
 
-        if (priv->hw_params.sku & EEPROM_SKU_CAP_11N_ENABLE &&
+        if (priv->eeprom_data->sku & EEPROM_SKU_CAP_11N_ENABLE &&
             !priv->cfg->ht_params) {
                 IWL_ERR(priv, "Invalid 11n configuration\n");
                 return -EINVAL;
         }
 
-        if (!priv->hw_params.sku) {
+        if (!priv->eeprom_data->sku) {
                 IWL_ERR(priv, "Invalid device sku\n");
                 return -EINVAL;
         }
 
-        IWL_INFO(priv, "Device SKU: 0x%X\n", priv->hw_params.sku);
+        IWL_INFO(priv, "Device SKU: 0x%X\n", priv->eeprom_data->sku);
 
         radio_cfg = priv->eeprom_data->radio_cfg;
 
@@ -1352,6 +1351,9 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
                 trans_cfg.queue_watchdog_timeout = IWL_WATCHDOG_DISABLED;
         trans_cfg.command_names = iwl_dvm_cmd_strings;
 
+        WARN_ON(sizeof(priv->transport_queue_stop) * BITS_PER_BYTE <
+                priv->cfg->base_params->num_of_queues);
+
         ucode_flags = fw->ucode_capa.flags;
 
 #ifndef CONFIG_IWLWIFI_P2P
@@ -1448,7 +1450,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
          ************************/
         iwl_set_hw_params(priv);
 
-        if (!(priv->hw_params.sku & EEPROM_SKU_CAP_IPAN_ENABLE)) {
+        if (!(priv->eeprom_data->sku & EEPROM_SKU_CAP_IPAN_ENABLE)) {
                 IWL_DEBUG_INFO(priv, "Your EEPROM disabled PAN");
                 ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;
                 /*
@@ -2073,7 +2075,16 @@ static void iwl_nic_config(struct iwl_op_mode *op_mode)
                     CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
                     CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
 
-        priv->lib->nic_config(priv);
+        /* W/A : NIC is stuck in a reset state after Early PCIe power off
+         * (PCIe power is lost before PERST# is asserted),
+         * causing ME FW to lose ownership and not being able to obtain it back.
+         */
+        iwl_set_bits_mask_prph(priv->trans, APMG_PS_CTRL_REG,
+                               APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
+                               ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
+
+        if (priv->lib->nic_config)
+                priv->lib->nic_config(priv);
 }
 
 static void iwl_wimax_active(struct iwl_op_mode *op_mode)
diff --git a/drivers/net/wireless/iwlwifi/dvm/scan.c b/drivers/net/wireless/iwlwifi/dvm/scan.c
index 2f271c96ed39..6633074258c7 100644
--- a/drivers/net/wireless/iwlwifi/dvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/dvm/scan.c
@@ -51,6 +51,9 @@
 #define IWL_CHANNEL_TUNE_TIME       5
 #define MAX_SCAN_CHANNEL            50
 
+/* For reset radio, need minimal dwell time only */
+#define IWL_RADIO_RESET_DWELL_TIME      5
+
 static int iwl_send_scan_abort(struct iwl_priv *priv)
 {
         int ret;
@@ -469,45 +472,39 @@ static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
         return 0;
 }
 
-static int iwl_get_single_channel_for_scan(struct iwl_priv *priv,
-                                           struct ieee80211_vif *vif,
-                                           enum ieee80211_band band,
-                                           struct iwl_scan_channel *scan_ch)
+static int iwl_get_channel_for_reset_scan(struct iwl_priv *priv,
+                                          struct ieee80211_vif *vif,
+                                          enum ieee80211_band band,
+                                          struct iwl_scan_channel *scan_ch)
 {
         const struct ieee80211_supported_band *sband;
-        u16 passive_dwell = 0;
-        u16 active_dwell = 0;
-        int added = 0;
-        u16 channel = 0;
+        u16 channel;
 
         sband = iwl_get_hw_mode(priv, band);
         if (!sband) {
                 IWL_ERR(priv, "invalid band\n");
-                return added;
+                return 0;
         }
 
-        active_dwell = iwl_get_active_dwell_time(priv, band, 0);
-        passive_dwell = iwl_get_passive_dwell_time(priv, band);
-
-        if (passive_dwell <= active_dwell)
-                passive_dwell = active_dwell + 1;
-
         channel = iwl_get_single_channel_number(priv, band);
         if (channel) {
                 scan_ch->channel = cpu_to_le16(channel);
                 scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;
-                scan_ch->active_dwell = cpu_to_le16(active_dwell);
-                scan_ch->passive_dwell = cpu_to_le16(passive_dwell);
+                scan_ch->active_dwell =
+                        cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
+                scan_ch->passive_dwell =
+                        cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
                 /* Set txpower levels to defaults */
                 scan_ch->dsp_atten = 110;
                 if (band == IEEE80211_BAND_5GHZ)
                         scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
                 else
                         scan_ch->tx_gain = ((1 << 5) | (5 << 3));
-                added++;
-        } else
-                IWL_ERR(priv, "no valid channel found\n");
-        return added;
+                return 1;
+        }
+
+        IWL_ERR(priv, "no valid channel found\n");
+        return 0;
 }
 
 static int iwl_get_channels_for_scan(struct iwl_priv *priv,
@@ -723,6 +720,12 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         switch (priv->scan_type) {
         case IWL_SCAN_RADIO_RESET:
                 IWL_DEBUG_SCAN(priv, "Start internal passive scan.\n");
+                /*
+                 * Override quiet time as firmware checks that active
+                 * dwell is >= quiet; since we use passive scan it'll
+                 * not actually be used.
+                 */
+                scan->quiet_time = cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
                 break;
         case IWL_SCAN_NORMAL:
                 if (priv->scan_request->n_ssids) {
@@ -896,7 +899,7 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
         switch (priv->scan_type) {
         case IWL_SCAN_RADIO_RESET:
                 scan->channel_count =
-                        iwl_get_single_channel_for_scan(priv, vif, band,
+                        iwl_get_channel_for_reset_scan(priv, vif, band,
                                 (void *)&scan->data[cmd_len]);
                 break;
         case IWL_SCAN_NORMAL:
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
index c87a05cbec12..f10170fe8799 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
@@ -853,6 +853,9 @@ iwl_parse_eeprom_data(struct device *dev, const struct iwl_cfg *cfg,
                                              EEPROM_RADIO_CONFIG);
         data->sku = iwl_eeprom_query16(eeprom, eeprom_size,
                                        EEPROM_SKU_CAP);
+        if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_ALL)
+                data->sku &= ~EEPROM_SKU_CAP_11N_ENABLE;
+
         data->eeprom_version = iwl_eeprom_query16(eeprom, eeprom_size,
                                                   EEPROM_VERSION);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
index 5cfed29b1b18..c61f2070f15a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
+++ b/drivers/net/wireless/iwlwifi/iwl-notif-wait.c
@@ -121,13 +121,12 @@ EXPORT_SYMBOL_GPL(iwl_notification_wait_notify);
 
 void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
 {
-        unsigned long flags;
         struct iwl_notification_wait *wait_entry;
 
-        spin_lock_irqsave(&notif_wait->notif_wait_lock, flags);
+        spin_lock(&notif_wait->notif_wait_lock);
         list_for_each_entry(wait_entry, &notif_wait->notif_waits, list)
                 wait_entry->aborted = true;
-        spin_unlock_irqrestore(&notif_wait->notif_wait_lock, flags);
+        spin_unlock(&notif_wait->notif_wait_lock);
 
         wake_up_all(&notif_wait->notif_waitq);
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
index cd9ef114d3a3..64886f95664f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/iwlwifi/iwl-op-mode.h
@@ -111,22 +111,25 @@ struct iwl_cfg;
  *      May sleep
  * @rx: Rx notification to the op_mode. rxb is the Rx buffer itself. Cmd is the
  *      HCMD the this Rx responds to.
- *      Must be atomic.
+ *      Must be atomic and called with BH disabled.
  * @queue_full: notifies that a HW queue is full.
- *      Must be atomic
+ *      Must be atomic and called with BH disabled.
  * @queue_not_full: notifies that a HW queue is not full any more.
- *      Must be atomic
+ *      Must be atomic and called with BH disabled.
  * @hw_rf_kill:notifies of a change in the HW rf kill switch. True means that
  *      the radio is killed. Must be atomic.
  * @free_skb: allows the transport layer to free skbs that haven't been
  *      reclaimed by the op_mode. This can happen when the driver is freed and
  *      there are Tx packets pending in the transport layer.
  *      Must be atomic
- * @nic_error: error notification. Must be atomic
- * @cmd_queue_full: Called when the command queue gets full. Must be atomic.
+ * @nic_error: error notification. Must be atomic and must be called with BH
+ *      disabled.
+ * @cmd_queue_full: Called when the command queue gets full. Must be atomic and
+ *      called with BH disabled.
  * @nic_config: configure NIC, called before firmware is started.
  *      May sleep
- * @wimax_active: invoked when WiMax becomes active.  Must be atomic.
+ * @wimax_active: invoked when WiMax becomes active.  Must be atomic and called
+ *      with BH disabled.
  */
 struct iwl_op_mode_ops {
         struct iwl_op_mode *(*start)(struct iwl_trans *trans,
@@ -165,7 +168,6 @@ struct iwl_op_mode {
 static inline void iwl_op_mode_stop(struct iwl_op_mode *op_mode)
 {
         might_sleep();
-
         op_mode->ops->stop(op_mode);
 }
 
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c
index d6860c070c16..be143eb4aa4f 100644
--- a/drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -867,24 +867,23 @@ void iwl_disable_ict(struct iwl_trans *trans)
         spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 }
 
+/* legacy (non-ICT) ISR. Assumes that trans_pcie->irq_lock is held */
 static irqreturn_t iwl_isr(int irq, void *data)
 {
         struct iwl_trans *trans = data;
-        struct iwl_trans_pcie *trans_pcie;
+        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 inta, inta_mask;
-        unsigned long flags;
 #ifdef CONFIG_IWLWIFI_DEBUG
         u32 inta_fh;
 #endif
+
+        lockdep_assert_held(&trans_pcie->irq_lock);
+
         if (!trans)
                 return IRQ_NONE;
 
         trace_iwlwifi_dev_irq(trans->dev);
 
-        trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
-
         /* Disable (but don't clear!) interrupts here to avoid
          *    back-to-back ISRs and sporadic interrupts from our NIC.
          * If we have something to service, the tasklet will re-enable ints.
@@ -907,7 +906,7 @@ static irqreturn_t iwl_isr(int irq, void *data)
                 /* Hardware disappeared. It might have already raised
                  * an interrupt */
                 IWL_WARN(trans, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
-                goto unplugged;
+                return IRQ_HANDLED;
         }
 
 #ifdef CONFIG_IWLWIFI_DEBUG
@@ -926,18 +925,13 @@ static irqreturn_t iwl_isr(int irq, void *data)
                  !trans_pcie->inta)
                 iwl_enable_interrupts(trans);
 
- unplugged:
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
-        return IRQ_HANDLED;
-
- none:
+none:
         /* re-enable interrupts here since we don't have anything to service. */
         /* only Re-enable if disabled by irq  and no schedules tasklet. */
         if (test_bit(STATUS_INT_ENABLED, &trans_pcie->status) &&
             !trans_pcie->inta)
                 iwl_enable_interrupts(trans);
 
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
         return IRQ_NONE;
 }
 
@@ -963,15 +957,19 @@ irqreturn_t iwl_isr_ict(int irq, void *data)
 
         trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
+        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
+
         /* dram interrupt table not set yet,
          * use legacy interrupt.
          */
-        if (!trans_pcie->use_ict)
-                return iwl_isr(irq, data);
+        if (unlikely(!trans_pcie->use_ict)) {
+                irqreturn_t ret = iwl_isr(irq, data);
+                spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
+                return ret;
+        }
 
         trace_iwlwifi_dev_irq(trans->dev);
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
 
         /* Disable (but don't clear!) interrupts here to avoid
          * back-to-back ISRs and sporadic interrupts from our NIC.
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 32ab8ea56135..d1950838f17f 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -296,6 +296,7 @@ static void iwlagn_free_dma_ptr(struct iwl_trans *trans,
 static void iwl_trans_pcie_queue_stuck_timer(unsigned long data)
 {
         struct iwl_tx_queue *txq = (void *)data;
+        struct iwl_queue *q = &txq->q;
         struct iwl_trans_pcie *trans_pcie = txq->trans_pcie;
         struct iwl_trans *trans = iwl_trans_pcie_get_trans(trans_pcie);
         u32 scd_sram_addr = trans_pcie->scd_base_addr +
@@ -346,6 +347,14 @@ static void iwl_trans_pcie_queue_stuck_timer(unsigned long data)
                         iwl_read_prph(trans, SCD_QUEUE_WRPTR(i)));
         }
 
+        for (i = q->read_ptr; i != q->write_ptr;
+             i = iwl_queue_inc_wrap(i, q->n_bd)) {
+                struct iwl_tx_cmd *tx_cmd =
+                        (struct iwl_tx_cmd *)txq->entries[i].cmd->payload;
+                IWL_ERR(trans, "scratch %d = 0x%08x\n", i,
+                        get_unaligned_le32(&tx_cmd->scratch));
+        }
+
         iwl_op_mode_nic_error(trans->op_mode);
 }
 
@@ -1037,15 +1046,12 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
 
 /*
  * Activate/Deactivate Tx DMA/FIFO channels according tx fifos mask
- * must be called under the irq lock and with MAC access
  */
 static void iwl_trans_txq_set_sched(struct iwl_trans *trans, u32 mask)
 {
         struct iwl_trans_pcie __maybe_unused *trans_pcie =
                 IWL_TRANS_GET_PCIE_TRANS(trans);
 
-        lockdep_assert_held(&trans_pcie->irq_lock);
-
         iwl_write_prph(trans, SCD_TXFACT, mask);
 }
 
@@ -1053,12 +1059,9 @@ static void iwl_tx_start(struct iwl_trans *trans)
 {
         struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
         u32 a;
-        unsigned long flags;
         int i, chan;
         u32 reg_val;
 
-        spin_lock_irqsave(&trans_pcie->irq_lock, flags);
-
         /* make sure all queue are not stopped/used */
         memset(trans_pcie->queue_stopped, 0, sizeof(trans_pcie->queue_stopped));
         memset(trans_pcie->queue_used, 0, sizeof(trans_pcie->queue_used));
@@ -1109,8 +1112,6 @@ static void iwl_tx_start(struct iwl_trans *trans)
         iwl_write_direct32(trans, FH_TX_CHICKEN_BITS_REG,
                            reg_val | FH_TX_CHICKEN_BITS_SCD_AUTO_RETRY_EN);
 
-        spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
-
         /* Enable L1-Active */
         iwl_clear_bits_prph(trans, APMG_PCIDEV_STT_REG,
                             APMG_PCIDEV_STT_VAL_L1_ACT_DIS);
@@ -2017,7 +2018,9 @@ static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,
         if (!trans->op_mode)
                 return -EAGAIN;
 
+        local_bh_disable();
         iwl_op_mode_nic_error(trans->op_mode);
+        local_bh_enable();
 
         return count;
 }
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index a9ba3f7ea62b..f578d0b2172d 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -678,8 +678,7 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw,
                         continue;
 
                 if (data2->idle || !data2->started ||
-                    !hwsim_ps_rx_ok(data2, skb) ||
-                    !data->channel || !data2->channel ||
+                    !hwsim_ps_rx_ok(data2, skb) || !data2->channel ||
                     data->channel->center_freq != data2->channel->center_freq ||
                     !(data->group & data2->group))
                         continue;
@@ -1486,7 +1485,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
         struct mac80211_hwsim_data *data2;
         struct ieee80211_tx_info *txi;
         struct hwsim_tx_rate *tx_attempts;
-        struct sk_buff __user *ret_skb;
+        unsigned long ret_skb_ptr;
         struct sk_buff *skb, *tmp;
         struct mac_address *src;
         unsigned int hwsim_flags;
@@ -1504,8 +1503,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
                                    info->attrs[HWSIM_ATTR_ADDR_TRANSMITTER]);
         hwsim_flags = nla_get_u32(info->attrs[HWSIM_ATTR_FLAGS]);
 
-        ret_skb = (struct sk_buff __user *)
-                  (unsigned long) nla_get_u64(info->attrs[HWSIM_ATTR_COOKIE]);
+        ret_skb_ptr = nla_get_u64(info->attrs[HWSIM_ATTR_COOKIE]);
 
         data2 = get_hwsim_data_ref_from_addr(src);
 
@@ -1514,7 +1512,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2,
 
         /* look for the skb matching the cookie passed back from user */
         skb_queue_walk_safe(&data2->pending, skb, tmp) {
-                if (skb == ret_skb) {
+                if ((unsigned long)skb == ret_skb_ptr) {
                         skb_unlink(skb, &data2->pending);
                         found = true;
                         break;
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 80e9b2a39058..4b2733af1a0e 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -170,7 +170,9 @@ mwifiex_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
         if (!priv->sec_info.wep_enabled)
                 return 0;
 
-        if (mwifiex_set_encode(priv, NULL, 0, key_index, NULL, 0)) {
+        if (priv->bss_type == MWIFIEX_BSS_TYPE_UAP) {
+                priv->wep_key_curr_index = key_index;
+        } else if (mwifiex_set_encode(priv, NULL, 0, key_index, NULL, 0)) {
                 wiphy_err(wiphy, "set default Tx key index\n");
                 return -EFAULT;
         }
@@ -187,9 +189,25 @@ mwifiex_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
                          struct key_params *params)
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(netdev);
+        struct mwifiex_wep_key *wep_key;
         const u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
         const u8 *peer_mac = pairwise ? mac_addr : bc_mac;
 
+        if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_UAP &&
+            (params->cipher == WLAN_CIPHER_SUITE_WEP40 ||
+             params->cipher == WLAN_CIPHER_SUITE_WEP104)) {
+                if (params->key && params->key_len) {
+                        wep_key = &priv->wep_key[key_index];
+                        memset(wep_key, 0, sizeof(struct mwifiex_wep_key));
+                        memcpy(wep_key->key_material, params->key,
+                               params->key_len);
+                        wep_key->key_index = key_index;
+                        wep_key->key_length = params->key_len;
+                        priv->sec_info.wep_enabled = 1;
+                }
+                return 0;
+        }
+
         if (mwifiex_set_encode(priv, params->key, params->key_len,
                                key_index, peer_mac, 0)) {
                 wiphy_err(wiphy, "crypto keys added\n");
@@ -242,13 +260,13 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
                         flag = 1;
                         first_chan = (u32) ch->hw_value;
                         next_chan = first_chan;
-                        max_pwr = ch->max_power;
+                        max_pwr = ch->max_reg_power;
                         no_of_parsed_chan = 1;
                         continue;
                 }
 
                 if (ch->hw_value == next_chan + 1 &&
-                    ch->max_power == max_pwr) {
+                    ch->max_reg_power == max_pwr) {
                         next_chan++;
                         no_of_parsed_chan++;
                 } else {
@@ -259,7 +277,7 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
                         no_of_triplet++;
                         first_chan = (u32) ch->hw_value;
                         next_chan = first_chan;
-                        max_pwr = ch->max_power;
+                        max_pwr = ch->max_reg_power;
                         no_of_parsed_chan = 1;
                 }
         }
@@ -384,13 +402,13 @@ mwifiex_set_rf_channel(struct mwifiex_private *priv,
         cfp.freq = chan->center_freq;
         cfp.channel = ieee80211_frequency_to_channel(chan->center_freq);
 
-        if (mwifiex_bss_set_channel(priv, &cfp))
-                return -EFAULT;
-
-        if (priv->bss_type == MWIFIEX_BSS_TYPE_STA)
+        if (priv->bss_type == MWIFIEX_BSS_TYPE_STA) {
+                if (mwifiex_bss_set_channel(priv, &cfp))
+                        return -EFAULT;
                 return mwifiex_drv_change_adhoc_chan(priv, cfp.channel);
-        else
-                return mwifiex_uap_set_channel(priv, cfp.channel);
+        }
+
+        return 0;
 }
 
 /*
@@ -961,12 +979,25 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
                 return -EINVAL;
         }
 
+        bss_cfg->channel =
+            (u8)ieee80211_frequency_to_channel(params->channel->center_freq);
+        bss_cfg->band_cfg = BAND_CONFIG_MANUAL;
+
+        if (mwifiex_set_rf_channel(priv, params->channel,
+                                   params->channel_type)) {
+                kfree(bss_cfg);
+                wiphy_err(wiphy, "Failed to set band config information!\n");
+                return -1;
+        }
+
         if (mwifiex_set_secure_params(priv, bss_cfg, params)) {
                 kfree(bss_cfg);
                 wiphy_err(wiphy, "Failed to parse secuirty parameters!\n");
                 return -1;
         }
 
+        mwifiex_set_ht_params(priv, bss_cfg, params);
+
         if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_UAP_BSS_STOP,
                                   HostCmd_ACT_GEN_SET, 0, NULL)) {
                 wiphy_err(wiphy, "Failed to stop the BSS\n");
@@ -990,6 +1021,16 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
                 return -1;
         }
 
+        if (priv->sec_info.wep_enabled)
+                priv->curr_pkt_filter |= HostCmd_ACT_MAC_WEP_ENABLE;
+        else
+                priv->curr_pkt_filter &= ~HostCmd_ACT_MAC_WEP_ENABLE;
+
+        if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_MAC_CONTROL,
+                                  HostCmd_ACT_GEN_SET, 0,
+                                  &priv->curr_pkt_filter))
+                return -1;
+
         return 0;
 }
 
@@ -1381,7 +1422,7 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,
 
                 priv->user_scan_cfg->chan_list[i].scan_time = 0;
         }
-        if (mwifiex_set_user_scan_ioctl(priv, priv->user_scan_cfg))
+        if (mwifiex_scan_networks(priv, priv->user_scan_cfg))
                 return -EFAULT;
 
         if (request->ie && request->ie_len) {
@@ -1702,7 +1743,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
 
         memcpy(wiphy->perm_addr, priv->curr_addr, ETH_ALEN);
         wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
-        wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME | WIPHY_FLAG_CUSTOM_REGULATORY;
+        wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME;
 
         /* Reserve space for mwifiex specific private data for BSS */
         wiphy->bss_priv_size = sizeof(struct mwifiex_bss_priv);
diff --git a/drivers/net/wireless/mwifiex/cmdevt.c b/drivers/net/wireless/mwifiex/cmdevt.c
index 51e023ec1de4..c68adec3cc8b 100644
--- a/drivers/net/wireless/mwifiex/cmdevt.c
+++ b/drivers/net/wireless/mwifiex/cmdevt.c
@@ -578,6 +578,7 @@ int mwifiex_send_cmd_async(struct mwifiex_private *priv, uint16_t cmd_no,
         } else {
                 adapter->cmd_queued = cmd_node;
                 mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);
+                queue_work(adapter->workqueue, &adapter->main_work);
         }
 
         return ret;
@@ -1102,7 +1103,8 @@ int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,
                 &resp->params.opt_hs_cfg;
         uint32_t conditions = le32_to_cpu(phs_cfg->params.hs_config.conditions);
 
-        if (phs_cfg->action == cpu_to_le16(HS_ACTIVATE)) {
+        if (phs_cfg->action == cpu_to_le16(HS_ACTIVATE) &&
+            adapter->iface_type == MWIFIEX_SDIO) {
                 mwifiex_hs_activated_event(priv, true);
                 return 0;
         } else {
@@ -1114,6 +1116,9 @@ int mwifiex_ret_802_11_hs_cfg(struct mwifiex_private *priv,
         }
         if (conditions != HOST_SLEEP_CFG_CANCEL) {
                 adapter->is_hs_configured = true;
+                if (adapter->iface_type == MWIFIEX_USB ||
+                    adapter->iface_type == MWIFIEX_PCIE)
+                        mwifiex_hs_activated_event(priv, true);
         } else {
                 adapter->is_hs_configured = false;
                 if (adapter->hs_activated)
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 561452a5c818..ffb6cdfdb797 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -124,6 +124,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define TLV_TYPE_UAP_DTIM_PERIOD    (PROPRIETARY_TLV_BASE_ID + 45)
 #define TLV_TYPE_UAP_BCAST_SSID     (PROPRIETARY_TLV_BASE_ID + 48)
 #define TLV_TYPE_UAP_RTS_THRESHOLD  (PROPRIETARY_TLV_BASE_ID + 51)
+#define TLV_TYPE_UAP_WEP_KEY        (PROPRIETARY_TLV_BASE_ID + 59)
 #define TLV_TYPE_UAP_WPA_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 60)
 #define TLV_TYPE_UAP_ENCRY_PROTOCOL (PROPRIETARY_TLV_BASE_ID + 64)
 #define TLV_TYPE_UAP_AKMP           (PROPRIETARY_TLV_BASE_ID + 65)
@@ -162,6 +163,12 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 
 #define ISSUPP_11NENABLED(FwCapInfo) (FwCapInfo & BIT(11))
 
+#define MWIFIEX_DEF_HT_CAP      (IEEE80211_HT_CAP_DSSSCCK40 | \
+                                 (1 << IEEE80211_HT_CAP_RX_STBC_SHIFT) | \
+                                 IEEE80211_HT_CAP_SM_PS)
+
+#define MWIFIEX_DEF_AMPDU       IEEE80211_HT_AMPDU_PARM_FACTOR
+
 /* dev_cap bitmap
  * BIT
  * 0-16         reserved
@@ -219,6 +226,7 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define HostCmd_CMD_RF_REG_ACCESS                     0x001b
 #define HostCmd_CMD_PMIC_REG_ACCESS                   0x00ad
 #define HostCmd_CMD_802_11_RF_CHANNEL                 0x001d
+#define HostCmd_CMD_RF_TX_PWR                         0x001e
 #define HostCmd_CMD_802_11_DEAUTHENTICATE             0x0024
 #define HostCmd_CMD_MAC_CONTROL                       0x0028
 #define HostCmd_CMD_802_11_AD_HOC_START               0x002b
@@ -869,6 +877,13 @@ struct host_cmd_ds_txpwr_cfg {
         __le32 mode;
 } __packed;
 
+struct host_cmd_ds_rf_tx_pwr {
+        __le16 action;
+        __le16 cur_level;
+        u8 max_power;
+        u8 min_power;
+} __packed;
+
 struct mwifiex_bcn_param {
         u8 bssid[ETH_ALEN];
         u8 rssi;
@@ -1195,6 +1210,13 @@ struct host_cmd_tlv_passphrase {
         u8 passphrase[0];
 } __packed;
 
+struct host_cmd_tlv_wep_key {
+        struct host_cmd_tlv tlv;
+        u8 key_index;
+        u8 is_default;
+        u8 key[1];
+};
+
 struct host_cmd_tlv_auth_type {
         struct host_cmd_tlv tlv;
         u8 auth_type;
@@ -1347,6 +1369,7 @@ struct host_cmd_ds_command {
                 struct host_cmd_ds_tx_rate_query tx_rate;
                 struct host_cmd_ds_tx_rate_cfg tx_rate_cfg;
                 struct host_cmd_ds_txpwr_cfg txp_cfg;
+                struct host_cmd_ds_rf_tx_pwr txp;
                 struct host_cmd_ds_802_11_ps_mode_enh psmode_enh;
                 struct host_cmd_ds_802_11_hs_cfg_enh opt_hs_cfg;
                 struct host_cmd_ds_802_11_scan scan;
diff --git a/drivers/net/wireless/mwifiex/ie.c b/drivers/net/wireless/mwifiex/ie.c
index 383820a52beb..8374e33f195a 100644
--- a/drivers/net/wireless/mwifiex/ie.c
+++ b/drivers/net/wireless/mwifiex/ie.c
@@ -225,29 +225,46 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
                          struct cfg80211_ap_settings *params)
 {
         struct mwifiex_ie *beacon_ie = NULL, *pr_ie = NULL;
-        struct mwifiex_ie *ar_ie = NULL, *rsn_ie = NULL;
-        struct ieee_types_header *ie = NULL;
+        struct mwifiex_ie *ar_ie = NULL, *gen_ie = NULL;
+        struct ieee_types_header *rsn_ie = NULL, *wpa_ie = NULL;
         u16 beacon_idx = MWIFIEX_AUTO_IDX_MASK, pr_idx = MWIFIEX_AUTO_IDX_MASK;
         u16 ar_idx = MWIFIEX_AUTO_IDX_MASK, rsn_idx = MWIFIEX_AUTO_IDX_MASK;
-        u16 mask;
+        u16 mask, ie_len = 0;
+        const u8 *vendor_ie;
         int ret = 0;
 
         if (params->beacon.tail && params->beacon.tail_len) {
-                ie = (void *)cfg80211_find_ie(WLAN_EID_RSN, params->beacon.tail,
-                                              params->beacon.tail_len);
-                if (ie) {
-                        rsn_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
-                        if (!rsn_ie)
-                                return -ENOMEM;
-
-                        rsn_ie->ie_index = cpu_to_le16(rsn_idx);
-                        mask = MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP |
-                               MGMT_MASK_ASSOC_RESP;
-                        rsn_ie->mgmt_subtype_mask = cpu_to_le16(mask);
-                        rsn_ie->ie_length = cpu_to_le16(ie->len + 2);
-                        memcpy(rsn_ie->ie_buffer, ie, ie->len + 2);
-
-                        if (mwifiex_update_uap_custom_ie(priv, rsn_ie, &rsn_idx,
+                gen_ie = kzalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
+                if (!gen_ie)
+                        return -ENOMEM;
+                gen_ie->ie_index = cpu_to_le16(rsn_idx);
+                mask = MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP |
+                       MGMT_MASK_ASSOC_RESP;
+                gen_ie->mgmt_subtype_mask = cpu_to_le16(mask);
+
+                rsn_ie = (void *)cfg80211_find_ie(WLAN_EID_RSN,
+                                                  params->beacon.tail,
+                                                  params->beacon.tail_len);
+                if (rsn_ie) {
+                        memcpy(gen_ie->ie_buffer, rsn_ie, rsn_ie->len + 2);
+                        ie_len = rsn_ie->len + 2;
+                        gen_ie->ie_length = cpu_to_le16(ie_len);
+                }
+
+                vendor_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
+                                                    WLAN_OUI_TYPE_MICROSOFT_WPA,
+                                                    params->beacon.tail,
+                                                    params->beacon.tail_len);
+                if (vendor_ie) {
+                        wpa_ie = (struct ieee_types_header *)vendor_ie;
+                        memcpy(gen_ie->ie_buffer + ie_len,
+                               wpa_ie, wpa_ie->len + 2);
+                        ie_len += wpa_ie->len + 2;
+                        gen_ie->ie_length = cpu_to_le16(ie_len);
+                }
+
+                if (rsn_ie || wpa_ie) {
+                        if (mwifiex_update_uap_custom_ie(priv, gen_ie, &rsn_idx,
                                                          NULL, NULL,
                                                          NULL, NULL)) {
                                 ret = -1;
@@ -320,7 +337,7 @@ done:
         kfree(beacon_ie);
         kfree(pr_ie);
         kfree(ar_ie);
-        kfree(rsn_ie);
+        kfree(gen_ie);
 
         return ret;
 }
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 0f18ef6a30c8..b543a4d82ff3 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -103,6 +103,7 @@ static void scan_delay_timer_fn(unsigned long data)
                                   msecs_to_jiffies(MWIFIEX_SCAN_DELAY_MSEC));
                         adapter->scan_delay_cnt++;
                 }
+                queue_work(priv->adapter->workqueue, &priv->adapter->main_work);
         } else {
                 /*
                  * Tx data queue is empty. Get scan command from scan_pending_q
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
index e6be6ee75951..9f088fb88cb7 100644
--- a/drivers/net/wireless/mwifiex/ioctl.h
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -21,6 +21,7 @@
 #define _MWIFIEX_IOCTL_H_
 
 #include <net/mac80211.h>
+#include <net/lib80211.h>
 
 enum {
         MWIFIEX_SCAN_TYPE_UNCHANGED = 0,
@@ -71,6 +72,13 @@ struct wpa_param {
         u8 passphrase[MWIFIEX_WPA_PASSHPHRASE_LEN];
 };
 
+struct wep_key {
+        u8 key_index;
+        u8 is_default;
+        u16 length;
+        u8 key[WLAN_KEY_LEN_WEP104];
+};
+
 #define KEY_MGMT_ON_HOST        0x03
 #define MWIFIEX_AUTH_MODE_AUTO  0xFF
 #define BAND_CONFIG_MANUAL      0x00
@@ -90,6 +98,8 @@ struct mwifiex_uap_bss_param {
         u16 key_mgmt;
         u16 key_mgmt_operation;
         struct wpa_param wpa_cfg;
+        struct wep_key wep_cfg[NUM_WEP_KEYS];
+        struct ieee80211_ht_cap ht_cap;
 };
 
 enum {
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 0f06f07a70e6..f0219efc8953 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -190,7 +190,8 @@ process_start:
                             adapter->tx_lock_flag)
                                 break;
 
-                        if (adapter->scan_processing || adapter->data_sent ||
+                        if ((adapter->scan_processing &&
+                             !adapter->scan_delay_cnt) || adapter->data_sent ||
                             mwifiex_wmm_lists_empty(adapter)) {
                                 if (adapter->cmd_sent || adapter->curr_cmd ||
                                     (!is_command_pending(adapter)))
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 5b32221077c4..7cd95cc99a85 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -840,6 +840,9 @@ void mwifiex_init_priv_params(struct mwifiex_private *priv,
 int mwifiex_set_secure_params(struct mwifiex_private *priv,
                               struct mwifiex_uap_bss_param *bss_config,
                               struct cfg80211_ap_settings *params);
+void mwifiex_set_ht_params(struct mwifiex_private *priv,
+                           struct mwifiex_uap_bss_param *bss_cfg,
+                           struct cfg80211_ap_settings *params);
 
 /*
  * This function checks if the queuing is RA based or not.
@@ -946,8 +949,8 @@ int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,
                               struct mwifiex_rate_cfg *rate);
 int mwifiex_request_scan(struct mwifiex_private *priv,
                          struct cfg80211_ssid *req_ssid);
-int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
-                                struct mwifiex_user_scan_cfg *scan_req);
+int mwifiex_scan_networks(struct mwifiex_private *priv,
+                          const struct mwifiex_user_scan_cfg *user_scan_in);
 int mwifiex_set_radio(struct mwifiex_private *priv, u8 option);
 
 int mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, u16 channel);
@@ -990,7 +993,6 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv,
 
 int mwifiex_main_process(struct mwifiex_adapter *);
 
-int mwifiex_uap_set_channel(struct mwifiex_private *priv, int channel);
 int mwifiex_bss_set_channel(struct mwifiex_private *,
                             struct mwifiex_chan_freq_power *cfp);
 int mwifiex_get_bss_info(struct mwifiex_private *,
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 98c6aabd5a48..04dc7ca4ac22 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1294,8 +1294,8 @@ mwifiex_radio_type_to_band(u8 radio_type)
  * order to send the appropriate scan commands to firmware to populate or
  * update the internal driver scan table.
  */
-static int mwifiex_scan_networks(struct mwifiex_private *priv,
-                const struct mwifiex_user_scan_cfg *user_scan_in)
+int mwifiex_scan_networks(struct mwifiex_private *priv,
+                          const struct mwifiex_user_scan_cfg *user_scan_in)
 {
         int ret = 0;
         struct mwifiex_adapter *adapter = priv->adapter;
@@ -1360,6 +1360,7 @@ static int mwifiex_scan_networks(struct mwifiex_private *priv,
                         adapter->cmd_queued = cmd_node;
                         mwifiex_insert_cmd_to_pending_q(adapter, cmd_node,
                                                         true);
+                        queue_work(adapter->workqueue, &adapter->main_work);
                 } else {
                         spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
                                                flags);
@@ -1376,26 +1377,6 @@ static int mwifiex_scan_networks(struct mwifiex_private *priv,
 }
 
 /*
- * Sends IOCTL request to start a scan with user configurations.
- *
- * This function allocates the IOCTL request buffer, fills it
- * with requisite parameters and calls the IOCTL handler.
- *
- * Upon completion, it also generates a wireless event to notify
- * applications.
- */
-int mwifiex_set_user_scan_ioctl(struct mwifiex_private *priv,
-                                struct mwifiex_user_scan_cfg *scan_req)
-{
-        int status;
-
-        status = mwifiex_scan_networks(priv, scan_req);
-        queue_work(priv->adapter->workqueue, &priv->adapter->main_work);
-
-        return status;
-}
-
-/*
  * This function prepares a scan command to be sent to the firmware.
  *
  * This uses the scan command configuration sent to the command processing
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 1ff1362d8cdf..b9cd9ed48c45 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -260,6 +260,23 @@ static int mwifiex_cmd_tx_power_cfg(struct host_cmd_ds_command *cmd,
 }
 
 /*
+ * This function prepares command to get RF Tx power.
+ */
+static int mwifiex_cmd_rf_tx_power(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_command *cmd,
+                                   u16 cmd_action, void *data_buf)
+{
+        struct host_cmd_ds_rf_tx_pwr *txp = &cmd->params.txp;
+
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_rf_tx_pwr)
+                                + S_DS_GEN);
+        cmd->command = cpu_to_le16(HostCmd_CMD_RF_TX_PWR);
+        txp->action = cpu_to_le16(cmd_action);
+
+        return 0;
+}
+
+/*
  * This function prepares command to set Host Sleep configuration.
  *
  * Preparation includes -
@@ -1049,6 +1066,10 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
                 ret = mwifiex_cmd_tx_power_cfg(cmd_ptr, cmd_action,
                                                data_buf);
                 break;
+        case HostCmd_CMD_RF_TX_PWR:
+                ret = mwifiex_cmd_rf_tx_power(priv, cmd_ptr, cmd_action,
+                                              data_buf);
+                break;
         case HostCmd_CMD_802_11_PS_MODE_ENH:
                 ret = mwifiex_cmd_enh_power_mode(priv, cmd_ptr, cmd_action,
                                                  (uint16_t)cmd_oid, data_buf);
@@ -1277,7 +1298,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
         priv->data_rate = 0;
 
         /* get tx power */
-        ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_TXPWR_CFG,
+        ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_RF_TX_PWR,
                                      HostCmd_ACT_GEN_GET, 0, NULL);
         if (ret)
                 return -1;
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index bd40541ebd5a..78fc352c85c4 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -451,6 +451,30 @@ static int mwifiex_ret_tx_power_cfg(struct mwifiex_private *priv,
 }
 
 /*
+ * This function handles the command response of get RF Tx power.
+ */
+static int mwifiex_ret_rf_tx_power(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_command *resp)
+{
+        struct host_cmd_ds_rf_tx_pwr *txp = &resp->params.txp;
+        u16 action = le16_to_cpu(txp->action);
+
+        priv->tx_power_level = le16_to_cpu(txp->cur_level);
+
+        if (action == HostCmd_ACT_GEN_GET) {
+                priv->max_tx_power_level = txp->max_power;
+                priv->min_tx_power_level = txp->min_power;
+        }
+
+        dev_dbg(priv->adapter->dev,
+                "Current TxPower Level=%d, Max Power=%d, Min Power=%d\n",
+                priv->tx_power_level, priv->max_tx_power_level,
+                priv->min_tx_power_level);
+
+        return 0;
+}
+
+/*
  * This function handles the command response of set/get MAC address.
  *
  * Handling includes saving the MAC address in driver.
@@ -841,6 +865,9 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
         case HostCmd_CMD_TXPWR_CFG:
                 ret = mwifiex_ret_tx_power_cfg(priv, resp);
                 break;
+        case HostCmd_CMD_RF_TX_PWR:
+                ret = mwifiex_ret_rf_tx_power(priv, resp);
+                break;
         case HostCmd_CMD_802_11_PS_MODE_ENH:
                 ret = mwifiex_ret_enh_power_mode(priv, resp, data_buf);
                 break;
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index 106c449477b2..f2fd2423214f 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -66,9 +66,6 @@ int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
         dev_dbg(adapter->dev, "cmd pending\n");
         atomic_inc(&adapter->cmd_pending);
 
-        /* Status pending, wake up main process */
-        queue_work(adapter->workqueue, &adapter->main_work);
-
         /* Wait for completion */
         wait_event_interruptible(adapter->cmd_wait_q.wait,
                                  *(cmd_queued->condition));
diff --git a/drivers/net/wireless/mwifiex/uap_cmd.c b/drivers/net/wireless/mwifiex/uap_cmd.c
index 89f9a2a45de3..f40e93fe894a 100644
--- a/drivers/net/wireless/mwifiex/uap_cmd.c
+++ b/drivers/net/wireless/mwifiex/uap_cmd.c
@@ -26,6 +26,7 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                               struct mwifiex_uap_bss_param *bss_config,
                               struct cfg80211_ap_settings *params) {
         int i;
+        struct mwifiex_wep_key wep_key;
 
         if (!params->privacy) {
                 bss_config->protocol = PROTOCOL_NO_SECURITY;
@@ -65,7 +66,7 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                         }
                         if (params->crypto.wpa_versions &
                             NL80211_WPA_VERSION_2) {
-                                bss_config->protocol = PROTOCOL_WPA2;
+                                bss_config->protocol |= PROTOCOL_WPA2;
                                 bss_config->key_mgmt = KEY_MGMT_EAP;
                         }
                         break;
@@ -77,7 +78,7 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                         }
                         if (params->crypto.wpa_versions &
                             NL80211_WPA_VERSION_2) {
-                                bss_config->protocol = PROTOCOL_WPA2;
+                                bss_config->protocol |= PROTOCOL_WPA2;
                                 bss_config->key_mgmt = KEY_MGMT_PSK;
                         }
                         break;
@@ -91,10 +92,19 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
                 case WLAN_CIPHER_SUITE_WEP104:
                         break;
                 case WLAN_CIPHER_SUITE_TKIP:
-                        bss_config->wpa_cfg.pairwise_cipher_wpa = CIPHER_TKIP;
+                        if (params->crypto.wpa_versions & NL80211_WPA_VERSION_1)
+                                bss_config->wpa_cfg.pairwise_cipher_wpa |=
+                                                                CIPHER_TKIP;
+                        if (params->crypto.wpa_versions & NL80211_WPA_VERSION_2)
+                                bss_config->wpa_cfg.pairwise_cipher_wpa2 |=
+                                                                CIPHER_TKIP;
                         break;
                 case WLAN_CIPHER_SUITE_CCMP:
-                        bss_config->wpa_cfg.pairwise_cipher_wpa2 =
+                        if (params->crypto.wpa_versions & NL80211_WPA_VERSION_1)
+                                bss_config->wpa_cfg.pairwise_cipher_wpa |=
+                                                                CIPHER_AES_CCMP;
+                        if (params->crypto.wpa_versions & NL80211_WPA_VERSION_2)
+                                bss_config->wpa_cfg.pairwise_cipher_wpa2 |=
                                                                 CIPHER_AES_CCMP;
                 default:
                         break;
@@ -104,6 +114,27 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
         switch (params->crypto.cipher_group) {
         case WLAN_CIPHER_SUITE_WEP40:
         case WLAN_CIPHER_SUITE_WEP104:
+                if (priv->sec_info.wep_enabled) {
+                        bss_config->protocol = PROTOCOL_STATIC_WEP;
+                        bss_config->key_mgmt = KEY_MGMT_NONE;
+                        bss_config->wpa_cfg.length = 0;
+
+                        for (i = 0; i < NUM_WEP_KEYS; i++) {
+                                wep_key = priv->wep_key[i];
+                                bss_config->wep_cfg[i].key_index = i;
+
+                                if (priv->wep_key_curr_index == i)
+                                        bss_config->wep_cfg[i].is_default = 1;
+                                else
+                                        bss_config->wep_cfg[i].is_default = 0;
+
+                                bss_config->wep_cfg[i].length =
+                                                             wep_key.key_length;
+                                memcpy(&bss_config->wep_cfg[i].key,
+                                       &wep_key.key_material,
+                                       wep_key.key_length);
+                        }
+                }
                 break;
         case WLAN_CIPHER_SUITE_TKIP:
                 bss_config->wpa_cfg.group_cipher = CIPHER_TKIP;
@@ -118,6 +149,33 @@ int mwifiex_set_secure_params(struct mwifiex_private *priv,
         return 0;
 }
 
+/* This function updates 11n related parameters from IE and sets them into
+ * bss_config structure.
+ */
+void
+mwifiex_set_ht_params(struct mwifiex_private *priv,
+                      struct mwifiex_uap_bss_param *bss_cfg,
+                      struct cfg80211_ap_settings *params)
+{
+        const u8 *ht_ie;
+
+        if (!ISSUPP_11NENABLED(priv->adapter->fw_cap_info))
+                return;
+
+        ht_ie = cfg80211_find_ie(WLAN_EID_HT_CAPABILITY, params->beacon.tail,
+                                 params->beacon.tail_len);
+        if (ht_ie) {
+                memcpy(&bss_cfg->ht_cap, ht_ie + 2,
+                       sizeof(struct ieee80211_ht_cap));
+        } else {
+                memset(&bss_cfg->ht_cap , 0, sizeof(struct ieee80211_ht_cap));
+                bss_cfg->ht_cap.cap_info = cpu_to_le16(MWIFIEX_DEF_HT_CAP);
+                bss_cfg->ht_cap.ampdu_params_info = MWIFIEX_DEF_AMPDU;
+        }
+
+        return;
+}
+
 /* This function initializes some of mwifiex_uap_bss_param variables.
  * This helps FW in ignoring invalid values. These values may or may not
  * be get updated to valid ones at later stage.
@@ -135,6 +193,120 @@ void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config)
 }
 
 /* This function parses BSS related parameters from structure
+ * and prepares TLVs specific to WPA/WPA2 security.
+ * These TLVs are appended to command buffer.
+ */
+static void
+mwifiex_uap_bss_wpa(u8 **tlv_buf, void *cmd_buf, u16 *param_size)
+{
+        struct host_cmd_tlv_pwk_cipher *pwk_cipher;
+        struct host_cmd_tlv_gwk_cipher *gwk_cipher;
+        struct host_cmd_tlv_passphrase *passphrase;
+        struct host_cmd_tlv_akmp *tlv_akmp;
+        struct mwifiex_uap_bss_param *bss_cfg = cmd_buf;
+        u16 cmd_size = *param_size;
+        u8 *tlv = *tlv_buf;
+
+        tlv_akmp = (struct host_cmd_tlv_akmp *)tlv;
+        tlv_akmp->tlv.type = cpu_to_le16(TLV_TYPE_UAP_AKMP);
+        tlv_akmp->tlv.len = cpu_to_le16(sizeof(struct host_cmd_tlv_akmp) -
+                                        sizeof(struct host_cmd_tlv));
+        tlv_akmp->key_mgmt_operation = cpu_to_le16(bss_cfg->key_mgmt_operation);
+        tlv_akmp->key_mgmt = cpu_to_le16(bss_cfg->key_mgmt);
+        cmd_size += sizeof(struct host_cmd_tlv_akmp);
+        tlv += sizeof(struct host_cmd_tlv_akmp);
+
+        if (bss_cfg->wpa_cfg.pairwise_cipher_wpa & VALID_CIPHER_BITMAP) {
+                pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
+                pwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_PWK_CIPHER);
+                pwk_cipher->tlv.len =
+                        cpu_to_le16(sizeof(struct host_cmd_tlv_pwk_cipher) -
+                                    sizeof(struct host_cmd_tlv));
+                pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA);
+                pwk_cipher->cipher = bss_cfg->wpa_cfg.pairwise_cipher_wpa;
+                cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
+                tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
+        }
+
+        if (bss_cfg->wpa_cfg.pairwise_cipher_wpa2 & VALID_CIPHER_BITMAP) {
+                pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
+                pwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_PWK_CIPHER);
+                pwk_cipher->tlv.len =
+                        cpu_to_le16(sizeof(struct host_cmd_tlv_pwk_cipher) -
+                                    sizeof(struct host_cmd_tlv));
+                pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA2);
+                pwk_cipher->cipher = bss_cfg->wpa_cfg.pairwise_cipher_wpa2;
+                cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
+                tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
+        }
+
+        if (bss_cfg->wpa_cfg.group_cipher & VALID_CIPHER_BITMAP) {
+                gwk_cipher = (struct host_cmd_tlv_gwk_cipher *)tlv;
+                gwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_GWK_CIPHER);
+                gwk_cipher->tlv.len =
+                        cpu_to_le16(sizeof(struct host_cmd_tlv_gwk_cipher) -
+                                    sizeof(struct host_cmd_tlv));
+                gwk_cipher->cipher = bss_cfg->wpa_cfg.group_cipher;
+                cmd_size += sizeof(struct host_cmd_tlv_gwk_cipher);
+                tlv += sizeof(struct host_cmd_tlv_gwk_cipher);
+        }
+
+        if (bss_cfg->wpa_cfg.length) {
+                passphrase = (struct host_cmd_tlv_passphrase *)tlv;
+                passphrase->tlv.type = cpu_to_le16(TLV_TYPE_UAP_WPA_PASSPHRASE);
+                passphrase->tlv.len = cpu_to_le16(bss_cfg->wpa_cfg.length);
+                memcpy(passphrase->passphrase, bss_cfg->wpa_cfg.passphrase,
+                       bss_cfg->wpa_cfg.length);
+                cmd_size += sizeof(struct host_cmd_tlv) +
+                            bss_cfg->wpa_cfg.length;
+                tlv += sizeof(struct host_cmd_tlv) + bss_cfg->wpa_cfg.length;
+        }
+
+        *param_size = cmd_size;
+        *tlv_buf = tlv;
+
+        return;
+}
+
+/* This function parses BSS related parameters from structure
+ * and prepares TLVs specific to WEP encryption.
+ * These TLVs are appended to command buffer.
+ */
+static void
+mwifiex_uap_bss_wep(u8 **tlv_buf, void *cmd_buf, u16 *param_size)
+{
+        struct host_cmd_tlv_wep_key *wep_key;
+        u16 cmd_size = *param_size;
+        int i;
+        u8 *tlv = *tlv_buf;
+        struct mwifiex_uap_bss_param *bss_cfg = cmd_buf;
+
+        for (i = 0; i < NUM_WEP_KEYS; i++) {
+                if (bss_cfg->wep_cfg[i].length &&
+                    (bss_cfg->wep_cfg[i].length == WLAN_KEY_LEN_WEP40 ||
+                     bss_cfg->wep_cfg[i].length == WLAN_KEY_LEN_WEP104)) {
+                        wep_key = (struct host_cmd_tlv_wep_key *)tlv;
+                        wep_key->tlv.type = cpu_to_le16(TLV_TYPE_UAP_WEP_KEY);
+                        wep_key->tlv.len =
+                                cpu_to_le16(bss_cfg->wep_cfg[i].length + 2);
+                        wep_key->key_index = bss_cfg->wep_cfg[i].key_index;
+                        wep_key->is_default = bss_cfg->wep_cfg[i].is_default;
+                        memcpy(wep_key->key, bss_cfg->wep_cfg[i].key,
+                               bss_cfg->wep_cfg[i].length);
+                        cmd_size += sizeof(struct host_cmd_tlv) + 2 +
+                                    bss_cfg->wep_cfg[i].length;
+                        tlv += sizeof(struct host_cmd_tlv) + 2 +
+                                    bss_cfg->wep_cfg[i].length;
+                }
+        }
+
+        *param_size = cmd_size;
+        *tlv_buf = tlv;
+
+        return;
+}
+
+/* This function parses BSS related parameters from structure
  * and prepares TLVs. These TLVs are appended to command buffer.
 */
 static int
@@ -148,12 +320,9 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
         struct host_cmd_tlv_frag_threshold *frag_threshold;
         struct host_cmd_tlv_rts_threshold *rts_threshold;
         struct host_cmd_tlv_retry_limit *retry_limit;
-        struct host_cmd_tlv_pwk_cipher *pwk_cipher;
-        struct host_cmd_tlv_gwk_cipher *gwk_cipher;
         struct host_cmd_tlv_encrypt_protocol *encrypt_protocol;
         struct host_cmd_tlv_auth_type *auth_type;
-        struct host_cmd_tlv_passphrase *passphrase;
-        struct host_cmd_tlv_akmp *tlv_akmp;
+        struct mwifiex_ie_types_htcap *htcap;
         struct mwifiex_uap_bss_param *bss_cfg = cmd_buf;
         u16 cmd_size = *param_size;
 
@@ -243,70 +412,11 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
         }
         if ((bss_cfg->protocol & PROTOCOL_WPA) ||
             (bss_cfg->protocol & PROTOCOL_WPA2) ||
-            (bss_cfg->protocol & PROTOCOL_EAP)) {
-                tlv_akmp = (struct host_cmd_tlv_akmp *)tlv;
-                tlv_akmp->tlv.type = cpu_to_le16(TLV_TYPE_UAP_AKMP);
-                tlv_akmp->tlv.len =
-                    cpu_to_le16(sizeof(struct host_cmd_tlv_akmp) -
-                                sizeof(struct host_cmd_tlv));
-                tlv_akmp->key_mgmt_operation =
-                        cpu_to_le16(bss_cfg->key_mgmt_operation);
-                tlv_akmp->key_mgmt = cpu_to_le16(bss_cfg->key_mgmt);
-                cmd_size += sizeof(struct host_cmd_tlv_akmp);
-                tlv += sizeof(struct host_cmd_tlv_akmp);
-
-                if (bss_cfg->wpa_cfg.pairwise_cipher_wpa &
-                                VALID_CIPHER_BITMAP) {
-                        pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
-                        pwk_cipher->tlv.type =
-                                cpu_to_le16(TLV_TYPE_PWK_CIPHER);
-                        pwk_cipher->tlv.len = cpu_to_le16(
-                                sizeof(struct host_cmd_tlv_pwk_cipher) -
-                                sizeof(struct host_cmd_tlv));
-                        pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA);
-                        pwk_cipher->cipher =
-                                bss_cfg->wpa_cfg.pairwise_cipher_wpa;
-                        cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
-                        tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
-                }
-                if (bss_cfg->wpa_cfg.pairwise_cipher_wpa2 &
-                                VALID_CIPHER_BITMAP) {
-                        pwk_cipher = (struct host_cmd_tlv_pwk_cipher *)tlv;
-                        pwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_PWK_CIPHER);
-                        pwk_cipher->tlv.len = cpu_to_le16(
-                                sizeof(struct host_cmd_tlv_pwk_cipher) -
-                                sizeof(struct host_cmd_tlv));
-                        pwk_cipher->proto = cpu_to_le16(PROTOCOL_WPA2);
-                        pwk_cipher->cipher =
-                                bss_cfg->wpa_cfg.pairwise_cipher_wpa2;
-                        cmd_size += sizeof(struct host_cmd_tlv_pwk_cipher);
-                        tlv += sizeof(struct host_cmd_tlv_pwk_cipher);
-                }
-                if (bss_cfg->wpa_cfg.group_cipher & VALID_CIPHER_BITMAP) {
-                        gwk_cipher = (struct host_cmd_tlv_gwk_cipher *)tlv;
-                        gwk_cipher->tlv.type = cpu_to_le16(TLV_TYPE_GWK_CIPHER);
-                        gwk_cipher->tlv.len = cpu_to_le16(
-                                sizeof(struct host_cmd_tlv_gwk_cipher) -
-                                sizeof(struct host_cmd_tlv));
-                        gwk_cipher->cipher = bss_cfg->wpa_cfg.group_cipher;
-                        cmd_size += sizeof(struct host_cmd_tlv_gwk_cipher);
-                        tlv += sizeof(struct host_cmd_tlv_gwk_cipher);
-                }
-                if (bss_cfg->wpa_cfg.length) {
-                        passphrase = (struct host_cmd_tlv_passphrase *)tlv;
-                        passphrase->tlv.type =
-                                cpu_to_le16(TLV_TYPE_UAP_WPA_PASSPHRASE);
-                        passphrase->tlv.len =
-                                cpu_to_le16(bss_cfg->wpa_cfg.length);
-                        memcpy(passphrase->passphrase,
-                               bss_cfg->wpa_cfg.passphrase,
-                               bss_cfg->wpa_cfg.length);
-                        cmd_size += sizeof(struct host_cmd_tlv) +
-                                    bss_cfg->wpa_cfg.length;
-                        tlv += sizeof(struct host_cmd_tlv) +
-                               bss_cfg->wpa_cfg.length;
-                }
-        }
+            (bss_cfg->protocol & PROTOCOL_EAP))
+                mwifiex_uap_bss_wpa(&tlv, cmd_buf, &cmd_size);
+        else
+                mwifiex_uap_bss_wep(&tlv, cmd_buf, &cmd_size);
+
         if ((bss_cfg->auth_mode <= WLAN_AUTH_SHARED_KEY) ||
             (bss_cfg->auth_mode == MWIFIEX_AUTH_MODE_AUTO)) {
                 auth_type = (struct host_cmd_tlv_auth_type *)tlv;
@@ -330,6 +440,25 @@ mwifiex_uap_bss_param_prepare(u8 *tlv, void *cmd_buf, u16 *param_size)
                 tlv += sizeof(struct host_cmd_tlv_encrypt_protocol);
         }
 
+        if (bss_cfg->ht_cap.cap_info) {
+                htcap = (struct mwifiex_ie_types_htcap *)tlv;
+                htcap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);
+                htcap->header.len =
+                                cpu_to_le16(sizeof(struct ieee80211_ht_cap));
+                htcap->ht_cap.cap_info = bss_cfg->ht_cap.cap_info;
+                htcap->ht_cap.ampdu_params_info =
+                                             bss_cfg->ht_cap.ampdu_params_info;
+                memcpy(&htcap->ht_cap.mcs, &bss_cfg->ht_cap.mcs,
+                       sizeof(struct ieee80211_mcs_info));
+                htcap->ht_cap.extended_ht_cap_info =
+                                        bss_cfg->ht_cap.extended_ht_cap_info;
+                htcap->ht_cap.tx_BF_cap_info = bss_cfg->ht_cap.tx_BF_cap_info;
+                htcap->ht_cap.antenna_selection_info =
+                                        bss_cfg->ht_cap.antenna_selection_info;
+                cmd_size += sizeof(struct mwifiex_ie_types_htcap);
+                tlv += sizeof(struct mwifiex_ie_types_htcap);
+        }
+
         *param_size = cmd_size;
 
         return 0;
@@ -421,33 +550,3 @@ int mwifiex_uap_prepare_cmd(struct mwifiex_private *priv, u16 cmd_no,
 
         return 0;
 }
-
-/* This function sets the RF channel for AP.
- *
- * This function populates channel information in AP config structure
- * and sends command to configure channel information in AP.
- */
-int mwifiex_uap_set_channel(struct mwifiex_private *priv, int channel)
-{
-        struct mwifiex_uap_bss_param *bss_cfg;
-        struct wiphy *wiphy = priv->wdev->wiphy;
-
-        bss_cfg = kzalloc(sizeof(struct mwifiex_uap_bss_param), GFP_KERNEL);
-        if (!bss_cfg)
-                return -ENOMEM;
-
-        mwifiex_set_sys_config_invalid_data(bss_cfg);
-        bss_cfg->band_cfg = BAND_CONFIG_MANUAL;
-        bss_cfg->channel = channel;
-
-        if (mwifiex_send_cmd_async(priv, HostCmd_CMD_UAP_SYS_CONFIG,
-                                   HostCmd_ACT_GEN_SET,
-                                   UAP_BSS_PARAMS_I, bss_cfg)) {
-                wiphy_err(wiphy, "Failed to set the uAP channel\n");
-                kfree(bss_cfg);
-                return -1;
-        }
-
-        kfree(bss_cfg);
-        return 0;
-}
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index 299c3879582d..c7548da6573d 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -99,6 +99,14 @@ config RT2800PCI_RT53XX
          rt2800pci driver.
          Supported chips: RT5390
 
+config RT2800PCI_RT3290
+       bool "rt2800pci - Include support for rt3290 devices (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       default y
+       ---help---
+         This adds support for rt3290 wireless chipset family to the
+         rt2800pci driver.
+         Supported chips: RT3290
 endif
 
 config RT2500USB
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 1ca88cdc6ece..e252e9bafd0e 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -68,6 +68,7 @@
 #define RF3320                          0x000b
 #define RF3322                          0x000c
 #define RF3053                          0x000d
+#define RF3290                          0x3290
 #define RF5360                          0x5360
 #define RF5370                          0x5370
 #define RF5372                          0x5372
@@ -117,6 +118,12 @@
  * Registers.
  */
 
+
+/*
+ * MAC_CSR0_3290: MAC_CSR0 for RT3290 to identity MAC version number.
+ */
+#define MAC_CSR0_3290                           0x0000
+
 /*
  * E2PROM_CSR: PCI EEPROM control register.
  * RELOAD: Write 1 to reload eeprom content.
@@ -133,6 +140,150 @@
 #define E2PROM_CSR_RELOAD               FIELD32(0x00000080)
 
 /*
+ * CMB_CTRL_CFG
+ */
+#define CMB_CTRL                0x0020
+#define AUX_OPT_BIT0            FIELD32(0x00000001)
+#define AUX_OPT_BIT1            FIELD32(0x00000002)
+#define AUX_OPT_BIT2            FIELD32(0x00000004)
+#define AUX_OPT_BIT3            FIELD32(0x00000008)
+#define AUX_OPT_BIT4            FIELD32(0x00000010)
+#define AUX_OPT_BIT5            FIELD32(0x00000020)
+#define AUX_OPT_BIT6            FIELD32(0x00000040)
+#define AUX_OPT_BIT7            FIELD32(0x00000080)
+#define AUX_OPT_BIT8            FIELD32(0x00000100)
+#define AUX_OPT_BIT9            FIELD32(0x00000200)
+#define AUX_OPT_BIT10           FIELD32(0x00000400)
+#define AUX_OPT_BIT11           FIELD32(0x00000800)
+#define AUX_OPT_BIT12           FIELD32(0x00001000)
+#define AUX_OPT_BIT13           FIELD32(0x00002000)
+#define AUX_OPT_BIT14           FIELD32(0x00004000)
+#define AUX_OPT_BIT15           FIELD32(0x00008000)
+#define LDO25_LEVEL             FIELD32(0x00030000)
+#define LDO25_LARGEA            FIELD32(0x00040000)
+#define LDO25_FRC_ON            FIELD32(0x00080000)
+#define CMB_RSV                 FIELD32(0x00300000)
+#define XTAL_RDY                FIELD32(0x00400000)
+#define PLL_LD                  FIELD32(0x00800000)
+#define LDO_CORE_LEVEL          FIELD32(0x0F000000)
+#define LDO_BGSEL               FIELD32(0x30000000)
+#define LDO3_EN                 FIELD32(0x40000000)
+#define LDO0_EN                 FIELD32(0x80000000)
+
+/*
+ * EFUSE_CSR_3290: RT3290 EEPROM
+ */
+#define EFUSE_CTRL_3290                 0x0024
+
+/*
+ * EFUSE_DATA3 of 3290
+ */
+#define EFUSE_DATA3_3290                0x0028
+
+/*
+ * EFUSE_DATA2 of 3290
+ */
+#define EFUSE_DATA2_3290                0x002c
+
+/*
+ * EFUSE_DATA1 of 3290
+ */
+#define EFUSE_DATA1_3290                0x0030
+
+/*
+ * EFUSE_DATA0 of 3290
+ */
+#define EFUSE_DATA0_3290                0x0034
+
+/*
+ * OSC_CTRL_CFG
+ * Ring oscillator configuration
+ */
+#define OSC_CTRL                0x0038
+#define OSC_REF_CYCLE           FIELD32(0x00001fff)
+#define OSC_RSV                 FIELD32(0x0000e000)
+#define OSC_CAL_CNT             FIELD32(0x0fff0000)
+#define OSC_CAL_ACK             FIELD32(0x10000000)
+#define OSC_CLK_32K_VLD         FIELD32(0x20000000)
+#define OSC_CAL_REQ             FIELD32(0x40000000)
+#define OSC_ROSC_EN             FIELD32(0x80000000)
+
+/*
+ * COEX_CFG_0
+ */
+#define COEX_CFG0                       0x0040
+#define COEX_CFG_ANT            FIELD32(0xff000000)
+/*
+ * COEX_CFG_1
+ */
+#define COEX_CFG1                       0x0044
+
+/*
+ * COEX_CFG_2
+ */
+#define COEX_CFG2                       0x0048
+#define BT_COEX_CFG1            FIELD32(0xff000000)
+#define BT_COEX_CFG0            FIELD32(0x00ff0000)
+#define WL_COEX_CFG1            FIELD32(0x0000ff00)
+#define WL_COEX_CFG0            FIELD32(0x000000ff)
+/*
+ * PLL_CTRL_CFG
+ * PLL configuration register
+ */
+#define PLL_CTRL                0x0050
+#define PLL_RESERVED_INPUT1     FIELD32(0x000000ff)
+#define PLL_RESERVED_INPUT2     FIELD32(0x0000ff00)
+#define PLL_CONTROL             FIELD32(0x00070000)
+#define PLL_LPF_R1              FIELD32(0x00080000)
+#define PLL_LPF_C1_CTRL FIELD32(0x00300000)
+#define PLL_LPF_C2_CTRL FIELD32(0x00c00000)
+#define PLL_CP_CURRENT_CTRL     FIELD32(0x03000000)
+#define PLL_PFD_DELAY_CTRL      FIELD32(0x0c000000)
+#define PLL_LOCK_CTRL           FIELD32(0x70000000)
+#define PLL_VBGBK_EN            FIELD32(0x80000000)
+
+
+/*
+ * WLAN_CTRL_CFG
+ * RT3290 wlan configuration
+ */
+#define WLAN_FUN_CTRL                   0x0080
+#define WLAN_EN                         FIELD32(0x00000001)
+#define WLAN_CLK_EN                     FIELD32(0x00000002)
+#define WLAN_RSV1                       FIELD32(0x00000004)
+#define WLAN_RESET                      FIELD32(0x00000008)
+#define PCIE_APP0_CLK_REQ               FIELD32(0x00000010)
+#define FRC_WL_ANT_SET                  FIELD32(0x00000020)
+#define INV_TR_SW0                      FIELD32(0x00000040)
+#define WLAN_GPIO_IN_BIT0               FIELD32(0x00000100)
+#define WLAN_GPIO_IN_BIT1               FIELD32(0x00000200)
+#define WLAN_GPIO_IN_BIT2               FIELD32(0x00000400)
+#define WLAN_GPIO_IN_BIT3               FIELD32(0x00000800)
+#define WLAN_GPIO_IN_BIT4               FIELD32(0x00001000)
+#define WLAN_GPIO_IN_BIT5               FIELD32(0x00002000)
+#define WLAN_GPIO_IN_BIT6               FIELD32(0x00004000)
+#define WLAN_GPIO_IN_BIT7               FIELD32(0x00008000)
+#define WLAN_GPIO_IN_BIT_ALL            FIELD32(0x0000ff00)
+#define WLAN_GPIO_OUT_BIT0              FIELD32(0x00010000)
+#define WLAN_GPIO_OUT_BIT1              FIELD32(0x00020000)
+#define WLAN_GPIO_OUT_BIT2              FIELD32(0x00040000)
+#define WLAN_GPIO_OUT_BIT3              FIELD32(0x00050000)
+#define WLAN_GPIO_OUT_BIT4              FIELD32(0x00100000)
+#define WLAN_GPIO_OUT_BIT5              FIELD32(0x00200000)
+#define WLAN_GPIO_OUT_BIT6              FIELD32(0x00400000)
+#define WLAN_GPIO_OUT_BIT7              FIELD32(0x00800000)
+#define WLAN_GPIO_OUT_BIT_ALL           FIELD32(0x00ff0000)
+#define WLAN_GPIO_OUT_OE_BIT0           FIELD32(0x01000000)
+#define WLAN_GPIO_OUT_OE_BIT1           FIELD32(0x02000000)
+#define WLAN_GPIO_OUT_OE_BIT2           FIELD32(0x04000000)
+#define WLAN_GPIO_OUT_OE_BIT3           FIELD32(0x08000000)
+#define WLAN_GPIO_OUT_OE_BIT4           FIELD32(0x10000000)
+#define WLAN_GPIO_OUT_OE_BIT5           FIELD32(0x20000000)
+#define WLAN_GPIO_OUT_OE_BIT6           FIELD32(0x40000000)
+#define WLAN_GPIO_OUT_OE_BIT7           FIELD32(0x80000000)
+#define WLAN_GPIO_OUT_OE_BIT_ALL        FIELD32(0xff000000)
+
+/*
  * AUX_CTRL: Aux/PCI-E related configuration
  */
 #define AUX_CTRL                        0x10c
@@ -1763,9 +1914,11 @@ struct mac_iveiv_entry {
 /*
  * BBP 3: RX Antenna
  */
-#define BBP3_RX_ADC                             FIELD8(0x03)
+#define BBP3_RX_ADC                     FIELD8(0x03)
 #define BBP3_RX_ANTENNA                 FIELD8(0x18)
 #define BBP3_HT40_MINUS                 FIELD8(0x20)
+#define BBP3_ADC_MODE_SWITCH            FIELD8(0x40)
+#define BBP3_ADC_INIT_MODE              FIELD8(0x80)
 
 /*
  * BBP 4: Bandwidth
@@ -1775,6 +1928,14 @@ struct mac_iveiv_entry {
 #define BBP4_MAC_IF_CTRL                FIELD8(0x40)
 
 /*
+ * BBP 47: Bandwidth
+ */
+#define BBP47_TSSI_REPORT_SEL           FIELD8(0x03)
+#define BBP47_TSSI_UPDATE_REQ           FIELD8(0x04)
+#define BBP47_TSSI_TSSI_MODE            FIELD8(0x18)
+#define BBP47_TSSI_ADC6                 FIELD8(0x80)
+
+/*
  * BBP 109
  */
 #define BBP109_TX0_POWER                FIELD8(0x0f)
@@ -1917,6 +2078,16 @@ struct mac_iveiv_entry {
 #define RFCSR27_R4                      FIELD8(0x40)
 
 /*
+ * RFCSR 29:
+ */
+#define RFCSR29_ADC6_TEST               FIELD8(0x01)
+#define RFCSR29_ADC6_INT_TEST           FIELD8(0x02)
+#define RFCSR29_RSSI_RESET              FIELD8(0x04)
+#define RFCSR29_RSSI_ON                 FIELD8(0x08)
+#define RFCSR29_RSSI_RIP_CTRL           FIELD8(0x30)
+#define RFCSR29_RSSI_GAIN               FIELD8(0xc0)
+
+/*
  * RFCSR 30:
  */
 #define RFCSR30_TX_H20M                 FIELD8(0x02)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 4d3747c3010b..068276ee8aff 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -354,16 +354,15 @@ int rt2800_check_firmware(struct rt2x00_dev *rt2x00dev,
          * of 4kb. Certain USB chipsets however require different firmware,
          * which Ralink only provides attached to the original firmware
          * file. Thus for USB devices, firmware files have a length
-         * which is a multiple of 4kb.
+         * which is a multiple of 4kb. The firmware for rt3290 chip also
+         * have a length which is a multiple of 4kb.
          */
-        if (rt2x00_is_usb(rt2x00dev)) {
+        if (rt2x00_is_usb(rt2x00dev) || rt2x00_rt(rt2x00dev, RT3290))
                 fw_len = 4096;
-                multiple = true;
-        } else {
+        else
                 fw_len = 8192;
-                multiple = true;
-        }
 
+        multiple = true;
         /*
          * Validate the firmware length
          */
@@ -415,7 +414,8 @@ int rt2800_load_firmware(struct rt2x00_dev *rt2x00dev,
                 return -EBUSY;
 
         if (rt2x00_is_pci(rt2x00dev)) {
-                if (rt2x00_rt(rt2x00dev, RT3572) ||
+                if (rt2x00_rt(rt2x00dev, RT3290) ||
+                    rt2x00_rt(rt2x00dev, RT3572) ||
                     rt2x00_rt(rt2x00dev, RT5390) ||
                     rt2x00_rt(rt2x00dev, RT5392)) {
                         rt2800_register_read(rt2x00dev, AUX_CTRL, &reg);
@@ -851,8 +851,13 @@ int rt2800_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        rt2800_register_read(rt2x00dev, GPIO_CTRL_CFG, &reg);
-        return rt2x00_get_field32(reg, GPIO_CTRL_CFG_BIT2);
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, &reg);
+                return rt2x00_get_field32(reg, WLAN_GPIO_IN_BIT0);
+        } else {
+                rt2800_register_read(rt2x00dev, GPIO_CTRL_CFG, &reg);
+                return rt2x00_get_field32(reg, GPIO_CTRL_CFG_BIT2);
+        }
 }
 EXPORT_SYMBOL_GPL(rt2800_rfkill_poll);
 
@@ -1935,9 +1940,54 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev,
         rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
 }
 
+#define RT3290_POWER_BOUND     0x27
+#define RT3290_FREQ_OFFSET_BOUND       0x5f
 #define RT5390_POWER_BOUND     0x27
 #define RT5390_FREQ_OFFSET_BOUND       0x5f
 
+static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev,
+                                         struct ieee80211_conf *conf,
+                                         struct rf_channel *rf,
+                                         struct channel_info *info)
+{
+        u8 rfcsr;
+
+        rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
+        rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
+        rt2800_rfcsr_read(rt2x00dev, 11, &rfcsr);
+        rt2x00_set_field8(&rfcsr, RFCSR11_R, rf->rf2);
+        rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);
+
+        rt2800_rfcsr_read(rt2x00dev, 49, &rfcsr);
+        if (info->default_power1 > RT3290_POWER_BOUND)
+                rt2x00_set_field8(&rfcsr, RFCSR49_TX, RT3290_POWER_BOUND);
+        else
+                rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
+        rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
+
+        rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
+        if (rt2x00dev->freq_offset > RT3290_FREQ_OFFSET_BOUND)
+                rt2x00_set_field8(&rfcsr, RFCSR17_CODE,
+                                  RT3290_FREQ_OFFSET_BOUND);
+        else
+                rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);
+        rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
+
+        if (rf->channel <= 14) {
+                if (rf->channel == 6)
+                        rt2800_bbp_write(rt2x00dev, 68, 0x0c);
+                else
+                        rt2800_bbp_write(rt2x00dev, 68, 0x0b);
+
+                if (rf->channel >= 1 && rf->channel <= 6)
+                        rt2800_bbp_write(rt2x00dev, 59, 0x0f);
+                else if (rf->channel >= 7 && rf->channel <= 11)
+                        rt2800_bbp_write(rt2x00dev, 59, 0x0e);
+                else if (rf->channel >= 12 && rf->channel <= 14)
+                        rt2800_bbp_write(rt2x00dev, 59, 0x0d);
+        }
+}
+
 static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
                                          struct ieee80211_conf *conf,
                                          struct rf_channel *rf,
@@ -2036,15 +2086,6 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
                         }
                 }
         }
-
-        rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-        rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, 0);
-        rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, 0);
-        rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-
-        rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
-        rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
-        rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
 }
 
 static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
@@ -2054,7 +2095,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
 {
         u32 reg;
         unsigned int tx_pin;
-        u8 bbp;
+        u8 bbp, rfcsr;
 
         if (rf->channel <= 14) {
                 info->default_power1 = TXPOWER_G_TO_DEV(info->default_power1);
@@ -2075,6 +2116,9 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
         case RF3052:
                 rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);
                 break;
+        case RF3290:
+                rt2800_config_channel_rf3290(rt2x00dev, conf, rf, info);
+                break;
         case RF5360:
         case RF5370:
         case RF5372:
@@ -2086,6 +2130,22 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
                 rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
         }
 
+        if (rt2x00_rf(rt2x00dev, RF3290) ||
+            rt2x00_rf(rt2x00dev, RF5360) ||
+            rt2x00_rf(rt2x00dev, RF5370) ||
+            rt2x00_rf(rt2x00dev, RF5372) ||
+            rt2x00_rf(rt2x00dev, RF5390) ||
+            rt2x00_rf(rt2x00dev, RF5392)) {
+                rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, 0);
+                rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, 0);
+                rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
+
+                rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
+                rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
+        }
+
         /*
          * Change BBP settings
          */
@@ -2566,6 +2626,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)
                 rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1);
                 rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
                 break;
+        case RF3290:
         case RF5360:
         case RF5370:
         case RF5372:
@@ -2701,6 +2762,7 @@ static u8 rt2800_get_default_vgc(struct rt2x00_dev *rt2x00dev)
                 if (rt2x00_rt(rt2x00dev, RT3070) ||
                     rt2x00_rt(rt2x00dev, RT3071) ||
                     rt2x00_rt(rt2x00dev, RT3090) ||
+                    rt2x00_rt(rt2x00dev, RT3290) ||
                     rt2x00_rt(rt2x00dev, RT3390) ||
                     rt2x00_rt(rt2x00dev, RT5390) ||
                     rt2x00_rt(rt2x00dev, RT5392))
@@ -2797,10 +2859,54 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, BKOFF_SLOT_CFG_CC_DELAY_TIME, 2);
         rt2800_register_write(rt2x00dev, BKOFF_SLOT_CFG, reg);
 
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, &reg);
+                if (rt2x00_get_field32(reg, WLAN_EN) == 1) {
+                        rt2x00_set_field32(&reg, PCIE_APP0_CLK_REQ, 1);
+                        rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+                }
+
+                rt2800_register_read(rt2x00dev, CMB_CTRL, &reg);
+                if (!(rt2x00_get_field32(reg, LDO0_EN) == 1)) {
+                        rt2x00_set_field32(&reg, LDO0_EN, 1);
+                        rt2x00_set_field32(&reg, LDO_BGSEL, 3);
+                        rt2800_register_write(rt2x00dev, CMB_CTRL, reg);
+                }
+
+                rt2800_register_read(rt2x00dev, OSC_CTRL, &reg);
+                rt2x00_set_field32(&reg, OSC_ROSC_EN, 1);
+                rt2x00_set_field32(&reg, OSC_CAL_REQ, 1);
+                rt2x00_set_field32(&reg, OSC_REF_CYCLE, 0x27);
+                rt2800_register_write(rt2x00dev, OSC_CTRL, reg);
+
+                rt2800_register_read(rt2x00dev, COEX_CFG0, &reg);
+                rt2x00_set_field32(&reg, COEX_CFG_ANT, 0x5e);
+                rt2800_register_write(rt2x00dev, COEX_CFG0, reg);
+
+                rt2800_register_read(rt2x00dev, COEX_CFG2, &reg);
+                rt2x00_set_field32(&reg, BT_COEX_CFG1, 0x00);
+                rt2x00_set_field32(&reg, BT_COEX_CFG0, 0x17);
+                rt2x00_set_field32(&reg, WL_COEX_CFG1, 0x93);
+                rt2x00_set_field32(&reg, WL_COEX_CFG0, 0x7f);
+                rt2800_register_write(rt2x00dev, COEX_CFG2, reg);
+
+                rt2800_register_read(rt2x00dev, PLL_CTRL, &reg);
+                rt2x00_set_field32(&reg, PLL_CONTROL, 1);
+                rt2800_register_write(rt2x00dev, PLL_CTRL, reg);
+        }
+
         if (rt2x00_rt(rt2x00dev, RT3071) ||
             rt2x00_rt(rt2x00dev, RT3090) ||
+            rt2x00_rt(rt2x00dev, RT3290) ||
             rt2x00_rt(rt2x00dev, RT3390)) {
-                rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);
+
+                if (rt2x00_rt(rt2x00dev, RT3290))
+                        rt2800_register_write(rt2x00dev, TX_SW_CFG0,
+                                              0x00000404);
+                else
+                        rt2800_register_write(rt2x00dev, TX_SW_CFG0,
+                                              0x00000400);
+
                 rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);
                 if (rt2x00_rt_rev_lt(rt2x00dev, RT3071, REV_RT3071E) ||
                     rt2x00_rt_rev_lt(rt2x00dev, RT3090, REV_RT3090E) ||
@@ -3209,14 +3315,16 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                      rt2800_wait_bbp_ready(rt2x00dev)))
                 return -EACCES;
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392)) {
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392)) {
                 rt2800_bbp_read(rt2x00dev, 4, &value);
                 rt2x00_set_field8(&value, BBP4_MAC_IF_CTRL, 1);
                 rt2800_bbp_write(rt2x00dev, 4, value);
         }
 
         if (rt2800_is_305x_soc(rt2x00dev) ||
+            rt2x00_rt(rt2x00dev, RT3290) ||
             rt2x00_rt(rt2x00dev, RT3572) ||
             rt2x00_rt(rt2x00dev, RT5390) ||
             rt2x00_rt(rt2x00dev, RT5392))
@@ -3225,20 +3333,26 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
         rt2800_bbp_write(rt2x00dev, 65, 0x2c);
         rt2800_bbp_write(rt2x00dev, 66, 0x38);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 68, 0x0b);
 
         if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860C)) {
                 rt2800_bbp_write(rt2x00dev, 69, 0x16);
                 rt2800_bbp_write(rt2x00dev, 73, 0x12);
-        } else if (rt2x00_rt(rt2x00dev, RT5390) ||
-                           rt2x00_rt(rt2x00dev, RT5392)) {
+        } else if (rt2x00_rt(rt2x00dev, RT3290) ||
+                   rt2x00_rt(rt2x00dev, RT5390) ||
+                   rt2x00_rt(rt2x00dev, RT5392)) {
                 rt2800_bbp_write(rt2x00dev, 69, 0x12);
                 rt2800_bbp_write(rt2x00dev, 73, 0x13);
                 rt2800_bbp_write(rt2x00dev, 75, 0x46);
                 rt2800_bbp_write(rt2x00dev, 76, 0x28);
-                rt2800_bbp_write(rt2x00dev, 77, 0x59);
+
+                if (rt2x00_rt(rt2x00dev, RT3290))
+                        rt2800_bbp_write(rt2x00dev, 77, 0x58);
+                else
+                        rt2800_bbp_write(rt2x00dev, 77, 0x59);
         } else {
                 rt2800_bbp_write(rt2x00dev, 69, 0x12);
                 rt2800_bbp_write(rt2x00dev, 73, 0x10);
@@ -3263,23 +3377,33 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                 rt2800_bbp_write(rt2x00dev, 81, 0x37);
         }
 
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_bbp_write(rt2x00dev, 74, 0x0b);
+                rt2800_bbp_write(rt2x00dev, 79, 0x18);
+                rt2800_bbp_write(rt2x00dev, 80, 0x09);
+                rt2800_bbp_write(rt2x00dev, 81, 0x33);
+        }
+
         rt2800_bbp_write(rt2x00dev, 82, 0x62);
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 83, 0x7a);
         else
                 rt2800_bbp_write(rt2x00dev, 83, 0x6a);
 
         if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))
                 rt2800_bbp_write(rt2x00dev, 84, 0x19);
-        else if (rt2x00_rt(rt2x00dev, RT5390) ||
-                         rt2x00_rt(rt2x00dev, RT5392))
+        else if (rt2x00_rt(rt2x00dev, RT3290) ||
+                     rt2x00_rt(rt2x00dev, RT5390) ||
+                     rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 84, 0x9a);
         else
                 rt2800_bbp_write(rt2x00dev, 84, 0x99);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 86, 0x38);
         else
                 rt2800_bbp_write(rt2x00dev, 86, 0x00);
@@ -3289,8 +3413,9 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
 
         rt2800_bbp_write(rt2x00dev, 91, 0x04);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 92, 0x02);
         else
                 rt2800_bbp_write(rt2x00dev, 92, 0x00);
@@ -3304,6 +3429,7 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
             rt2x00_rt_rev_gte(rt2x00dev, RT3071, REV_RT3071E) ||
             rt2x00_rt_rev_gte(rt2x00dev, RT3090, REV_RT3090E) ||
             rt2x00_rt_rev_gte(rt2x00dev, RT3390, REV_RT3390E) ||
+            rt2x00_rt(rt2x00dev, RT3290) ||
             rt2x00_rt(rt2x00dev, RT3572) ||
             rt2x00_rt(rt2x00dev, RT5390) ||
             rt2x00_rt(rt2x00dev, RT5392) ||
@@ -3312,27 +3438,32 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
         else
                 rt2800_bbp_write(rt2x00dev, 103, 0x00);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 104, 0x92);
 
         if (rt2800_is_305x_soc(rt2x00dev))
                 rt2800_bbp_write(rt2x00dev, 105, 0x01);
+        else if (rt2x00_rt(rt2x00dev, RT3290))
+                rt2800_bbp_write(rt2x00dev, 105, 0x1c);
         else if (rt2x00_rt(rt2x00dev, RT5390) ||
                          rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 105, 0x3c);
         else
                 rt2800_bbp_write(rt2x00dev, 105, 0x05);
 
-        if (rt2x00_rt(rt2x00dev, RT5390))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390))
                 rt2800_bbp_write(rt2x00dev, 106, 0x03);
         else if (rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 106, 0x12);
         else
                 rt2800_bbp_write(rt2x00dev, 106, 0x35);
 
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392))
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392))
                 rt2800_bbp_write(rt2x00dev, 128, 0x12);
 
         if (rt2x00_rt(rt2x00dev, RT5392)) {
@@ -3357,6 +3488,29 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                 rt2800_bbp_write(rt2x00dev, 138, value);
         }
 
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_bbp_write(rt2x00dev, 67, 0x24);
+                rt2800_bbp_write(rt2x00dev, 143, 0x04);
+                rt2800_bbp_write(rt2x00dev, 142, 0x99);
+                rt2800_bbp_write(rt2x00dev, 150, 0x30);
+                rt2800_bbp_write(rt2x00dev, 151, 0x2e);
+                rt2800_bbp_write(rt2x00dev, 152, 0x20);
+                rt2800_bbp_write(rt2x00dev, 153, 0x34);
+                rt2800_bbp_write(rt2x00dev, 154, 0x40);
+                rt2800_bbp_write(rt2x00dev, 155, 0x3b);
+                rt2800_bbp_write(rt2x00dev, 253, 0x04);
+
+                rt2800_bbp_read(rt2x00dev, 47, &value);
+                rt2x00_set_field8(&value, BBP47_TSSI_ADC6, 1);
+                rt2800_bbp_write(rt2x00dev, 47, value);
+
+                /* Use 5-bit ADC for Acquisition and 8-bit ADC for data */
+                rt2800_bbp_read(rt2x00dev, 3, &value);
+                rt2x00_set_field8(&value, BBP3_ADC_MODE_SWITCH, 1);
+                rt2x00_set_field8(&value, BBP3_ADC_INIT_MODE, 1);
+                rt2800_bbp_write(rt2x00dev, 3, value);
+        }
+
         if (rt2x00_rt(rt2x00dev, RT5390) ||
                 rt2x00_rt(rt2x00dev, RT5392)) {
                 int ant, div_mode;
@@ -3489,6 +3643,7 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
         if (!rt2x00_rt(rt2x00dev, RT3070) &&
             !rt2x00_rt(rt2x00dev, RT3071) &&
             !rt2x00_rt(rt2x00dev, RT3090) &&
+            !rt2x00_rt(rt2x00dev, RT3290) &&
             !rt2x00_rt(rt2x00dev, RT3390) &&
             !rt2x00_rt(rt2x00dev, RT3572) &&
             !rt2x00_rt(rt2x00dev, RT5390) &&
@@ -3499,8 +3654,9 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
         /*
          * Init RF calibration.
          */
-        if (rt2x00_rt(rt2x00dev, RT5390) ||
-                rt2x00_rt(rt2x00dev, RT5392)) {
+        if (rt2x00_rt(rt2x00dev, RT3290) ||
+            rt2x00_rt(rt2x00dev, RT5390) ||
+            rt2x00_rt(rt2x00dev, RT5392)) {
                 rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
                 rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);
                 rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
@@ -3538,6 +3694,53 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
                 rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
                 rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
                 rt2800_rfcsr_write(rt2x00dev, 29, 0x1f);
+        } else if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
+                rt2800_rfcsr_write(rt2x00dev, 2, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
+                rt2800_rfcsr_write(rt2x00dev, 4, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 6, 0xa0);
+                rt2800_rfcsr_write(rt2x00dev, 8, 0xf3);
+                rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
+                rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
+                rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
+                rt2800_rfcsr_write(rt2x00dev, 12, 0x46);
+                rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
+                rt2800_rfcsr_write(rt2x00dev, 18, 0x02);
+                rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
+                rt2800_rfcsr_write(rt2x00dev, 25, 0x83);
+                rt2800_rfcsr_write(rt2x00dev, 26, 0x82);
+                rt2800_rfcsr_write(rt2x00dev, 27, 0x09);
+                rt2800_rfcsr_write(rt2x00dev, 29, 0x10);
+                rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
+                rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 34, 0x05);
+                rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
+                rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
+                rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
+                rt2800_rfcsr_write(rt2x00dev, 40, 0x0b);
+                rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
+                rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);
+                rt2800_rfcsr_write(rt2x00dev, 43, 0x7b);
+                rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);
+                rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);
+                rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
+                rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
+                rt2800_rfcsr_write(rt2x00dev, 49, 0x98);
+                rt2800_rfcsr_write(rt2x00dev, 52, 0x38);
+                rt2800_rfcsr_write(rt2x00dev, 53, 0x00);
+                rt2800_rfcsr_write(rt2x00dev, 54, 0x78);
+                rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
+                rt2800_rfcsr_write(rt2x00dev, 56, 0x02);
+                rt2800_rfcsr_write(rt2x00dev, 57, 0x80);
+                rt2800_rfcsr_write(rt2x00dev, 58, 0x7f);
+                rt2800_rfcsr_write(rt2x00dev, 59, 0x09);
+                rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
+                rt2800_rfcsr_write(rt2x00dev, 61, 0xc1);
         } else if (rt2x00_rt(rt2x00dev, RT3390)) {
                 rt2800_rfcsr_write(rt2x00dev, 0, 0xa0);
                 rt2800_rfcsr_write(rt2x00dev, 1, 0xe1);
@@ -3946,6 +4149,12 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
                 rt2800_rfcsr_write(rt2x00dev, 27, rfcsr);
         }
 
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                rt2800_rfcsr_read(rt2x00dev, 29, &rfcsr);
+                rt2x00_set_field8(&rfcsr, RFCSR29_RSSI_GAIN, 3);
+                rt2800_rfcsr_write(rt2x00dev, 29, rfcsr);
+        }
+
         if (rt2x00_rt(rt2x00dev, RT5390) ||
                 rt2x00_rt(rt2x00dev, RT5392)) {
                 rt2800_rfcsr_read(rt2x00dev, 38, &rfcsr);
@@ -4052,9 +4261,14 @@ EXPORT_SYMBOL_GPL(rt2800_disable_radio);
 int rt2800_efuse_detect(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
+        u16 efuse_ctrl_reg;
 
-        rt2800_register_read(rt2x00dev, EFUSE_CTRL, &reg);
+        if (rt2x00_rt(rt2x00dev, RT3290))
+                efuse_ctrl_reg = EFUSE_CTRL_3290;
+        else
+                efuse_ctrl_reg = EFUSE_CTRL;
 
+        rt2800_register_read(rt2x00dev, efuse_ctrl_reg, &reg);
         return rt2x00_get_field32(reg, EFUSE_CTRL_PRESENT);
 }
 EXPORT_SYMBOL_GPL(rt2800_efuse_detect);
@@ -4062,27 +4276,44 @@ EXPORT_SYMBOL_GPL(rt2800_efuse_detect);
 static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i)
 {
         u32 reg;
-
+        u16 efuse_ctrl_reg;
+        u16 efuse_data0_reg;
+        u16 efuse_data1_reg;
+        u16 efuse_data2_reg;
+        u16 efuse_data3_reg;
+
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                efuse_ctrl_reg = EFUSE_CTRL_3290;
+                efuse_data0_reg = EFUSE_DATA0_3290;
+                efuse_data1_reg = EFUSE_DATA1_3290;
+                efuse_data2_reg = EFUSE_DATA2_3290;
+                efuse_data3_reg = EFUSE_DATA3_3290;
+        } else {
+                efuse_ctrl_reg = EFUSE_CTRL;
+                efuse_data0_reg = EFUSE_DATA0;
+                efuse_data1_reg = EFUSE_DATA1;
+                efuse_data2_reg = EFUSE_DATA2;
+                efuse_data3_reg = EFUSE_DATA3;
+        }
         mutex_lock(&rt2x00dev->csr_mutex);
 
-        rt2800_register_read_lock(rt2x00dev, EFUSE_CTRL, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_ctrl_reg, &reg);
         rt2x00_set_field32(&reg, EFUSE_CTRL_ADDRESS_IN, i);
         rt2x00_set_field32(&reg, EFUSE_CTRL_MODE, 0);
         rt2x00_set_field32(&reg, EFUSE_CTRL_KICK, 1);
-        rt2800_register_write_lock(rt2x00dev, EFUSE_CTRL, reg);
+        rt2800_register_write_lock(rt2x00dev, efuse_ctrl_reg, reg);
 
         /* Wait until the EEPROM has been loaded */
-        rt2800_regbusy_read(rt2x00dev, EFUSE_CTRL, EFUSE_CTRL_KICK, &reg);
-
+        rt2800_regbusy_read(rt2x00dev, efuse_ctrl_reg, EFUSE_CTRL_KICK, &reg);
         /* Apparently the data is read from end to start */
-        rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_data3_reg, &reg);
         /* The returned value is in CPU order, but eeprom is le */
         *(u32 *)&rt2x00dev->eeprom[i] = cpu_to_le32(reg);
-        rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_data2_reg, &reg);
         *(u32 *)&rt2x00dev->eeprom[i + 2] = cpu_to_le32(reg);
-        rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_data1_reg, &reg);
         *(u32 *)&rt2x00dev->eeprom[i + 4] = cpu_to_le32(reg);
-        rt2800_register_read_lock(rt2x00dev, EFUSE_DATA0, &reg);
+        rt2800_register_read_lock(rt2x00dev, efuse_data0_reg, &reg);
         *(u32 *)&rt2x00dev->eeprom[i + 6] = cpu_to_le32(reg);
 
         mutex_unlock(&rt2x00dev->csr_mutex);
@@ -4244,9 +4475,14 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
          * RT28xx/RT30xx: defined in "EEPROM_NIC_CONF0_RF_TYPE" field
          * RT53xx: defined in "EEPROM_CHIP_ID" field
          */
-        rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
-        if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||
-                rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)
+        if (rt2x00_rt(rt2x00dev, RT3290))
+                rt2800_register_read(rt2x00dev, MAC_CSR0_3290, &reg);
+        else
+                rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);
+
+        if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT3290 ||
+            rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||
+            rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)
                 rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &value);
         else
                 value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
@@ -4261,6 +4497,7 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
         case RT3070:
         case RT3071:
         case RT3090:
+        case RT3290:
         case RT3390:
         case RT3572:
         case RT5390:
@@ -4281,6 +4518,7 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
         case RF3021:
         case RF3022:
         case RF3052:
+        case RF3290:
         case RF3320:
         case RF5360:
         case RF5370:
@@ -4597,6 +4835,7 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                    rt2x00_rf(rt2x00dev, RF2020) ||
                    rt2x00_rf(rt2x00dev, RF3021) ||
                    rt2x00_rf(rt2x00dev, RF3022) ||
+                   rt2x00_rf(rt2x00dev, RF3290) ||
                    rt2x00_rf(rt2x00dev, RF3320) ||
                    rt2x00_rf(rt2x00dev, RF5360) ||
                    rt2x00_rf(rt2x00dev, RF5370) ||
@@ -4685,6 +4924,7 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         case RF3022:
         case RF3320:
         case RF3052:
+        case RF3290:
         case RF5360:
         case RF5370:
         case RF5372:
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 206158b67426..dd436125fe3d 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -280,7 +280,13 @@ static void rt2800pci_stop_queue(struct data_queue *queue)
  */
 static char *rt2800pci_get_firmware_name(struct rt2x00_dev *rt2x00dev)
 {
-        return FIRMWARE_RT2860;
+        /*
+         * Chip rt3290 use specific 4KB firmware named rt3290.bin.
+         */
+        if (rt2x00_rt(rt2x00dev, RT3290))
+                return FIRMWARE_RT3290;
+        else
+                return FIRMWARE_RT2860;
 }
 
 static int rt2800pci_write_firmware(struct rt2x00_dev *rt2x00dev,
@@ -974,6 +980,66 @@ static int rt2800pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
         return rt2800_validate_eeprom(rt2x00dev);
 }
 
+static int rt2800_enable_wlan_rt3290(struct rt2x00_dev *rt2x00dev)
+{
+        u32 reg;
+        int i, count;
+
+        rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, &reg);
+        if ((rt2x00_get_field32(reg, WLAN_EN) == 1))
+                return 0;
+
+        rt2x00_set_field32(&reg, WLAN_GPIO_OUT_OE_BIT_ALL, 0xff);
+        rt2x00_set_field32(&reg, FRC_WL_ANT_SET, 1);
+        rt2x00_set_field32(&reg, WLAN_CLK_EN, 0);
+        rt2x00_set_field32(&reg, WLAN_EN, 1);
+        rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+
+        udelay(REGISTER_BUSY_DELAY);
+
+        count = 0;
+        do {
+                /*
+                 * Check PLL_LD & XTAL_RDY.
+                 */
+                for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
+                        rt2800_register_read(rt2x00dev, CMB_CTRL, &reg);
+                        if ((rt2x00_get_field32(reg, PLL_LD) == 1) &&
+                                (rt2x00_get_field32(reg, XTAL_RDY) == 1))
+                                        break;
+                        udelay(REGISTER_BUSY_DELAY);
+                }
+
+                if (i >= REGISTER_BUSY_COUNT) {
+
+                        if (count >= 10)
+                                return -EIO;
+
+                        rt2800_register_write(rt2x00dev, 0x58, 0x018);
+                        udelay(REGISTER_BUSY_DELAY);
+                        rt2800_register_write(rt2x00dev, 0x58, 0x418);
+                        udelay(REGISTER_BUSY_DELAY);
+                        rt2800_register_write(rt2x00dev, 0x58, 0x618);
+                        udelay(REGISTER_BUSY_DELAY);
+                        count++;
+                } else {
+                        count = 0;
+                }
+
+                rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, &reg);
+                rt2x00_set_field32(&reg, PCIE_APP0_CLK_REQ, 0);
+                rt2x00_set_field32(&reg, WLAN_CLK_EN, 1);
+                rt2x00_set_field32(&reg, WLAN_RESET, 1);
+                rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+                udelay(10);
+                rt2x00_set_field32(&reg, WLAN_RESET, 0);
+                rt2800_register_write(rt2x00dev, WLAN_FUN_CTRL, reg);
+                udelay(10);
+                rt2800_register_write(rt2x00dev, INT_SOURCE_CSR, 0x7fffffff);
+        } while (count != 0);
+
+        return 0;
+}
 static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
 {
         int retval;
@@ -997,6 +1063,17 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev)
                 return retval;
 
         /*
+         * In probe phase call rt2800_enable_wlan_rt3290 to enable wlan
+         * clk for rt3290. That avoid the MCU fail in start phase.
+         */
+        if (rt2x00_rt(rt2x00dev, RT3290)) {
+                retval = rt2800_enable_wlan_rt3290(rt2x00dev);
+
+                if (retval)
+                        return retval;
+        }
+
+        /*
          * This device has multiple filters for control frames
          * and has a separate filter for PS Poll frames.
          */
@@ -1175,6 +1252,9 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
         { PCI_DEVICE(0x1432, 0x7768) },
         { PCI_DEVICE(0x1462, 0x891a) },
         { PCI_DEVICE(0x1a3b, 0x1059) },
+#ifdef CONFIG_RT2800PCI_RT3290
+        { PCI_DEVICE(0x1814, 0x3290) },
+#endif
 #ifdef CONFIG_RT2800PCI_RT33XX
         { PCI_DEVICE(0x1814, 0x3390) },
 #endif
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h
index 70e050d904c8..ab22a087c50d 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.h
+++ b/drivers/net/wireless/rt2x00/rt2800pci.h
@@ -47,6 +47,7 @@
  * 8051 firmware image.
  */
 #define FIRMWARE_RT2860                 "rt2860.bin"
+#define FIRMWARE_RT3290                 "rt3290.bin"
 #define FIRMWARE_IMAGE_BASE             0x2000
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 20a504072895..6cf336595e25 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -971,6 +971,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x0411, 0x015d) },
         { USB_DEVICE(0x0411, 0x016f) },
         { USB_DEVICE(0x0411, 0x01a2) },
+        { USB_DEVICE(0x0411, 0x01ee) },
         /* Corega */
         { USB_DEVICE(0x07aa, 0x002f) },
         { USB_DEVICE(0x07aa, 0x003c) },
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 8f754025b06e..8afb546c2b2d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -187,6 +187,7 @@ struct rt2x00_chip {
 #define RT3070          0x3070
 #define RT3071          0x3071
 #define RT3090          0x3090  /* 2.4GHz PCIe */
+#define RT3290          0x3290
 #define RT3390          0x3390
 #define RT3572          0x3572
 #define RT3593          0x3593
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index 0a4653a92cab..a0c8caef3b0a 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -256,6 +256,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
         struct ieee80211_hw *hw;
         struct rt2x00_dev *rt2x00dev;
         int retval;
+        u16 chip;
 
         retval = pci_enable_device(pci_dev);
         if (retval) {
@@ -305,6 +306,14 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
         if (retval)
                 goto exit_free_device;
 
+        /*
+         * Because rt3290 chip use different efuse offset to read efuse data.
+         * So before read efuse it need to indicate it is the
+         * rt3290 or not.
+         */
+        pci_read_config_word(pci_dev, PCI_DEVICE_ID, &chip);
+        rt2x00dev->chip.rt = chip;
+
         retval = rt2x00lib_probe_dev(rt2x00dev);
         if (retval)
                 goto exit_free_reg;
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 2bebcb71a1e9..3b505395d869 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -47,6 +47,8 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8180_table) = {
         { PCI_DEVICE(0x1799, 0x6001) },
         { PCI_DEVICE(0x1799, 0x6020) },
         { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x3300) },
+        { PCI_DEVICE(0x1186, 0x3301) },
+        { PCI_DEVICE(0x1432, 0x7106) },
         { }
 };
 
diff --git a/drivers/net/wireless/rtlwifi/cam.c b/drivers/net/wireless/rtlwifi/cam.c
index 2d1a8220d5c0..5b4b4d4eaf9e 100644
--- a/drivers/net/wireless/rtlwifi/cam.c
+++ b/drivers/net/wireless/rtlwifi/cam.c
@@ -128,7 +128,7 @@ u8 rtl_cam_add_one_entry(struct ieee80211_hw *hw, u8 *mac_addr,
         u32 us_config;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
+        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
                  "EntryNo:%x, ulKeyId=%x, ulEncAlg=%x, ulUseDK=%x MacAddr %pM\n",
                  ul_entry_idx, ul_key_id, ul_enc_alg,
                  ul_default_key, mac_addr);
@@ -342,7 +342,8 @@ void rtl_cam_del_entry(struct ieee80211_hw *hw, u8 *sta_addr)
                         /* Remove from HW Security CAM */
                         memset(rtlpriv->sec.hwsec_cam_sta_addr[i], 0, ETH_ALEN);
                         rtlpriv->sec.hwsec_cam_bitmap &= ~(BIT(0) << i);
-                        pr_info("&&&&&&&&&del entry %d\n", i);
+                        RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD,
+                                 "del CAM entry %d\n", i);
                 }
         }
         return;
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 82d3afcfecd1..31138fdad1f7 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1273,17 +1273,18 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
          *after reset, release previous pending packet,
          *and force the  tx idx to the first one
          */
-        spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
         for (i = 0; i < RTL_PCI_MAX_TX_QUEUE_COUNT; i++) {
                 if (rtlpci->tx_ring[i].desc) {
                         struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[i];
 
                         while (skb_queue_len(&ring->queue)) {
-                                struct rtl_tx_desc *entry =
-                                    &ring->desc[ring->idx];
-                                struct sk_buff *skb =
-                                    __skb_dequeue(&ring->queue);
+                                struct rtl_tx_desc *entry;
+                                struct sk_buff *skb;
 
+                                spin_lock_irqsave(&rtlpriv->locks.irq_th_lock,
+                                                  flags);
+                                entry = &ring->desc[ring->idx];
+                                skb = __skb_dequeue(&ring->queue);
                                 pci_unmap_single(rtlpci->pdev,
                                                  rtlpriv->cfg->ops->
                                                          get_desc((u8 *)
@@ -1291,15 +1292,15 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw)
                                                          true,
                                                          HW_DESC_TXBUFF_ADDR),
                                                  skb->len, PCI_DMA_TODEVICE);
-                                kfree_skb(skb);
                                 ring->idx = (ring->idx + 1) % ring->entries;
+                                spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock,
+                                                  flags);
+                                kfree_skb(skb);
                         }
                         ring->idx = 0;
                 }
         }
 
-        spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
-
         return 0;
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
index 8d7099bc472c..b917a2a3caf7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/phy.c
@@ -1247,6 +1247,9 @@ static void _rtl92s_phy_get_txpower_index(struct ieee80211_hw *hw, u8 channel,
                 /* Read HT 40 OFDM TX power */
                 ofdmpowerLevel[0] = rtlefuse->txpwrlevel_ht40_2s[0][index];
                 ofdmpowerLevel[1] = rtlefuse->txpwrlevel_ht40_2s[1][index];
+        } else {
+                ofdmpowerLevel[0] = 0;
+                ofdmpowerLevel[1] = 0;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 730bcc919529..ad4b4803482d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -29,7 +29,6 @@
 
 #include "../wifi.h"
 #include "../core.h"
-#include "../pci.h"
 #include "../base.h"
 #include "../pci.h"
 #include "reg.h"
diff --git a/drivers/net/wireless/ti/wl1251/cmd.c b/drivers/net/wireless/ti/wl1251/cmd.c
index d14d69d733a0..6822b845efc1 100644
--- a/drivers/net/wireless/ti/wl1251/cmd.c
+++ b/drivers/net/wireless/ti/wl1251/cmd.c
@@ -277,15 +277,6 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,
         join->rx_config_options = wl->rx_config;
         join->rx_filter_options = wl->rx_filter;
 
-        /*
-         * FIXME: disable temporarily all filters because after commit
-         * 9cef8737 "mac80211: fix managed mode BSSID handling" broke
-         * association. The filter logic needs to be implemented properly
-         * and once that is done, this hack can be removed.
-         */
-        join->rx_config_options = 0;
-        join->rx_filter_options = WL1251_DEFAULT_RX_FILTER;
-
         join->basic_rate_set = RATE_MASK_1MBPS | RATE_MASK_2MBPS |
                 RATE_MASK_5_5MBPS | RATE_MASK_11MBPS;
 
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index d1afb8e3b2ef..3118c425bcf1 100644
--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -334,6 +334,12 @@ static int wl1251_join(struct wl1251 *wl, u8 bss_type, u8 channel,
         if (ret < 0)
                 goto out;
 
+        /*
+         * Join command applies filters, and if we are not associated,
+         * BSSID filter must be disabled for association to work.
+         */
+        if (is_zero_ether_addr(wl->bssid))
+                wl->rx_config &= ~CFG_BSSID_FILTER_EN;
 
         ret = wl1251_cmd_join(wl, bss_type, channel, beacon_interval,
                               dtim_period);
@@ -348,33 +354,6 @@ out:
         return ret;
 }
 
-static void wl1251_filter_work(struct work_struct *work)
-{
-        struct wl1251 *wl =
-                container_of(work, struct wl1251, filter_work);
-        int ret;
-
-        mutex_lock(&wl->mutex);
-
-        if (wl->state == WL1251_STATE_OFF)
-                goto out;
-
-        ret = wl1251_ps_elp_wakeup(wl);
-        if (ret < 0)
-                goto out;
-
-        ret = wl1251_join(wl, wl->bss_type, wl->channel, wl->beacon_int,
-                          wl->dtim_period);
-        if (ret < 0)
-                goto out_sleep;
-
-out_sleep:
-        wl1251_ps_elp_sleep(wl);
-
-out:
-        mutex_unlock(&wl->mutex);
-}
-
 static void wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct wl1251 *wl = hw->priv;
@@ -478,7 +457,6 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
 
         cancel_work_sync(&wl->irq_work);
         cancel_work_sync(&wl->tx_work);
-        cancel_work_sync(&wl->filter_work);
         cancel_delayed_work_sync(&wl->elp_work);
 
         mutex_lock(&wl->mutex);
@@ -681,13 +659,15 @@ out:
                                   FIF_FCSFAIL | \
                                   FIF_BCN_PRBRESP_PROMISC | \
                                   FIF_CONTROL | \
-                                  FIF_OTHER_BSS)
+                                  FIF_OTHER_BSS | \
+                                  FIF_PROBE_REQ)
 
 static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
                                        unsigned int changed,
                                        unsigned int *total,u64 multicast)
 {
         struct wl1251 *wl = hw->priv;
+        int ret;
 
         wl1251_debug(DEBUG_MAC80211, "mac80211 configure filter");
 
@@ -698,7 +678,7 @@ static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
                 /* no filters which we support changed */
                 return;
 
-        /* FIXME: wl->rx_config and wl->rx_filter are not protected */
+        mutex_lock(&wl->mutex);
 
         wl->rx_config = WL1251_DEFAULT_RX_CONFIG;
         wl->rx_filter = WL1251_DEFAULT_RX_FILTER;
@@ -721,15 +701,25 @@ static void wl1251_op_configure_filter(struct ieee80211_hw *hw,
         }
         if (*total & FIF_CONTROL)
                 wl->rx_filter |= CFG_RX_CTL_EN;
-        if (*total & FIF_OTHER_BSS)
-                wl->rx_filter &= ~CFG_BSSID_FILTER_EN;
+        if (*total & FIF_OTHER_BSS || is_zero_ether_addr(wl->bssid))
+                wl->rx_config &= ~CFG_BSSID_FILTER_EN;
+        if (*total & FIF_PROBE_REQ)
+                wl->rx_filter |= CFG_RX_PREQ_EN;
 
-        /*
-         * FIXME: workqueues need to be properly cancelled on stop(), for
-         * now let's just disable changing the filter settings. They will
-         * be updated any on config().
-         */
-        /* schedule_work(&wl->filter_work); */
+        if (wl->state == WL1251_STATE_OFF)
+                goto out;
+
+        ret = wl1251_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out;
+
+        /* send filters to firmware */
+        wl1251_acx_rx_config(wl, wl->rx_config, wl->rx_filter);
+
+        wl1251_ps_elp_sleep(wl);
+
+out:
+        mutex_unlock(&wl->mutex);
 }
 
 /* HW encryption */
@@ -1390,7 +1380,6 @@ struct ieee80211_hw *wl1251_alloc_hw(void)
 
         skb_queue_head_init(&wl->tx_queue);
 
-        INIT_WORK(&wl->filter_work, wl1251_filter_work);
         INIT_DELAYED_WORK(&wl->elp_work, wl1251_elp_work);
         wl->channel = WL1251_DEFAULT_CHANNEL;
         wl->scanning = false;
diff --git a/drivers/net/wireless/ti/wl1251/wl1251.h b/drivers/net/wireless/ti/wl1251/wl1251.h
index 9d8f5816c6f9..fd02060038de 100644
--- a/drivers/net/wireless/ti/wl1251/wl1251.h
+++ b/drivers/net/wireless/ti/wl1251/wl1251.h
@@ -315,7 +315,6 @@ struct wl1251 {
         bool tx_queue_stopped;
 
         struct work_struct tx_work;
-        struct work_struct filter_work;
 
         /* Pending TX frames */
         struct sk_buff *tx_frames[16];
diff --git a/drivers/net/wireless/ti/wl12xx/cmd.c b/drivers/net/wireless/ti/wl12xx/cmd.c
index 50ba7480b790..30be784a40d8 100644
--- a/drivers/net/wireless/ti/wl12xx/cmd.c
+++ b/drivers/net/wireless/ti/wl12xx/cmd.c
@@ -174,7 +174,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
         struct wl1271_nvs_file *nvs = (struct wl1271_nvs_file *)wl->nvs;
         struct wl1271_radio_parms_cmd *radio_parms;
         struct wl1271_ini_general_params *gp = &nvs->general_params;
-        int ret;
+        int ret, fem_idx;
 
         if (!wl->nvs)
                 return -ENODEV;
@@ -185,11 +185,13 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
 
         radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;
 
+        fem_idx = WL12XX_FEM_TO_NVS_ENTRY(gp->tx_bip_fem_manufacturer);
+
         /* 2.4GHz parameters */
         memcpy(&radio_parms->static_params_2, &nvs->stat_radio_params_2,
                sizeof(struct wl1271_ini_band_params_2));
         memcpy(&radio_parms->dyn_params_2,
-               &nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
+               &nvs->dyn_radio_params_2[fem_idx].params,
                sizeof(struct wl1271_ini_fem_params_2));
 
         /* 5GHz parameters */
@@ -197,7 +199,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
                &nvs->stat_radio_params_5,
                sizeof(struct wl1271_ini_band_params_5));
         memcpy(&radio_parms->dyn_params_5,
-               &nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
+               &nvs->dyn_radio_params_5[fem_idx].params,
                sizeof(struct wl1271_ini_fem_params_5));
 
         wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ",
@@ -216,7 +218,7 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl)
         struct wl128x_nvs_file *nvs = (struct wl128x_nvs_file *)wl->nvs;
         struct wl128x_radio_parms_cmd *radio_parms;
         struct wl128x_ini_general_params *gp = &nvs->general_params;
-        int ret;
+        int ret, fem_idx;
 
         if (!wl->nvs)
                 return -ENODEV;
@@ -227,11 +229,13 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl)
 
         radio_parms->test.id = TEST_CMD_INI_FILE_RADIO_PARAM;
 
+        fem_idx = WL12XX_FEM_TO_NVS_ENTRY(gp->tx_bip_fem_manufacturer);
+
         /* 2.4GHz parameters */
         memcpy(&radio_parms->static_params_2, &nvs->stat_radio_params_2,
                sizeof(struct wl128x_ini_band_params_2));
         memcpy(&radio_parms->dyn_params_2,
-               &nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
+               &nvs->dyn_radio_params_2[fem_idx].params,
                sizeof(struct wl128x_ini_fem_params_2));
 
         /* 5GHz parameters */
@@ -239,7 +243,7 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl)
                &nvs->stat_radio_params_5,
                sizeof(struct wl128x_ini_band_params_5));
         memcpy(&radio_parms->dyn_params_5,
-               &nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
+               &nvs->dyn_radio_params_5[fem_idx].params,
                sizeof(struct wl128x_ini_fem_params_5));
 
         radio_parms->fem_vendor_and_options = nvs->fem_vendor_and_options;
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
index 85d1600ee340..47ba2e0017f4 100644
--- a/drivers/net/wireless/ti/wl12xx/main.c
+++ b/drivers/net/wireless/ti/wl12xx/main.c
@@ -246,6 +246,7 @@ static struct wlcore_conf wl12xx_conf = {
                 .forced_ps                   = false,
                 .keep_alive_interval         = 55000,
                 .max_listen_interval         = 20,
+                .sta_sleep_auth              = WL1271_PSM_ILLEGAL,
         },
         .itrim = {
                 .enable = false,
@@ -597,8 +598,10 @@ static const int wl12xx_rtable[REG_TABLE_LEN] = {
 #define WL128X_FW_NAME_SINGLE   "ti-connectivity/wl128x-fw-4-sr.bin"
 #define WL128X_PLT_FW_NAME      "ti-connectivity/wl128x-fw-4-plt.bin"
 
-static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
+static int wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
 {
+        int ret;
+
         if (wl->chip.id != CHIP_ID_1283_PG20) {
                 struct wl1271_acx_mem_map *wl_mem_map = wl->target_mem_map;
                 struct wl127x_rx_mem_pool_addr rx_mem_addr;
@@ -615,9 +618,13 @@ static void wl127x_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
 
                 rx_mem_addr.addr_extra = rx_mem_addr.addr + 4;
 
-                wl1271_write(wl, WL1271_SLV_REG_DATA,
-                             &rx_mem_addr, sizeof(rx_mem_addr), false);
+                ret = wlcore_write(wl, WL1271_SLV_REG_DATA, &rx_mem_addr,
+                                   sizeof(rx_mem_addr), false);
+                if (ret < 0)
+                        return ret;
         }
+
+        return 0;
 }
 
 static int wl12xx_identify_chip(struct wl1271 *wl)
@@ -681,64 +688,95 @@ out:
         return ret;
 }
 
-static void wl12xx_top_reg_write(struct wl1271 *wl, int addr, u16 val)
+static int __must_check wl12xx_top_reg_write(struct wl1271 *wl, int addr,
+                                             u16 val)
 {
+        int ret;
+
         /* write address >> 1 + 0x30000 to OCP_POR_CTR */
         addr = (addr >> 1) + 0x30000;
-        wl1271_write32(wl, WL12XX_OCP_POR_CTR, addr);
+        ret = wlcore_write32(wl, WL12XX_OCP_POR_CTR, addr);
+        if (ret < 0)
+                goto out;
 
         /* write value to OCP_POR_WDATA */
-        wl1271_write32(wl, WL12XX_OCP_DATA_WRITE, val);
+        ret = wlcore_write32(wl, WL12XX_OCP_DATA_WRITE, val);
+        if (ret < 0)
+                goto out;
 
         /* write 1 to OCP_CMD */
-        wl1271_write32(wl, WL12XX_OCP_CMD, OCP_CMD_WRITE);
+        ret = wlcore_write32(wl, WL12XX_OCP_CMD, OCP_CMD_WRITE);
+        if (ret < 0)
+                goto out;
+
+out:
+        return ret;
 }
 
-static u16 wl12xx_top_reg_read(struct wl1271 *wl, int addr)
+static int __must_check wl12xx_top_reg_read(struct wl1271 *wl, int addr,
+                                            u16 *out)
 {
         u32 val;
         int timeout = OCP_CMD_LOOP;
+        int ret;
 
         /* write address >> 1 + 0x30000 to OCP_POR_CTR */
         addr = (addr >> 1) + 0x30000;
-        wl1271_write32(wl, WL12XX_OCP_POR_CTR, addr);
+        ret = wlcore_write32(wl, WL12XX_OCP_POR_CTR, addr);
+        if (ret < 0)
+                return ret;
 
         /* write 2 to OCP_CMD */
-        wl1271_write32(wl, WL12XX_OCP_CMD, OCP_CMD_READ);
+        ret = wlcore_write32(wl, WL12XX_OCP_CMD, OCP_CMD_READ);
+        if (ret < 0)
+                return ret;
 
         /* poll for data ready */
         do {
-                val = wl1271_read32(wl, WL12XX_OCP_DATA_READ);
+                ret = wlcore_read32(wl, WL12XX_OCP_DATA_READ, &val);
+                if (ret < 0)
+                        return ret;
         } while (!(val & OCP_READY_MASK) && --timeout);
 
         if (!timeout) {
                 wl1271_warning("Top register access timed out.");
-                return 0xffff;
+                return -ETIMEDOUT;
         }
 
         /* check data status and return if OK */
-        if ((val & OCP_STATUS_MASK) == OCP_STATUS_OK)
-                return val & 0xffff;
-        else {
+        if ((val & OCP_STATUS_MASK) != OCP_STATUS_OK) {
                 wl1271_warning("Top register access returned error.");
-                return 0xffff;
+                return -EIO;
         }
+
+        if (out)
+                *out = val & 0xffff;
+
+        return 0;
 }
 
 static int wl128x_switch_tcxo_to_fref(struct wl1271 *wl)
 {
         u16 spare_reg;
+        int ret;
 
         /* Mask bits [2] & [8:4] in the sys_clk_cfg register */
-        spare_reg = wl12xx_top_reg_read(wl, WL_SPARE_REG);
+        ret = wl12xx_top_reg_read(wl, WL_SPARE_REG, &spare_reg);
+        if (ret < 0)
+                return ret;
+
         if (spare_reg == 0xFFFF)
                 return -EFAULT;
         spare_reg |= (BIT(3) | BIT(5) | BIT(6));
-        wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+        ret = wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+        if (ret < 0)
+                return ret;
 
         /* Enable FREF_CLK_REQ & mux MCS and coex PLLs to FREF */
-        wl12xx_top_reg_write(wl, SYS_CLK_CFG_REG,
-                             WL_CLK_REQ_TYPE_PG2 | MCS_PLL_CLK_SEL_FREF);
+        ret = wl12xx_top_reg_write(wl, SYS_CLK_CFG_REG,
+                                   WL_CLK_REQ_TYPE_PG2 | MCS_PLL_CLK_SEL_FREF);
+        if (ret < 0)
+                return ret;
 
         /* Delay execution for 15msec, to let the HW settle */
         mdelay(15);
@@ -749,8 +787,12 @@ static int wl128x_switch_tcxo_to_fref(struct wl1271 *wl)
 static bool wl128x_is_tcxo_valid(struct wl1271 *wl)
 {
         u16 tcxo_detection;
+        int ret;
+
+        ret = wl12xx_top_reg_read(wl, TCXO_CLK_DETECT_REG, &tcxo_detection);
+        if (ret < 0)
+                return false;
 
-        tcxo_detection = wl12xx_top_reg_read(wl, TCXO_CLK_DETECT_REG);
         if (tcxo_detection & TCXO_DET_FAILED)
                 return false;
 
@@ -760,8 +802,12 @@ static bool wl128x_is_tcxo_valid(struct wl1271 *wl)
 static bool wl128x_is_fref_valid(struct wl1271 *wl)
 {
         u16 fref_detection;
+        int ret;
+
+        ret = wl12xx_top_reg_read(wl, FREF_CLK_DETECT_REG, &fref_detection);
+        if (ret < 0)
+                return false;
 
-        fref_detection = wl12xx_top_reg_read(wl, FREF_CLK_DETECT_REG);
         if (fref_detection & FREF_CLK_DETECT_FAIL)
                 return false;
 
@@ -770,11 +816,21 @@ static bool wl128x_is_fref_valid(struct wl1271 *wl)
 
 static int wl128x_manually_configure_mcs_pll(struct wl1271 *wl)
 {
-        wl12xx_top_reg_write(wl, MCS_PLL_M_REG, MCS_PLL_M_REG_VAL);
-        wl12xx_top_reg_write(wl, MCS_PLL_N_REG, MCS_PLL_N_REG_VAL);
-        wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG, MCS_PLL_CONFIG_REG_VAL);
+        int ret;
 
-        return 0;
+        ret = wl12xx_top_reg_write(wl, MCS_PLL_M_REG, MCS_PLL_M_REG_VAL);
+        if (ret < 0)
+                goto out;
+
+        ret = wl12xx_top_reg_write(wl, MCS_PLL_N_REG, MCS_PLL_N_REG_VAL);
+        if (ret < 0)
+                goto out;
+
+        ret = wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG,
+                                   MCS_PLL_CONFIG_REG_VAL);
+
+out:
+        return ret;
 }
 
 static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
@@ -783,13 +839,19 @@ static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
         u16 pll_config;
         u8 input_freq;
         struct wl12xx_priv *priv = wl->priv;
+        int ret;
 
         /* Mask bits [3:1] in the sys_clk_cfg register */
-        spare_reg = wl12xx_top_reg_read(wl, WL_SPARE_REG);
+        ret = wl12xx_top_reg_read(wl, WL_SPARE_REG, &spare_reg);
+        if (ret < 0)
+                return ret;
+
         if (spare_reg == 0xFFFF)
                 return -EFAULT;
         spare_reg |= BIT(2);
-        wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+        ret = wl12xx_top_reg_write(wl, WL_SPARE_REG, spare_reg);
+        if (ret < 0)
+                return ret;
 
         /* Handle special cases of the TCXO clock */
         if (priv->tcxo_clock == WL12XX_TCXOCLOCK_16_8 ||
@@ -799,14 +861,17 @@ static int wl128x_configure_mcs_pll(struct wl1271 *wl, int clk)
         /* Set the input frequency according to the selected clock source */
         input_freq = (clk & 1) + 1;
 
-        pll_config = wl12xx_top_reg_read(wl, MCS_PLL_CONFIG_REG);
+        ret = wl12xx_top_reg_read(wl, MCS_PLL_CONFIG_REG, &pll_config);
+        if (ret < 0)
+                return ret;
+
         if (pll_config == 0xFFFF)
                 return -EFAULT;
         pll_config |= (input_freq << MCS_SEL_IN_FREQ_SHIFT);
         pll_config |= MCS_PLL_ENABLE_HP;
-        wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG, pll_config);
+        ret = wl12xx_top_reg_write(wl, MCS_PLL_CONFIG_REG, pll_config);
 
-        return 0;
+        return ret;
 }
 
 /*
@@ -820,6 +885,7 @@ static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
 {
         struct wl12xx_priv *priv = wl->priv;
         u16 sys_clk_cfg;
+        int ret;
 
         /* For XTAL-only modes, FREF will be used after switching from TCXO */
         if (priv->ref_clock == WL12XX_REFCLOCK_26_XTAL ||
@@ -830,7 +896,10 @@ static int wl128x_boot_clk(struct wl1271 *wl, int *selected_clock)
         }
 
         /* Query the HW, to determine which clock source we should use */
-        sys_clk_cfg = wl12xx_top_reg_read(wl, SYS_CLK_CFG_REG);
+        ret = wl12xx_top_reg_read(wl, SYS_CLK_CFG_REG, &sys_clk_cfg);
+        if (ret < 0)
+                return ret;
+
         if (sys_clk_cfg == 0xFFFF)
                 return -EINVAL;
         if (sys_clk_cfg & PRCM_CM_EN_MUX_WLAN_FREF)
@@ -865,6 +934,7 @@ static int wl127x_boot_clk(struct wl1271 *wl)
         struct wl12xx_priv *priv = wl->priv;
         u32 pause;
         u32 clk;
+        int ret;
 
         if (WL127X_PG_GET_MAJOR(wl->hw_pg_ver) < 3)
                 wl->quirks |= WLCORE_QUIRK_END_OF_TRANSACTION;
@@ -885,48 +955,74 @@ static int wl127x_boot_clk(struct wl1271 *wl)
         if (priv->ref_clock != CONF_REF_CLK_19_2_E) {
                 u16 val;
                 /* Set clock type (open drain) */
-                val = wl12xx_top_reg_read(wl, OCP_REG_CLK_TYPE);
+                ret = wl12xx_top_reg_read(wl, OCP_REG_CLK_TYPE, &val);
+                if (ret < 0)
+                        goto out;
+
                 val &= FREF_CLK_TYPE_BITS;
-                wl12xx_top_reg_write(wl, OCP_REG_CLK_TYPE, val);
+                ret = wl12xx_top_reg_write(wl, OCP_REG_CLK_TYPE, val);
+                if (ret < 0)
+                        goto out;
 
                 /* Set clock pull mode (no pull) */
-                val = wl12xx_top_reg_read(wl, OCP_REG_CLK_PULL);
+                ret = wl12xx_top_reg_read(wl, OCP_REG_CLK_PULL, &val);
+                if (ret < 0)
+                        goto out;
+
                 val |= NO_PULL;
-                wl12xx_top_reg_write(wl, OCP_REG_CLK_PULL, val);
+                ret = wl12xx_top_reg_write(wl, OCP_REG_CLK_PULL, val);
+                if (ret < 0)
+                        goto out;
         } else {
                 u16 val;
                 /* Set clock polarity */
-                val = wl12xx_top_reg_read(wl, OCP_REG_CLK_POLARITY);
+                ret = wl12xx_top_reg_read(wl, OCP_REG_CLK_POLARITY, &val);
+                if (ret < 0)
+                        goto out;
+
                 val &= FREF_CLK_POLARITY_BITS;
                 val |= CLK_REQ_OUTN_SEL;
-                wl12xx_top_reg_write(wl, OCP_REG_CLK_POLARITY, val);
+                ret = wl12xx_top_reg_write(wl, OCP_REG_CLK_POLARITY, val);
+                if (ret < 0)
+                        goto out;
         }
 
-        wl1271_write32(wl, WL12XX_PLL_PARAMETERS, clk);
+        ret = wlcore_write32(wl, WL12XX_PLL_PARAMETERS, clk);
+        if (ret < 0)
+                goto out;
 
-        pause = wl1271_read32(wl, WL12XX_PLL_PARAMETERS);
+        ret = wlcore_read32(wl, WL12XX_PLL_PARAMETERS, &pause);
+        if (ret < 0)
+                goto out;
 
         wl1271_debug(DEBUG_BOOT, "pause1 0x%x", pause);
 
         pause &= ~(WU_COUNTER_PAUSE_VAL);
         pause |= WU_COUNTER_PAUSE_VAL;
-        wl1271_write32(wl, WL12XX_WU_COUNTER_PAUSE, pause);
+        ret = wlcore_write32(wl, WL12XX_WU_COUNTER_PAUSE, pause);
 
-        return 0;
+out:
+        return ret;
 }
 
 static int wl1271_boot_soft_reset(struct wl1271 *wl)
 {
         unsigned long timeout;
         u32 boot_data;
+        int ret = 0;
 
         /* perform soft reset */
-        wl1271_write32(wl, WL12XX_SLV_SOFT_RESET, ACX_SLV_SOFT_RESET_BIT);
+        ret = wlcore_write32(wl, WL12XX_SLV_SOFT_RESET, ACX_SLV_SOFT_RESET_BIT);
+        if (ret < 0)
+                goto out;
 
         /* SOFT_RESET is self clearing */
         timeout = jiffies + usecs_to_jiffies(SOFT_RESET_MAX_TIME);
         while (1) {
-                boot_data = wl1271_read32(wl, WL12XX_SLV_SOFT_RESET);
+                ret = wlcore_read32(wl, WL12XX_SLV_SOFT_RESET, &boot_data);
+                if (ret < 0)
+                        goto out;
+
                 wl1271_debug(DEBUG_BOOT, "soft reset bootdata 0x%x", boot_data);
                 if ((boot_data & ACX_SLV_SOFT_RESET_BIT) == 0)
                         break;
@@ -942,12 +1038,15 @@ static int wl1271_boot_soft_reset(struct wl1271 *wl)
         }
 
         /* disable Rx/Tx */
-        wl1271_write32(wl, WL12XX_ENABLE, 0x0);
+        ret = wlcore_write32(wl, WL12XX_ENABLE, 0x0);
+        if (ret < 0)
+                goto out;
 
         /* disable auto calibration on start*/
-        wl1271_write32(wl, WL12XX_SPARE_A2, 0xffff);
+        ret = wlcore_write32(wl, WL12XX_SPARE_A2, 0xffff);
 
-        return 0;
+out:
+        return ret;
 }
 
 static int wl12xx_pre_boot(struct wl1271 *wl)
@@ -968,16 +1067,23 @@ static int wl12xx_pre_boot(struct wl1271 *wl)
         }
 
         /* Continue the ELP wake up sequence */
-        wl1271_write32(wl, WL12XX_WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
+        ret = wlcore_write32(wl, WL12XX_WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
+        if (ret < 0)
+                goto out;
+
         udelay(500);
 
-        wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+        if (ret < 0)
+                goto out;
 
         /* Read-modify-write DRPW_SCRATCH_START register (see next state)
            to be used by DRPw FW. The RTRIM value will be added by the FW
            before taking DRPw out of reset */
 
-        clk = wl1271_read32(wl, WL12XX_DRPW_SCRATCH_START);
+        ret = wlcore_read32(wl, WL12XX_DRPW_SCRATCH_START, &clk);
+        if (ret < 0)
+                goto out;
 
         wl1271_debug(DEBUG_BOOT, "clk2 0x%x", clk);
 
@@ -986,12 +1092,18 @@ static int wl12xx_pre_boot(struct wl1271 *wl)
         else
                 clk |= (priv->ref_clock << 1) << 4;
 
-        wl1271_write32(wl, WL12XX_DRPW_SCRATCH_START, clk);
+        ret = wlcore_write32(wl, WL12XX_DRPW_SCRATCH_START, clk);
+        if (ret < 0)
+                goto out;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        if (ret < 0)
+                goto out;
 
         /* Disable interrupts */
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
+        if (ret < 0)
+                goto out;
 
         ret = wl1271_boot_soft_reset(wl);
         if (ret < 0)
@@ -1001,47 +1113,72 @@ out:
         return ret;
 }
 
-static void wl12xx_pre_upload(struct wl1271 *wl)
+static int wl12xx_pre_upload(struct wl1271 *wl)
 {
-        u32 tmp, polarity;
+        u32 tmp;
+        u16 polarity;
+        int ret;
 
         /* write firmware's last address (ie. it's length) to
          * ACX_EEPROMLESS_IND_REG */
         wl1271_debug(DEBUG_BOOT, "ACX_EEPROMLESS_IND_REG");
 
-        wl1271_write32(wl, WL12XX_EEPROMLESS_IND, WL12XX_EEPROMLESS_IND);
+        ret = wlcore_write32(wl, WL12XX_EEPROMLESS_IND, WL12XX_EEPROMLESS_IND);
+        if (ret < 0)
+                goto out;
 
-        tmp = wlcore_read_reg(wl, REG_CHIP_ID_B);
+        ret = wlcore_read_reg(wl, REG_CHIP_ID_B, &tmp);
+        if (ret < 0)
+                goto out;
 
         wl1271_debug(DEBUG_BOOT, "chip id 0x%x", tmp);
 
         /* 6. read the EEPROM parameters */
-        tmp = wl1271_read32(wl, WL12XX_SCR_PAD2);
+        ret = wlcore_read32(wl, WL12XX_SCR_PAD2, &tmp);
+        if (ret < 0)
+                goto out;
 
         /* WL1271: The reference driver skips steps 7 to 10 (jumps directly
          * to upload_fw) */
 
-        if (wl->chip.id == CHIP_ID_1283_PG20)
-                wl12xx_top_reg_write(wl, SDIO_IO_DS, HCI_IO_DS_6MA);
+        if (wl->chip.id == CHIP_ID_1283_PG20) {
+                ret = wl12xx_top_reg_write(wl, SDIO_IO_DS, HCI_IO_DS_6MA);
+                if (ret < 0)
+                        goto out;
+        }
 
         /* polarity must be set before the firmware is loaded */
-        polarity = wl12xx_top_reg_read(wl, OCP_REG_POLARITY);
+        ret = wl12xx_top_reg_read(wl, OCP_REG_POLARITY, &polarity);
+        if (ret < 0)
+                goto out;
 
         /* We use HIGH polarity, so unset the LOW bit */
         polarity &= ~POLARITY_LOW;
-        wl12xx_top_reg_write(wl, OCP_REG_POLARITY, polarity);
+        ret = wl12xx_top_reg_write(wl, OCP_REG_POLARITY, polarity);
 
+out:
+        return ret;
 }
 
-static void wl12xx_enable_interrupts(struct wl1271 *wl)
+static int wl12xx_enable_interrupts(struct wl1271 *wl)
 {
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL12XX_ACX_ALL_EVENTS_VECTOR);
+        int ret;
+
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK,
+                               WL12XX_ACX_ALL_EVENTS_VECTOR);
+        if (ret < 0)
+                goto out;
 
         wlcore_enable_interrupts(wl);
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK,
-                         WL1271_ACX_INTR_ALL & ~(WL12XX_INTR_MASK));
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK,
+                               WL1271_ACX_INTR_ALL & ~(WL12XX_INTR_MASK));
+        if (ret < 0)
+                goto out;
 
-        wl1271_write32(wl, WL12XX_HI_CFG, HI_CFG_DEF_VAL);
+        ret = wlcore_write32(wl, WL12XX_HI_CFG, HI_CFG_DEF_VAL);
+
+out:
+        return ret;
 }
 
 static int wl12xx_boot(struct wl1271 *wl)
@@ -1056,7 +1193,9 @@ static int wl12xx_boot(struct wl1271 *wl)
         if (ret < 0)
                 goto out;
 
-        wl12xx_pre_upload(wl);
+        ret = wl12xx_pre_upload(wl);
+        if (ret < 0)
+                goto out;
 
         ret = wlcore_boot_upload_firmware(wl);
         if (ret < 0)
@@ -1066,22 +1205,30 @@ static int wl12xx_boot(struct wl1271 *wl)
         if (ret < 0)
                 goto out;
 
-        wl12xx_enable_interrupts(wl);
+        ret = wl12xx_enable_interrupts(wl);
 
 out:
         return ret;
 }
 
-static void wl12xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
+static int wl12xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
                                void *buf, size_t len)
 {
-        wl1271_write(wl, cmd_box_addr, buf, len, false);
-        wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL12XX_INTR_TRIG_CMD);
+        int ret;
+
+        ret = wlcore_write(wl, cmd_box_addr, buf, len, false);
+        if (ret < 0)
+                return ret;
+
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL12XX_INTR_TRIG_CMD);
+
+        return ret;
 }
 
-static void wl12xx_ack_event(struct wl1271 *wl)
+static int wl12xx_ack_event(struct wl1271 *wl)
 {
-        wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL12XX_INTR_TRIG_EVENT_ACK);
+        return wlcore_write_reg(wl, REG_INTERRUPT_TRIG,
+                                WL12XX_INTR_TRIG_EVENT_ACK);
 }
 
 static u32 wl12xx_calc_tx_blocks(struct wl1271 *wl, u32 len, u32 spare_blks)
@@ -1161,13 +1308,13 @@ static u32 wl12xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data,
         return data_len - sizeof(*desc) - desc->pad_len;
 }
 
-static void wl12xx_tx_delayed_compl(struct wl1271 *wl)
+static int wl12xx_tx_delayed_compl(struct wl1271 *wl)
 {
         if (wl->fw_status_1->tx_results_counter ==
             (wl->tx_results_count & 0xff))
-                return;
+                return 0;
 
-        wl1271_tx_complete(wl);
+        return wlcore_tx_complete(wl);
 }
 
 static int wl12xx_hw_init(struct wl1271 *wl)
@@ -1268,39 +1415,58 @@ static bool wl12xx_mac_in_fuse(struct wl1271 *wl)
         return supported;
 }
 
-static void wl12xx_get_fuse_mac(struct wl1271 *wl)
+static int wl12xx_get_fuse_mac(struct wl1271 *wl)
 {
         u32 mac1, mac2;
+        int ret;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_DRPW]);
+        if (ret < 0)
+                goto out;
 
-        mac1 = wl1271_read32(wl, WL12XX_REG_FUSE_BD_ADDR_1);
-        mac2 = wl1271_read32(wl, WL12XX_REG_FUSE_BD_ADDR_2);
+        ret = wlcore_read32(wl, WL12XX_REG_FUSE_BD_ADDR_1, &mac1);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_read32(wl, WL12XX_REG_FUSE_BD_ADDR_2, &mac2);
+        if (ret < 0)
+                goto out;
 
         /* these are the two parts of the BD_ADDR */
         wl->fuse_oui_addr = ((mac2 & 0xffff) << 8) +
                 ((mac1 & 0xff000000) >> 24);
         wl->fuse_nic_addr = mac1 & 0xffffff;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+
+out:
+        return ret;
 }
 
-static s8 wl12xx_get_pg_ver(struct wl1271 *wl)
+static int wl12xx_get_pg_ver(struct wl1271 *wl, s8 *ver)
 {
-        u32 die_info;
+        u16 die_info;
+        int ret;
 
         if (wl->chip.id == CHIP_ID_1283_PG20)
-                die_info = wl12xx_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1);
+                ret = wl12xx_top_reg_read(wl, WL128X_REG_FUSE_DATA_2_1,
+                                          &die_info);
         else
-                die_info = wl12xx_top_reg_read(wl, WL127X_REG_FUSE_DATA_2_1);
+                ret = wl12xx_top_reg_read(wl, WL127X_REG_FUSE_DATA_2_1,
+                                          &die_info);
 
-        return (s8) (die_info & PG_VER_MASK) >> PG_VER_OFFSET;
+        if (ret >= 0 && ver)
+                *ver = (s8)((die_info & PG_VER_MASK) >> PG_VER_OFFSET);
+
+        return ret;
 }
 
-static void wl12xx_get_mac(struct wl1271 *wl)
+static int wl12xx_get_mac(struct wl1271 *wl)
 {
         if (wl12xx_mac_in_fuse(wl))
-                wl12xx_get_fuse_mac(wl);
+                return wl12xx_get_fuse_mac(wl);
+
+        return 0;
 }
 
 static void wl12xx_set_tx_desc_csum(struct wl1271 *wl,
@@ -1448,10 +1614,8 @@ static int __devinit wl12xx_probe(struct platform_device *pdev)
         wl->hw_min_ht_rate = WL12XX_CONF_HW_RXTX_RATE_MCS0;
         wl->fw_status_priv_len = 0;
         wl->stats.fw_stats_len = sizeof(struct wl12xx_acx_statistics);
-        memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ], &wl12xx_ht_cap,
-               sizeof(wl12xx_ht_cap));
-        memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ], &wl12xx_ht_cap,
-               sizeof(wl12xx_ht_cap));
+        wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ, &wl12xx_ht_cap);
+        wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ, &wl12xx_ht_cap);
         wl12xx_conf_init(wl);
 
         if (!fref_param) {
diff --git a/drivers/net/wireless/ti/wl18xx/acx.h b/drivers/net/wireless/ti/wl18xx/acx.h
index ebbaf611e97b..e2609a6b7341 100644
--- a/drivers/net/wireless/ti/wl18xx/acx.h
+++ b/drivers/net/wireless/ti/wl18xx/acx.h
@@ -32,25 +32,21 @@ enum {
 /* numbers of bits the length field takes (add 1 for the actual number) */
 #define WL18XX_HOST_IF_LEN_SIZE_FIELD 15
 
-#define WL18XX_ACX_EVENTS_VECTOR_PG1    (WL1271_ACX_INTR_WATCHDOG      | \
-                                        WL1271_ACX_INTR_INIT_COMPLETE | \
-                                        WL1271_ACX_INTR_EVENT_A       | \
-                                        WL1271_ACX_INTR_EVENT_B       | \
-                                        WL1271_ACX_INTR_CMD_COMPLETE  | \
-                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
-                                        WL1271_ACX_INTR_DATA)
-
-#define WL18XX_ACX_EVENTS_VECTOR_PG2    (WL18XX_ACX_EVENTS_VECTOR_PG1 | \
-                                        WL1271_ACX_SW_INTR_WATCHDOG)
-
-#define WL18XX_INTR_MASK_PG1            (WL1271_ACX_INTR_WATCHDOG      | \
-                                        WL1271_ACX_INTR_EVENT_A       | \
-                                        WL1271_ACX_INTR_EVENT_B       | \
-                                        WL1271_ACX_INTR_HW_AVAILABLE  | \
-                                        WL1271_ACX_INTR_DATA)
-
-#define WL18XX_INTR_MASK_PG2            (WL18XX_INTR_MASK_PG1         | \
-                                        WL1271_ACX_SW_INTR_WATCHDOG)
+#define WL18XX_ACX_EVENTS_VECTOR        (WL1271_ACX_INTR_WATCHDOG       | \
+                                         WL1271_ACX_INTR_INIT_COMPLETE  | \
+                                         WL1271_ACX_INTR_EVENT_A        | \
+                                         WL1271_ACX_INTR_EVENT_B        | \
+                                         WL1271_ACX_INTR_CMD_COMPLETE   | \
+                                         WL1271_ACX_INTR_HW_AVAILABLE   | \
+                                         WL1271_ACX_INTR_DATA           | \
+                                         WL1271_ACX_SW_INTR_WATCHDOG)
+
+#define WL18XX_INTR_MASK                (WL1271_ACX_INTR_WATCHDOG       | \
+                                         WL1271_ACX_INTR_EVENT_A        | \
+                                         WL1271_ACX_INTR_EVENT_B        | \
+                                         WL1271_ACX_INTR_HW_AVAILABLE   | \
+                                         WL1271_ACX_INTR_DATA           | \
+                                         WL1271_ACX_SW_INTR_WATCHDOG)
 
 struct wl18xx_acx_host_config_bitmap {
         struct acx_header header;
diff --git a/drivers/net/wireless/ti/wl18xx/io.c b/drivers/net/wireless/ti/wl18xx/io.c
index 598c057e722b..0c06ccfd1b8c 100644
--- a/drivers/net/wireless/ti/wl18xx/io.c
+++ b/drivers/net/wireless/ti/wl18xx/io.c
@@ -24,37 +24,52 @@
 
 #include "io.h"
 
-void wl18xx_top_reg_write(struct wl1271 *wl, int addr, u16 val)
+int wl18xx_top_reg_write(struct wl1271 *wl, int addr, u16 val)
 {
         u32 tmp;
+        int ret;
 
         if (WARN_ON(addr % 2))
-                return;
+                return -EINVAL;
 
         if ((addr % 4) == 0) {
-                tmp = wl1271_read32(wl, addr);
+                ret = wlcore_read32(wl, addr, &tmp);
+                if (ret < 0)
+                        goto out;
+
                 tmp = (tmp & 0xffff0000) | val;
-                wl1271_write32(wl, addr, tmp);
+                ret = wlcore_write32(wl, addr, tmp);
         } else {
-                tmp = wl1271_read32(wl, addr - 2);
+                ret = wlcore_read32(wl, addr - 2, &tmp);
+                if (ret < 0)
+                        goto out;
+
                 tmp = (tmp & 0xffff) | (val << 16);
-                wl1271_write32(wl, addr - 2, tmp);
+                ret = wlcore_write32(wl, addr - 2, tmp);
         }
+
+out:
+        return ret;
 }
 
-u16 wl18xx_top_reg_read(struct wl1271 *wl, int addr)
+int wl18xx_top_reg_read(struct wl1271 *wl, int addr, u16 *out)
 {
         u32 val;
+        int ret;
 
         if (WARN_ON(addr % 2))
-                return 0;
+                return -EINVAL;
 
         if ((addr % 4) == 0) {
                 /* address is 4-bytes aligned */
-                val = wl1271_read32(wl, addr);
-                return val & 0xffff;
+                ret = wlcore_read32(wl, addr, &val);
+                if (ret >= 0 && out)
+                        *out = val & 0xffff;
         } else {
-                val = wl1271_read32(wl, addr - 2);
-                return (val & 0xffff0000) >> 16;
+                ret = wlcore_read32(wl, addr - 2, &val);
+                if (ret >= 0 && out)
+                        *out = (val & 0xffff0000) >> 16;
         }
+
+        return ret;
 }
diff --git a/drivers/net/wireless/ti/wl18xx/io.h b/drivers/net/wireless/ti/wl18xx/io.h
index be4e126ff617..c32ae30277df 100644
--- a/drivers/net/wireless/ti/wl18xx/io.h
+++ b/drivers/net/wireless/ti/wl18xx/io.h
@@ -22,7 +22,7 @@
 #ifndef __WL18XX_IO_H__
 #define __WL18XX_IO_H__
 
-void wl18xx_top_reg_write(struct wl1271 *wl, int addr, u16 val);
-u16 wl18xx_top_reg_read(struct wl1271 *wl, int addr);
+int __must_check wl18xx_top_reg_write(struct wl1271 *wl, int addr, u16 val);
+int __must_check wl18xx_top_reg_read(struct wl1271 *wl, int addr, u16 *out);
 
 #endif /* __WL18XX_IO_H__ */
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index ed9c3650e08a..5e583be8f674 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -43,10 +43,11 @@
 
 #define WL18XX_RX_CHECKSUM_MASK      0x40
 
-static char *ht_mode_param = "wide";
+static char *ht_mode_param = "default";
 static char *board_type_param = "hdk";
 static bool checksum_param = false;
 static bool enable_11a_param = true;
+static int num_rx_desc_param = -1;
 
 /* phy paramters */
 static int dc2dc_param = -1;
@@ -372,6 +373,7 @@ static struct wlcore_conf wl18xx_conf = {
                 .forced_ps                   = false,
                 .keep_alive_interval         = 55000,
                 .max_listen_interval         = 20,
+                .sta_sleep_auth              = WL1271_PSM_ILLEGAL,
         },
         .itrim = {
                 .enable = false,
@@ -606,24 +608,15 @@ static int wl18xx_identify_chip(struct wl1271 *wl)
                 wl->plt_fw_name = WL18XX_FW_NAME;
                 wl->quirks |= WLCORE_QUIRK_NO_ELP |
                               WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN |
+                              WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN |
                               WLCORE_QUIRK_TX_PAD_LAST_FRAME;
-
                 break;
         case CHIP_ID_185x_PG10:
-                wl1271_debug(DEBUG_BOOT, "chip id 0x%x (185x PG10)",
-                             wl->chip.id);
-                wl->sr_fw_name = WL18XX_FW_NAME;
-                /* wl18xx uses the same firmware for PLT */
-                wl->plt_fw_name = WL18XX_FW_NAME;
-                wl->quirks |= WLCORE_QUIRK_NO_ELP |
-                        WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED |
-                        WLCORE_QUIRK_RX_BLOCKSIZE_ALIGN |
-                        WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN;
-
-                /* PG 1.0 has some problems with MCS_13, so disable it */
-                wl->ht_cap[IEEE80211_BAND_2GHZ].mcs.rx_mask[1] &= ~BIT(5);
+                wl1271_warning("chip id 0x%x (185x PG10) is deprecated",
+                               wl->chip.id);
+                ret = -ENODEV;
+                goto out;
 
-                break;
         default:
                 wl1271_warning("unsupported chip id: 0x%x", wl->chip.id);
                 ret = -ENODEV;
@@ -634,123 +627,178 @@ out:
         return ret;
 }
 
-static void wl18xx_set_clk(struct wl1271 *wl)
+static int wl18xx_set_clk(struct wl1271 *wl)
 {
-        u32 clk_freq;
+        u16 clk_freq;
+        int ret;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+        if (ret < 0)
+                goto out;
 
         /* TODO: PG2: apparently we need to read the clk type */
 
-        clk_freq = wl18xx_top_reg_read(wl, PRIMARY_CLK_DETECT);
+        ret = wl18xx_top_reg_read(wl, PRIMARY_CLK_DETECT, &clk_freq);
+        if (ret < 0)
+                goto out;
+
         wl1271_debug(DEBUG_BOOT, "clock freq %d (%d, %d, %d, %d, %s)", clk_freq,
                      wl18xx_clk_table[clk_freq].n, wl18xx_clk_table[clk_freq].m,
                      wl18xx_clk_table[clk_freq].p, wl18xx_clk_table[clk_freq].q,
                      wl18xx_clk_table[clk_freq].swallow ? "swallow" : "spit");
 
-        wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_N, wl18xx_clk_table[clk_freq].n);
-        wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_M, wl18xx_clk_table[clk_freq].m);
+        ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_N,
+                                   wl18xx_clk_table[clk_freq].n);
+        if (ret < 0)
+                goto out;
+
+        ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_M,
+                                   wl18xx_clk_table[clk_freq].m);
+        if (ret < 0)
+                goto out;
 
         if (wl18xx_clk_table[clk_freq].swallow) {
                 /* first the 16 lower bits */
-                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_Q_FACTOR_CFG_1,
-                                     wl18xx_clk_table[clk_freq].q &
-                                     PLLSH_WCS_PLL_Q_FACTOR_CFG_1_MASK);
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_Q_FACTOR_CFG_1,
+                                           wl18xx_clk_table[clk_freq].q &
+                                           PLLSH_WCS_PLL_Q_FACTOR_CFG_1_MASK);
+                if (ret < 0)
+                        goto out;
+
                 /* then the 16 higher bits, masked out */
-                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_Q_FACTOR_CFG_2,
-                                     (wl18xx_clk_table[clk_freq].q >> 16) &
-                                     PLLSH_WCS_PLL_Q_FACTOR_CFG_2_MASK);
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_Q_FACTOR_CFG_2,
+                                        (wl18xx_clk_table[clk_freq].q >> 16) &
+                                        PLLSH_WCS_PLL_Q_FACTOR_CFG_2_MASK);
+                if (ret < 0)
+                        goto out;
 
                 /* first the 16 lower bits */
-                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_P_FACTOR_CFG_1,
-                                     wl18xx_clk_table[clk_freq].p &
-                                     PLLSH_WCS_PLL_P_FACTOR_CFG_1_MASK);
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_P_FACTOR_CFG_1,
+                                           wl18xx_clk_table[clk_freq].p &
+                                           PLLSH_WCS_PLL_P_FACTOR_CFG_1_MASK);
+                if (ret < 0)
+                        goto out;
+
                 /* then the 16 higher bits, masked out */
-                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_P_FACTOR_CFG_2,
-                                     (wl18xx_clk_table[clk_freq].p >> 16) &
-                                     PLLSH_WCS_PLL_P_FACTOR_CFG_2_MASK);
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_P_FACTOR_CFG_2,
+                                        (wl18xx_clk_table[clk_freq].p >> 16) &
+                                        PLLSH_WCS_PLL_P_FACTOR_CFG_2_MASK);
         } else {
-                wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_SWALLOW_EN,
-                                     PLLSH_WCS_PLL_SWALLOW_EN_VAL2);
+                ret = wl18xx_top_reg_write(wl, PLLSH_WCS_PLL_SWALLOW_EN,
+                                           PLLSH_WCS_PLL_SWALLOW_EN_VAL2);
         }
+
+out:
+        return ret;
 }
 
-static void wl18xx_boot_soft_reset(struct wl1271 *wl)
+static int wl18xx_boot_soft_reset(struct wl1271 *wl)
 {
+        int ret;
+
         /* disable Rx/Tx */
-        wl1271_write32(wl, WL18XX_ENABLE, 0x0);
+        ret = wlcore_write32(wl, WL18XX_ENABLE, 0x0);
+        if (ret < 0)
+                goto out;
 
         /* disable auto calibration on start*/
-        wl1271_write32(wl, WL18XX_SPARE_A2, 0xffff);
+        ret = wlcore_write32(wl, WL18XX_SPARE_A2, 0xffff);
+
+out:
+        return ret;
 }
 
 static int wl18xx_pre_boot(struct wl1271 *wl)
 {
-        wl18xx_set_clk(wl);
+        int ret;
+
+        ret = wl18xx_set_clk(wl);
+        if (ret < 0)
+                goto out;
 
         /* Continue the ELP wake up sequence */
-        wl1271_write32(wl, WL18XX_WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
+        ret = wlcore_write32(wl, WL18XX_WELP_ARM_COMMAND, WELP_ARM_COMMAND_VAL);
+        if (ret < 0)
+                goto out;
+
         udelay(500);
 
-        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                goto out;
 
         /* Disable interrupts */
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL);
+        if (ret < 0)
+                goto out;
 
-        wl18xx_boot_soft_reset(wl);
+        ret = wl18xx_boot_soft_reset(wl);
 
-        return 0;
+out:
+        return ret;
 }
 
-static void wl18xx_pre_upload(struct wl1271 *wl)
+static int wl18xx_pre_upload(struct wl1271 *wl)
 {
         u32 tmp;
+        int ret;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                goto out;
 
         /* TODO: check if this is all needed */
-        wl1271_write32(wl, WL18XX_EEPROMLESS_IND, WL18XX_EEPROMLESS_IND);
+        ret = wlcore_write32(wl, WL18XX_EEPROMLESS_IND, WL18XX_EEPROMLESS_IND);
+        if (ret < 0)
+                goto out;
 
-        tmp = wlcore_read_reg(wl, REG_CHIP_ID_B);
+        ret = wlcore_read_reg(wl, REG_CHIP_ID_B, &tmp);
+        if (ret < 0)
+                goto out;
 
         wl1271_debug(DEBUG_BOOT, "chip id 0x%x", tmp);
 
-        tmp = wl1271_read32(wl, WL18XX_SCR_PAD2);
+        ret = wlcore_read32(wl, WL18XX_SCR_PAD2, &tmp);
+
+out:
+        return ret;
 }
 
-static void wl18xx_set_mac_and_phy(struct wl1271 *wl)
+static int wl18xx_set_mac_and_phy(struct wl1271 *wl)
 {
         struct wl18xx_priv *priv = wl->priv;
-        size_t len;
+        int ret;
 
-        /* the parameters struct is smaller for PG1 */
-        if (wl->chip.id == CHIP_ID_185x_PG10)
-                len = offsetof(struct wl18xx_mac_and_phy_params, psat) + 1;
-        else
-                len = sizeof(struct wl18xx_mac_and_phy_params);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_write(wl, WL18XX_PHY_INIT_MEM_ADDR, (u8 *)&priv->conf.phy,
+                           sizeof(struct wl18xx_mac_and_phy_params), false);
 
-        wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]);
-        wl1271_write(wl, WL18XX_PHY_INIT_MEM_ADDR, (u8 *)&priv->conf.phy, len,
-                     false);
+out:
+        return ret;
 }
 
-static void wl18xx_enable_interrupts(struct wl1271 *wl)
+static int wl18xx_enable_interrupts(struct wl1271 *wl)
 {
         u32 event_mask, intr_mask;
+        int ret;
 
-        if (wl->chip.id == CHIP_ID_185x_PG10) {
-                event_mask = WL18XX_ACX_EVENTS_VECTOR_PG1;
-                intr_mask = WL18XX_INTR_MASK_PG1;
-        } else {
-                event_mask = WL18XX_ACX_EVENTS_VECTOR_PG2;
-                intr_mask = WL18XX_INTR_MASK_PG2;
-        }
+        event_mask = WL18XX_ACX_EVENTS_VECTOR;
+        intr_mask = WL18XX_INTR_MASK;
 
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK, event_mask);
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK, event_mask);
+        if (ret < 0)
+                goto out;
 
         wlcore_enable_interrupts(wl);
-        wlcore_write_reg(wl, REG_INTERRUPT_MASK,
-                         WL1271_ACX_INTR_ALL & ~intr_mask);
+
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_MASK,
+                               WL1271_ACX_INTR_ALL & ~intr_mask);
+
+out:
+        return ret;
 }
 
 static int wl18xx_boot(struct wl1271 *wl)
@@ -761,25 +809,29 @@ static int wl18xx_boot(struct wl1271 *wl)
         if (ret < 0)
                 goto out;
 
-        wl18xx_pre_upload(wl);
+        ret = wl18xx_pre_upload(wl);
+        if (ret < 0)
+                goto out;
 
         ret = wlcore_boot_upload_firmware(wl);
         if (ret < 0)
                 goto out;
 
-        wl18xx_set_mac_and_phy(wl);
+        ret = wl18xx_set_mac_and_phy(wl);
+        if (ret < 0)
+                goto out;
 
         ret = wlcore_boot_run_firmware(wl);
         if (ret < 0)
                 goto out;
 
-        wl18xx_enable_interrupts(wl);
+        ret = wl18xx_enable_interrupts(wl);
 
 out:
         return ret;
 }
 
-static void wl18xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
+static int wl18xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
                                void *buf, size_t len)
 {
         struct wl18xx_priv *priv = wl->priv;
@@ -787,13 +839,14 @@ static void wl18xx_trigger_cmd(struct wl1271 *wl, int cmd_box_addr,
         memcpy(priv->cmd_buf, buf, len);
         memset(priv->cmd_buf + len, 0, WL18XX_CMD_MAX_SIZE - len);
 
-        wl1271_write(wl, cmd_box_addr, priv->cmd_buf, WL18XX_CMD_MAX_SIZE,
-                     false);
+        return wlcore_write(wl, cmd_box_addr, priv->cmd_buf,
+                            WL18XX_CMD_MAX_SIZE, false);
 }
 
-static void wl18xx_ack_event(struct wl1271 *wl)
+static int wl18xx_ack_event(struct wl1271 *wl)
 {
-        wlcore_write_reg(wl, REG_INTERRUPT_TRIG, WL18XX_INTR_TRIG_EVENT_ACK);
+        return wlcore_write_reg(wl, REG_INTERRUPT_TRIG,
+                                WL18XX_INTR_TRIG_EVENT_ACK);
 }
 
 static u32 wl18xx_calc_tx_blocks(struct wl1271 *wl, u32 len, u32 spare_blks)
@@ -975,34 +1028,32 @@ static u32 wl18xx_ap_get_mimo_wide_rate_mask(struct wl1271 *wl,
         } else if (!strcmp(ht_mode_param, "mimo")) {
                 wl1271_debug(DEBUG_ACX, "using MIMO rate mask");
 
-                /*
-                 * PG 1.0 has some problems with MCS_13, so disable it
-                 *
-                 * TODO: instead of hacking this in here, we should
-                 * make it more general and change a bit in the
-                 * wlvif->rate_set instead.
-                 */
-                if (wl->chip.id == CHIP_ID_185x_PG10)
-                        return CONF_TX_MIMO_RATES & ~CONF_HW_BIT_RATE_MCS_13;
-
                 return CONF_TX_MIMO_RATES;
         } else {
                 return 0;
         }
 }
 
-static s8 wl18xx_get_pg_ver(struct wl1271 *wl)
+static int wl18xx_get_pg_ver(struct wl1271 *wl, s8 *ver)
 {
         u32 fuse;
+        int ret;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_read32(wl, WL18XX_REG_FUSE_DATA_1_3, &fuse);
+        if (ret < 0)
+                goto out;
 
-        fuse = wl1271_read32(wl, WL18XX_REG_FUSE_DATA_1_3);
-        fuse = (fuse & WL18XX_PG_VER_MASK) >> WL18XX_PG_VER_OFFSET;
+        if (ver)
+                *ver = (fuse & WL18XX_PG_VER_MASK) >> WL18XX_PG_VER_OFFSET;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
 
-        return (s8)fuse;
+out:
+        return ret;
 }
 
 #define WL18XX_CONF_FILE_NAME "ti-connectivity/wl18xx-conf.bin"
@@ -1021,8 +1072,7 @@ static int wl18xx_conf_init(struct wl1271 *wl, struct device *dev)
         }
 
         if (fw->size != WL18XX_CONF_SIZE) {
-                wl1271_error("configuration binary file size is wrong, "
-                             "expected %ld got %zd",
+                wl1271_error("configuration binary file size is wrong, expected %zu got %zu",
                              WL18XX_CONF_SIZE, fw->size);
                 ret = -EINVAL;
                 goto out;
@@ -1069,26 +1119,41 @@ out:
 
 static int wl18xx_plt_init(struct wl1271 *wl)
 {
-        wl1271_write32(wl, WL18XX_SCR_PAD8, WL18XX_SCR_PAD8_PLT);
+        int ret;
+
+        ret = wlcore_write32(wl, WL18XX_SCR_PAD8, WL18XX_SCR_PAD8_PLT);
+        if (ret < 0)
+                return ret;
 
         return wl->ops->boot(wl);
 }
 
-static void wl18xx_get_mac(struct wl1271 *wl)
+static int wl18xx_get_mac(struct wl1271 *wl)
 {
         u32 mac1, mac2;
+        int ret;
+
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+        if (ret < 0)
+                goto out;
 
-        wlcore_set_partition(wl, &wl->ptable[PART_TOP_PRCM_ELP_SOC]);
+        ret = wlcore_read32(wl, WL18XX_REG_FUSE_BD_ADDR_1, &mac1);
+        if (ret < 0)
+                goto out;
 
-        mac1 = wl1271_read32(wl, WL18XX_REG_FUSE_BD_ADDR_1);
-        mac2 = wl1271_read32(wl, WL18XX_REG_FUSE_BD_ADDR_2);
+        ret = wlcore_read32(wl, WL18XX_REG_FUSE_BD_ADDR_2, &mac2);
+        if (ret < 0)
+                goto out;
 
         /* these are the two parts of the BD_ADDR */
         wl->fuse_oui_addr = ((mac2 & 0xffff) << 8) +
                 ((mac1 & 0xff000000) >> 24);
         wl->fuse_nic_addr = (mac1 & 0xffffff);
 
-        wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_DOWN]);
+
+out:
+        return ret;
 }
 
 static int wl18xx_handle_static_data(struct wl1271 *wl,
@@ -1214,8 +1279,8 @@ static struct wlcore_ops wl18xx_ops = {
         .pre_pkt_send   = wl18xx_pre_pkt_send,
 };
 
-/* HT cap appropriate for wide channels */
-static struct ieee80211_sta_ht_cap wl18xx_siso40_ht_cap = {
+/* HT cap appropriate for wide channels in 2Ghz */
+static struct ieee80211_sta_ht_cap wl18xx_siso40_ht_cap_2ghz = {
         .cap = IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 |
                IEEE80211_HT_CAP_SUP_WIDTH_20_40 | IEEE80211_HT_CAP_DSSSCCK40,
         .ht_supported = true,
@@ -1228,40 +1293,42 @@ static struct ieee80211_sta_ht_cap wl18xx_siso40_ht_cap = {
                 },
 };
 
-/* HT cap appropriate for SISO 20 */
-static struct ieee80211_sta_ht_cap wl18xx_siso20_ht_cap = {
-        .cap = IEEE80211_HT_CAP_SGI_20,
+/* HT cap appropriate for wide channels in 5Ghz */
+static struct ieee80211_sta_ht_cap wl18xx_siso40_ht_cap_5ghz = {
+        .cap = IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 |
+               IEEE80211_HT_CAP_SUP_WIDTH_20_40,
         .ht_supported = true,
         .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
         .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
         .mcs = {
                 .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
-                .rx_highest = cpu_to_le16(72),
+                .rx_highest = cpu_to_le16(150),
                 .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
                 },
 };
 
-/* HT cap appropriate for MIMO rates in 20mhz channel */
-static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_2ghz = {
+/* HT cap appropriate for SISO 20 */
+static struct ieee80211_sta_ht_cap wl18xx_siso20_ht_cap = {
         .cap = IEEE80211_HT_CAP_SGI_20,
         .ht_supported = true,
         .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
         .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
         .mcs = {
-                .rx_mask = { 0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, },
-                .rx_highest = cpu_to_le16(144),
+                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(72),
                 .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
                 },
 };
 
-static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_5ghz = {
+/* HT cap appropriate for MIMO rates in 20mhz channel */
+static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_2ghz = {
         .cap = IEEE80211_HT_CAP_SGI_20,
         .ht_supported = true,
         .ampdu_factor = IEEE80211_HT_MAX_AMPDU_16K,
         .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
         .mcs = {
-                .rx_mask = { 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, },
-                .rx_highest = cpu_to_le16(72),
+                .rx_mask = { 0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, },
+                .rx_highest = cpu_to_le16(144),
                 .tx_params = IEEE80211_HT_MCS_TX_DEFINED,
                 },
 };
@@ -1286,7 +1353,7 @@ static int __devinit wl18xx_probe(struct platform_device *pdev)
         wl->ptable = wl18xx_ptable;
         wl->rtable = wl18xx_rtable;
         wl->num_tx_desc = 32;
-        wl->num_rx_desc = 16;
+        wl->num_rx_desc = 32;
         wl->band_rate_to_idx = wl18xx_band_rate_to_idx;
         wl->hw_tx_rate_tbl_size = WL18XX_CONF_HW_RXTX_RATE_MAX;
         wl->hw_min_ht_rate = WL18XX_CONF_HW_RXTX_RATE_MCS0;
@@ -1294,32 +1361,8 @@ static int __devinit wl18xx_probe(struct platform_device *pdev)
         wl->stats.fw_stats_len = sizeof(struct wl18xx_acx_statistics);
         wl->static_data_priv_len = sizeof(struct wl18xx_static_data_priv);
 
-        if (!strcmp(ht_mode_param, "wide")) {
-                memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
-                       &wl18xx_siso40_ht_cap,
-                       sizeof(wl18xx_siso40_ht_cap));
-                memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
-                       &wl18xx_siso40_ht_cap,
-                       sizeof(wl18xx_siso40_ht_cap));
-        } else if (!strcmp(ht_mode_param, "mimo")) {
-                memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
-                       &wl18xx_mimo_ht_cap_2ghz,
-                       sizeof(wl18xx_mimo_ht_cap_2ghz));
-                memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
-                       &wl18xx_mimo_ht_cap_5ghz,
-                       sizeof(wl18xx_mimo_ht_cap_5ghz));
-        } else if (!strcmp(ht_mode_param, "siso20")) {
-                memcpy(&wl->ht_cap[IEEE80211_BAND_2GHZ],
-                       &wl18xx_siso20_ht_cap,
-                       sizeof(wl18xx_siso20_ht_cap));
-                memcpy(&wl->ht_cap[IEEE80211_BAND_5GHZ],
-                       &wl18xx_siso20_ht_cap,
-                       sizeof(wl18xx_siso20_ht_cap));
-        } else {
-                wl1271_error("invalid ht_mode '%s'", ht_mode_param);
-                ret = -EINVAL;
-                goto out_free;
-        }
+        if (num_rx_desc_param != -1)
+                wl->num_rx_desc = num_rx_desc_param;
 
         ret = wl18xx_conf_init(wl, &pdev->dev);
         if (ret < 0)
@@ -1366,6 +1409,37 @@ static int __devinit wl18xx_probe(struct platform_device *pdev)
         if (dc2dc_param != -1)
                 priv->conf.phy.external_pa_dc2dc = dc2dc_param;
 
+        if (!strcmp(ht_mode_param, "default")) {
+                /*
+                 * Only support mimo with multiple antennas. Fall back to
+                 * siso20.
+                 */
+                if (priv->conf.phy.number_of_assembled_ant2_4 >= 2)
+                        wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                                          &wl18xx_mimo_ht_cap_2ghz);
+                else
+                        wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                                          &wl18xx_siso20_ht_cap);
+
+                /* 5Ghz is always wide */
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ,
+                                  &wl18xx_siso40_ht_cap_5ghz);
+        } else if (!strcmp(ht_mode_param, "wide")) {
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                                  &wl18xx_siso40_ht_cap_2ghz);
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ,
+                                  &wl18xx_siso40_ht_cap_5ghz);
+        } else if (!strcmp(ht_mode_param, "siso20")) {
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_2GHZ,
+                                  &wl18xx_siso20_ht_cap);
+                wlcore_set_ht_cap(wl, IEEE80211_BAND_5GHZ,
+                                  &wl18xx_siso20_ht_cap);
+        } else {
+                wl1271_error("invalid ht_mode '%s'", ht_mode_param);
+                ret = -EINVAL;
+                goto out_free;
+        }
+
         if (!checksum_param) {
                 wl18xx_ops.set_rx_csum = NULL;
                 wl18xx_ops.init_vif = NULL;
@@ -1410,7 +1484,7 @@ static void __exit wl18xx_exit(void)
 module_exit(wl18xx_exit);
 
 module_param_named(ht_mode, ht_mode_param, charp, S_IRUSR);
-MODULE_PARM_DESC(ht_mode, "Force HT mode: wide (default), mimo or siso20");
+MODULE_PARM_DESC(ht_mode, "Force HT mode: wide or siso20");
 
 module_param_named(board_type, board_type_param, charp, S_IRUSR);
 MODULE_PARM_DESC(board_type, "Board type: fpga, hdk (default), evb, com8 or "
@@ -1458,6 +1532,11 @@ module_param_named(pwr_limit_reference_11_abg,
 MODULE_PARM_DESC(pwr_limit_reference_11_abg, "Power limit reference: u8 "
                  "(default is 0xc8)");
 
+module_param_named(num_rx_desc,
+                   num_rx_desc_param, int, S_IRUSR);
+MODULE_PARM_DESC(num_rx_desc_param,
+                 "Number of Rx descriptors: u8 (default is 32)");
+
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Luciano Coelho <coelho@ti.com>");
 MODULE_FIRMWARE(WL18XX_FW_NAME);
diff --git a/drivers/net/wireless/ti/wlcore/acx.c b/drivers/net/wireless/ti/wlcore/acx.c
index b9ec42c83757..ce108a736bd0 100644
--- a/drivers/net/wireless/ti/wlcore/acx.c
+++ b/drivers/net/wireless/ti/wlcore/acx.c
@@ -70,7 +70,7 @@ int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth)
         struct acx_sleep_auth *auth;
         int ret;
 
-        wl1271_debug(DEBUG_ACX, "acx sleep auth");
+        wl1271_debug(DEBUG_ACX, "acx sleep auth %d", sleep_auth);
 
         auth = kzalloc(sizeof(*auth), GFP_KERNEL);
         if (!auth) {
@@ -81,7 +81,13 @@ int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth)
         auth->sleep_auth = sleep_auth;
 
         ret = wl1271_cmd_configure(wl, ACX_SLEEP_AUTH, auth, sizeof(*auth));
+        if (ret < 0) {
+                wl1271_error("could not configure sleep_auth to %d: %d",
+                             sleep_auth, ret);
+                goto out;
+        }
 
+        wl->sleep_auth = sleep_auth;
 out:
         kfree(auth);
         return ret;
diff --git a/drivers/net/wireless/ti/wlcore/acx.h b/drivers/net/wireless/ti/wlcore/acx.h
index c0181258b722..d03215d6b3bd 100644
--- a/drivers/net/wireless/ti/wlcore/acx.h
+++ b/drivers/net/wireless/ti/wlcore/acx.h
@@ -118,6 +118,11 @@ enum wl1271_psm_mode {
 
         /* Extreme low power */
         WL1271_PSM_ELP = 2,
+
+        WL1271_PSM_MAX = WL1271_PSM_ELP,
+
+        /* illegal out of band value of PSM mode */
+        WL1271_PSM_ILLEGAL = 0xff
 };
 
 struct acx_sleep_auth {
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c
index 0fda500c01c9..8965960b841a 100644
--- a/drivers/net/wireless/ti/wlcore/boot.c
+++ b/drivers/net/wireless/ti/wlcore/boot.c
@@ -33,16 +33,22 @@
 #include "rx.h"
 #include "hw_ops.h"
 
-static void wl1271_boot_set_ecpu_ctrl(struct wl1271 *wl, u32 flag)
+static int wl1271_boot_set_ecpu_ctrl(struct wl1271 *wl, u32 flag)
 {
         u32 cpu_ctrl;
+        int ret;
 
         /* 10.5.0 run the firmware (I) */
-        cpu_ctrl = wlcore_read_reg(wl, REG_ECPU_CONTROL);
+        ret = wlcore_read_reg(wl, REG_ECPU_CONTROL, &cpu_ctrl);
+        if (ret < 0)
+                goto out;
 
         /* 10.5.1 run the firmware (II) */
         cpu_ctrl |= flag;
-        wlcore_write_reg(wl, REG_ECPU_CONTROL, cpu_ctrl);
+        ret = wlcore_write_reg(wl, REG_ECPU_CONTROL, cpu_ctrl);
+
+out:
+        return ret;
 }
 
 static int wlcore_boot_parse_fw_ver(struct wl1271 *wl,
@@ -87,7 +93,9 @@ static int wlcore_boot_static_data(struct wl1271 *wl)
                 goto out;
         }
 
-        wl1271_read(wl, wl->cmd_box_addr, static_data, len, false);
+        ret = wlcore_read(wl, wl->cmd_box_addr, static_data, len, false);
+        if (ret < 0)
+                goto out_free;
 
         ret = wlcore_boot_parse_fw_ver(wl, static_data);
         if (ret < 0)
@@ -109,6 +117,7 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
         struct wlcore_partition_set partition;
         int addr, chunk_num, partition_limit;
         u8 *p, *chunk;
+        int ret;
 
         /* whal_FwCtrl_LoadFwImageSm() */
 
@@ -130,7 +139,9 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
 
         memcpy(&partition, &wl->ptable[PART_DOWN], sizeof(partition));
         partition.mem.start = dest;
-        wlcore_set_partition(wl, &partition);
+        ret = wlcore_set_partition(wl, &partition);
+        if (ret < 0)
+                return ret;
 
         /* 10.1 set partition limit and chunk num */
         chunk_num = 0;
@@ -144,7 +155,9 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
                         partition_limit = chunk_num * CHUNK_SIZE +
                                 wl->ptable[PART_DOWN].mem.size;
                         partition.mem.start = addr;
-                        wlcore_set_partition(wl, &partition);
+                        ret = wlcore_set_partition(wl, &partition);
+                        if (ret < 0)
+                                return ret;
                 }
 
                 /* 10.3 upload the chunk */
@@ -153,7 +166,9 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
                 memcpy(chunk, p, CHUNK_SIZE);
                 wl1271_debug(DEBUG_BOOT, "uploading fw chunk 0x%p to 0x%x",
                              p, addr);
-                wl1271_write(wl, addr, chunk, CHUNK_SIZE, false);
+                ret = wlcore_write(wl, addr, chunk, CHUNK_SIZE, false);
+                if (ret < 0)
+                        goto out;
 
                 chunk_num++;
         }
@@ -164,10 +179,11 @@ static int wl1271_boot_upload_firmware_chunk(struct wl1271 *wl, void *buf,
         memcpy(chunk, p, fw_data_len % CHUNK_SIZE);
         wl1271_debug(DEBUG_BOOT, "uploading fw last chunk (%zd B) 0x%p to 0x%x",
                      fw_data_len % CHUNK_SIZE, p, addr);
-        wl1271_write(wl, addr, chunk, fw_data_len % CHUNK_SIZE, false);
+        ret = wlcore_write(wl, addr, chunk, fw_data_len % CHUNK_SIZE, false);
 
+out:
         kfree(chunk);
-        return 0;
+        return ret;
 }
 
 int wlcore_boot_upload_firmware(struct wl1271 *wl)
@@ -210,6 +226,7 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl)
         int i;
         u32 dest_addr, val;
         u8 *nvs_ptr, *nvs_aligned;
+        int ret;
 
         if (wl->nvs == NULL) {
                 wl1271_error("NVS file is needed during boot");
@@ -307,7 +324,9 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl)
                         wl1271_debug(DEBUG_BOOT,
                                      "nvs burst write 0x%x: 0x%x",
                                      dest_addr, val);
-                        wl1271_write32(wl, dest_addr, val);
+                        ret = wlcore_write32(wl, dest_addr, val);
+                        if (ret < 0)
+                                return ret;
 
                         nvs_ptr += 4;
                         dest_addr += 4;
@@ -333,7 +352,9 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl)
         nvs_len -= nvs_ptr - (u8 *)wl->nvs;
 
         /* Now we must set the partition correctly */
-        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        if (ret < 0)
+                return ret;
 
         /* Copy the NVS tables to a new block to ensure alignment */
         nvs_aligned = kmemdup(nvs_ptr, nvs_len, GFP_KERNEL);
@@ -341,11 +362,11 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl)
                 return -ENOMEM;
 
         /* And finally we upload the NVS tables */
-        wlcore_write_data(wl, REG_CMD_MBOX_ADDRESS,
-                          nvs_aligned, nvs_len, false);
+        ret = wlcore_write_data(wl, REG_CMD_MBOX_ADDRESS, nvs_aligned, nvs_len,
+                                false);
 
         kfree(nvs_aligned);
-        return 0;
+        return ret;
 
 out_badnvs:
         wl1271_error("nvs data is malformed");
@@ -359,11 +380,17 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
         u32 chip_id, intr;
 
         /* Make sure we have the boot partition */
-        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                return ret;
 
-        wl1271_boot_set_ecpu_ctrl(wl, ECPU_CONTROL_HALT);
+        ret = wl1271_boot_set_ecpu_ctrl(wl, ECPU_CONTROL_HALT);
+        if (ret < 0)
+                return ret;
 
-        chip_id = wlcore_read_reg(wl, REG_CHIP_ID_B);
+        ret = wlcore_read_reg(wl, REG_CHIP_ID_B, &chip_id);
+        if (ret < 0)
+                return ret;
 
         wl1271_debug(DEBUG_BOOT, "chip id after firmware boot: 0x%x", chip_id);
 
@@ -376,7 +403,9 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
         loop = 0;
         while (loop++ < INIT_LOOP) {
                 udelay(INIT_LOOP_DELAY);
-                intr = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR);
+                ret = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR, &intr);
+                if (ret < 0)
+                        return ret;
 
                 if (intr == 0xffffffff) {
                         wl1271_error("error reading hardware complete "
@@ -385,8 +414,10 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
                 }
                 /* check that ACX_INTR_INIT_COMPLETE is enabled */
                 else if (intr & WL1271_ACX_INTR_INIT_COMPLETE) {
-                        wlcore_write_reg(wl, REG_INTERRUPT_ACK,
-                                         WL1271_ACX_INTR_INIT_COMPLETE);
+                        ret = wlcore_write_reg(wl, REG_INTERRUPT_ACK,
+                                               WL1271_ACX_INTR_INIT_COMPLETE);
+                        if (ret < 0)
+                                return ret;
                         break;
                 }
         }
@@ -398,12 +429,17 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
         }
 
         /* get hardware config command mail box */
-        wl->cmd_box_addr = wlcore_read_reg(wl, REG_COMMAND_MAILBOX_PTR);
+        ret = wlcore_read_reg(wl, REG_COMMAND_MAILBOX_PTR, &wl->cmd_box_addr);
+        if (ret < 0)
+                return ret;
 
         wl1271_debug(DEBUG_MAILBOX, "cmd_box_addr 0x%x", wl->cmd_box_addr);
 
         /* get hardware config event mail box */
-        wl->mbox_ptr[0] = wlcore_read_reg(wl, REG_EVENT_MAILBOX_PTR);
+        ret = wlcore_read_reg(wl, REG_EVENT_MAILBOX_PTR, &wl->mbox_ptr[0]);
+        if (ret < 0)
+                return ret;
+
         wl->mbox_ptr[1] = wl->mbox_ptr[0] + sizeof(struct event_mailbox);
 
         wl1271_debug(DEBUG_MAILBOX, "MBOX ptrs: 0x%x 0x%x",
@@ -445,9 +481,9 @@ int wlcore_boot_run_firmware(struct wl1271 *wl)
         }
 
         /* set the working partition to its "running" mode offset */
-        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
 
         /* firmware startup completed */
-        return 0;
+        return ret;
 }
 EXPORT_SYMBOL_GPL(wlcore_boot_run_firmware);
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 885364ca4344..56c7a2342fdf 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -65,17 +65,24 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
         WARN_ON(len % 4 != 0);
         WARN_ON(test_bit(WL1271_FLAG_IN_ELP, &wl->flags));
 
-        wl1271_write(wl, wl->cmd_box_addr, buf, len, false);
+        ret = wlcore_write(wl, wl->cmd_box_addr, buf, len, false);
+        if (ret < 0)
+                goto fail;
 
         /*
          * TODO: we just need this because one bit is in a different
          * place.  Is there any better way?
          */
-        wl->ops->trigger_cmd(wl, wl->cmd_box_addr, buf, len);
+        ret = wl->ops->trigger_cmd(wl, wl->cmd_box_addr, buf, len);
+        if (ret < 0)
+                goto fail;
 
         timeout = jiffies + msecs_to_jiffies(WL1271_COMMAND_TIMEOUT);
 
-        intr = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR);
+        ret = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR, &intr);
+        if (ret < 0)
+                goto fail;
+
         while (!(intr & WL1271_ACX_INTR_CMD_COMPLETE)) {
                 if (time_after(jiffies, timeout)) {
                         wl1271_error("command complete timeout");
@@ -89,13 +96,18 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
                 else
                         msleep(1);
 
-                intr = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR);
+                ret = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR, &intr);
+                if (ret < 0)
+                        goto fail;
         }
 
         /* read back the status code of the command */
         if (res_len == 0)
                 res_len = sizeof(struct wl1271_cmd_header);
-        wl1271_read(wl, wl->cmd_box_addr, cmd, res_len, false);
+
+        ret = wlcore_read(wl, wl->cmd_box_addr, cmd, res_len, false);
+        if (ret < 0)
+                goto fail;
 
         status = le16_to_cpu(cmd->status);
         if (status != CMD_STATUS_SUCCESS) {
@@ -104,11 +116,14 @@ int wl1271_cmd_send(struct wl1271 *wl, u16 id, void *buf, size_t len,
                 goto fail;
         }
 
-        wlcore_write_reg(wl, REG_INTERRUPT_ACK, WL1271_ACX_INTR_CMD_COMPLETE);
+        ret = wlcore_write_reg(wl, REG_INTERRUPT_ACK,
+                               WL1271_ACX_INTR_CMD_COMPLETE);
+        if (ret < 0)
+                goto fail;
+
         return 0;
 
 fail:
-        WARN_ON(1);
         wl12xx_queue_recovery_work(wl);
         return ret;
 }
@@ -117,35 +132,45 @@ fail:
  * Poll the mailbox event field until any of the bits in the mask is set or a
  * timeout occurs (WL1271_EVENT_TIMEOUT in msecs)
  */
-static int wl1271_cmd_wait_for_event_or_timeout(struct wl1271 *wl, u32 mask)
+static int wl1271_cmd_wait_for_event_or_timeout(struct wl1271 *wl,
+                                                u32 mask, bool *timeout)
 {
         u32 *events_vector;
         u32 event;
-        unsigned long timeout;
+        unsigned long timeout_time;
         int ret = 0;
 
+        *timeout = false;
+
         events_vector = kmalloc(sizeof(*events_vector), GFP_KERNEL | GFP_DMA);
         if (!events_vector)
                 return -ENOMEM;
 
-        timeout = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);
+        timeout_time = jiffies + msecs_to_jiffies(WL1271_EVENT_TIMEOUT);
 
         do {
-                if (time_after(jiffies, timeout)) {
+                if (time_after(jiffies, timeout_time)) {
                         wl1271_debug(DEBUG_CMD, "timeout waiting for event %d",
                                      (int)mask);
-                        ret = -ETIMEDOUT;
+                        *timeout = true;
                         goto out;
                 }
 
                 msleep(1);
 
                 /* read from both event fields */
-                wl1271_read(wl, wl->mbox_ptr[0], events_vector,
-                            sizeof(*events_vector), false);
+                ret = wlcore_read(wl, wl->mbox_ptr[0], events_vector,
+                                  sizeof(*events_vector), false);
+                if (ret < 0)
+                        goto out;
+
                 event = *events_vector & mask;
-                wl1271_read(wl, wl->mbox_ptr[1], events_vector,
-                            sizeof(*events_vector), false);
+
+                ret = wlcore_read(wl, wl->mbox_ptr[1], events_vector,
+                                  sizeof(*events_vector), false);
+                if (ret < 0)
+                        goto out;
+
                 event |= *events_vector & mask;
         } while (!event);
 
@@ -157,9 +182,10 @@ out:
 static int wl1271_cmd_wait_for_event(struct wl1271 *wl, u32 mask)
 {
         int ret;
+        bool timeout = false;
 
-        ret = wl1271_cmd_wait_for_event_or_timeout(wl, mask);
-        if (ret != 0) {
+        ret = wl1271_cmd_wait_for_event_or_timeout(wl, mask, &timeout);
+        if (ret != 0 || timeout) {
                 wl12xx_queue_recovery_work(wl);
                 return ret;
         }
@@ -1412,6 +1438,7 @@ int wl12xx_cmd_remove_peer(struct wl1271 *wl, u8 hlid)
 {
         struct wl12xx_cmd_remove_peer *cmd;
         int ret;
+        bool timeout = false;
 
         wl1271_debug(DEBUG_CMD, "cmd remove peer %d", (int)hlid);
 
@@ -1432,12 +1459,16 @@ int wl12xx_cmd_remove_peer(struct wl1271 *wl, u8 hlid)
                 goto out_free;
         }
 
+        ret = wl1271_cmd_wait_for_event_or_timeout(wl,
+                                           PEER_REMOVE_COMPLETE_EVENT_ID,
+                                           &timeout);
         /*
          * We are ok with a timeout here. The event is sometimes not sent
-         * due to a firmware bug.
+         * due to a firmware bug. In case of another error (like SDIO timeout)
+         * queue a recovery.
          */
-        wl1271_cmd_wait_for_event_or_timeout(wl,
-                                             PEER_REMOVE_COMPLETE_EVENT_ID);
+        if (ret)
+                wl12xx_queue_recovery_work(wl);
 
 out_free:
         kfree(cmd);
@@ -1754,7 +1785,9 @@ int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif)
                 return -EINVAL;
 
         /* flush all pending packets */
-        wl1271_tx_work_locked(wl);
+        ret = wlcore_tx_work_locked(wl);
+        if (ret < 0)
+                goto out;
 
         if (test_bit(wlvif->dev_role_id, wl->roc_map)) {
                 ret = wl12xx_croc(wl, wlvif->dev_role_id);
diff --git a/drivers/net/wireless/ti/wlcore/cmd.h b/drivers/net/wireless/ti/wlcore/cmd.h
index 85171f2bf68e..c8a6510c72cb 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.h
+++ b/drivers/net/wireless/ti/wlcore/cmd.h
@@ -652,4 +652,25 @@ struct wl12xx_cmd_stop_channel_switch {
         struct wl1271_cmd_header header;
 } __packed;
 
+/* Used to check radio status after calibration */
+#define MAX_TLV_LENGTH          500
+#define TEST_CMD_P2G_CAL        2       /* TX BiP */
+
+struct wl1271_cmd_cal_p2g {
+        struct wl1271_cmd_header header;
+
+        struct wl1271_cmd_test_header test;
+
+        __le32 ver;
+        __le16 len;
+        u8 buf[MAX_TLV_LENGTH];
+        u8 type;
+        u8 padding;
+
+        __le16 radio_status;
+
+        u8 sub_band_mask;
+        u8 padding2;
+} __packed;
+
 #endif /* __WL1271_CMD_H__ */
diff --git a/drivers/net/wireless/ti/wlcore/conf.h b/drivers/net/wireless/ti/wlcore/conf.h
index 03c635872335..d77224f2ac6b 100644
--- a/drivers/net/wireless/ti/wlcore/conf.h
+++ b/drivers/net/wireless/ti/wlcore/conf.h
@@ -951,6 +951,12 @@ struct conf_conn_settings {
          * Range: u16
          */
         u8 max_listen_interval;
+
+        /*
+         * Default sleep authorization for a new STA interface. This determines
+         * whether we can go to ELP.
+         */
+        u8 sta_sleep_auth;
 } __packed;
 
 enum {
@@ -1276,7 +1282,7 @@ struct conf_hangover_settings {
  * version, the two LSB are the lower driver's private conf
  * version.
  */
-#define WLCORE_CONF_VERSION     (0x0001 << 16)
+#define WLCORE_CONF_VERSION     (0x0002 << 16)
 #define WLCORE_CONF_MASK        0xffff0000
 #define WLCORE_CONF_SIZE        (sizeof(struct wlcore_conf_header) +    \
                                  sizeof(struct wlcore_conf))
diff --git a/drivers/net/wireless/ti/wlcore/debugfs.c b/drivers/net/wireless/ti/wlcore/debugfs.c
index 689a847005c9..80dbc5304fac 100644
--- a/drivers/net/wireless/ti/wlcore/debugfs.c
+++ b/drivers/net/wireless/ti/wlcore/debugfs.c
@@ -38,6 +38,8 @@
 /* ms */
 #define WL1271_DEBUGFS_STATS_LIFETIME 1000
 
+#define WLCORE_MAX_BLOCK_SIZE ((size_t)(4*PAGE_SIZE))
+
 /* debugfs macros idea from mac80211 */
 int wl1271_format_buffer(char __user *userbuf, size_t count,
                          loff_t *ppos, char *fmt, ...)
@@ -963,6 +965,257 @@ static const struct file_operations fw_stats_raw_ops = {
         .llseek = default_llseek,
 };
 
+static ssize_t sleep_auth_read(struct file *file, char __user *user_buf,
+                               size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+
+        return wl1271_format_buffer(user_buf, count,
+                                    ppos, "%d\n",
+                                    wl->sleep_auth);
+}
+
+static ssize_t sleep_auth_write(struct file *file,
+                                const char __user *user_buf,
+                                size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        unsigned long value;
+        int ret;
+
+        ret = kstrtoul_from_user(user_buf, count, 0, &value);
+        if (ret < 0) {
+                wl1271_warning("illegal value in sleep_auth");
+                return -EINVAL;
+        }
+
+        if (value < 0 || value > WL1271_PSM_MAX) {
+                wl1271_warning("sleep_auth must be between 0 and %d",
+                               WL1271_PSM_MAX);
+                return -ERANGE;
+        }
+
+        mutex_lock(&wl->mutex);
+
+        wl->conf.conn.sta_sleep_auth = value;
+
+        if (wl->state == WL1271_STATE_OFF) {
+                /* this will show up on "read" in case we are off */
+                wl->sleep_auth = value;
+                goto out;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto out;
+
+        ret = wl1271_acx_sleep_auth(wl, value);
+        if (ret < 0)
+                goto out_sleep;
+
+out_sleep:
+        wl1271_ps_elp_sleep(wl);
+out:
+        mutex_unlock(&wl->mutex);
+        return count;
+}
+
+static const struct file_operations sleep_auth_ops = {
+        .read = sleep_auth_read,
+        .write = sleep_auth_write,
+        .open = simple_open,
+        .llseek = default_llseek,
+};
+
+static ssize_t dev_mem_read(struct file *file,
+             char __user *user_buf, size_t count,
+             loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        struct wlcore_partition_set part, old_part;
+        size_t bytes = count;
+        int ret;
+        char *buf;
+
+        /* only requests of dword-aligned size and offset are supported */
+        if (bytes % 4)
+                return -EINVAL;
+
+        if (*ppos % 4)
+                return -EINVAL;
+
+        /* function should return in reasonable time */
+        bytes = min(bytes, WLCORE_MAX_BLOCK_SIZE);
+
+        if (bytes == 0)
+                return -EINVAL;
+
+        memset(&part, 0, sizeof(part));
+        part.mem.start = file->f_pos;
+        part.mem.size = bytes;
+
+        buf = kmalloc(bytes, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        mutex_lock(&wl->mutex);
+
+        if (wl->state == WL1271_STATE_OFF) {
+                ret = -EFAULT;
+                goto skip_read;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto skip_read;
+
+        /* store current partition and switch partition */
+        memcpy(&old_part, &wl->curr_part, sizeof(old_part));
+        ret = wlcore_set_partition(wl, &part);
+        if (ret < 0)
+                goto part_err;
+
+        ret = wlcore_raw_read(wl, 0, buf, bytes, false);
+        if (ret < 0)
+                goto read_err;
+
+read_err:
+        /* recover partition */
+        ret = wlcore_set_partition(wl, &old_part);
+        if (ret < 0)
+                goto part_err;
+
+part_err:
+        wl1271_ps_elp_sleep(wl);
+
+skip_read:
+        mutex_unlock(&wl->mutex);
+
+        if (ret == 0) {
+                ret = copy_to_user(user_buf, buf, bytes);
+                if (ret < bytes) {
+                        bytes -= ret;
+                        *ppos += bytes;
+                        ret = 0;
+                } else {
+                        ret = -EFAULT;
+                }
+        }
+
+        kfree(buf);
+
+        return ((ret == 0) ? bytes : ret);
+}
+
+static ssize_t dev_mem_write(struct file *file, const char __user *user_buf,
+                size_t count, loff_t *ppos)
+{
+        struct wl1271 *wl = file->private_data;
+        struct wlcore_partition_set part, old_part;
+        size_t bytes = count;
+        int ret;
+        char *buf;
+
+        /* only requests of dword-aligned size and offset are supported */
+        if (bytes % 4)
+                return -EINVAL;
+
+        if (*ppos % 4)
+                return -EINVAL;
+
+        /* function should return in reasonable time */
+        bytes = min(bytes, WLCORE_MAX_BLOCK_SIZE);
+
+        if (bytes == 0)
+                return -EINVAL;
+
+        memset(&part, 0, sizeof(part));
+        part.mem.start = file->f_pos;
+        part.mem.size = bytes;
+
+        buf = kmalloc(bytes, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        ret = copy_from_user(buf, user_buf, bytes);
+        if (ret) {
+                ret = -EFAULT;
+                goto err_out;
+        }
+
+        mutex_lock(&wl->mutex);
+
+        if (wl->state == WL1271_STATE_OFF) {
+                ret = -EFAULT;
+                goto skip_write;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl);
+        if (ret < 0)
+                goto skip_write;
+
+        /* store current partition and switch partition */
+        memcpy(&old_part, &wl->curr_part, sizeof(old_part));
+        ret = wlcore_set_partition(wl, &part);
+        if (ret < 0)
+                goto part_err;
+
+        ret = wlcore_raw_write(wl, 0, buf, bytes, false);
+        if (ret < 0)
+                goto write_err;
+
+write_err:
+        /* recover partition */
+        ret = wlcore_set_partition(wl, &old_part);
+        if (ret < 0)
+                goto part_err;
+
+part_err:
+        wl1271_ps_elp_sleep(wl);
+
+skip_write:
+        mutex_unlock(&wl->mutex);
+
+        if (ret == 0)
+                *ppos += bytes;
+
+err_out:
+        kfree(buf);
+
+        return ((ret == 0) ? bytes : ret);
+}
+
+static loff_t dev_mem_seek(struct file *file, loff_t offset, int orig)
+{
+        loff_t ret;
+
+        /* only requests of dword-aligned size and offset are supported */
+        if (offset % 4)
+                return -EINVAL;
+
+        switch (orig) {
+        case SEEK_SET:
+                file->f_pos = offset;
+                ret = file->f_pos;
+                break;
+        case SEEK_CUR:
+                file->f_pos += offset;
+                ret = file->f_pos;
+                break;
+        default:
+                ret = -EINVAL;
+        }
+
+        return ret;
+}
+
+static const struct file_operations dev_mem_ops = {
+        .open = simple_open,
+        .read = dev_mem_read,
+        .write = dev_mem_write,
+        .llseek = dev_mem_seek,
+};
+
 static int wl1271_debugfs_add_files(struct wl1271 *wl,
                                     struct dentry *rootdir)
 {
@@ -988,6 +1241,7 @@ static int wl1271_debugfs_add_files(struct wl1271 *wl,
         DEBUGFS_ADD(irq_blk_threshold, rootdir);
         DEBUGFS_ADD(irq_timeout, rootdir);
         DEBUGFS_ADD(fw_stats_raw, rootdir);
+        DEBUGFS_ADD(sleep_auth, rootdir);
 
         streaming = debugfs_create_dir("rx_streaming", rootdir);
         if (!streaming || IS_ERR(streaming))
@@ -996,6 +1250,7 @@ static int wl1271_debugfs_add_files(struct wl1271 *wl,
         DEBUGFS_ADD_PREFIX(rx_streaming, interval, streaming);
         DEBUGFS_ADD_PREFIX(rx_streaming, always, streaming);
 
+        DEBUGFS_ADD_PREFIX(dev, mem, rootdir);
 
         return 0;
 
diff --git a/drivers/net/wireless/ti/wlcore/event.c b/drivers/net/wireless/ti/wlcore/event.c
index c976f0409865..48907054d493 100644
--- a/drivers/net/wireless/ti/wlcore/event.c
+++ b/drivers/net/wireless/ti/wlcore/event.c
@@ -105,6 +105,7 @@ static int wl1271_event_process(struct wl1271 *wl)
         u32 vector;
         bool disconnect_sta = false;
         unsigned long sta_bitmap = 0;
+        int ret;
 
         wl1271_event_mbox_dump(mbox);
 
@@ -228,7 +229,9 @@ static int wl1271_event_process(struct wl1271 *wl)
 
         if ((vector & DUMMY_PACKET_EVENT_ID)) {
                 wl1271_debug(DEBUG_EVENT, "DUMMY_PACKET_ID_EVENT_ID");
-                wl1271_tx_dummy_packet(wl);
+                ret = wl1271_tx_dummy_packet(wl);
+                if (ret < 0)
+                        return ret;
         }
 
         /*
@@ -301,8 +304,10 @@ int wl1271_event_handle(struct wl1271 *wl, u8 mbox_num)
                 return -EINVAL;
 
         /* first we read the mbox descriptor */
-        wl1271_read(wl, wl->mbox_ptr[mbox_num], wl->mbox,
-                    sizeof(*wl->mbox), false);
+        ret = wlcore_read(wl, wl->mbox_ptr[mbox_num], wl->mbox,
+                          sizeof(*wl->mbox), false);
+        if (ret < 0)
+                return ret;
 
         /* process the descriptor */
         ret = wl1271_event_process(wl);
@@ -313,7 +318,7 @@ int wl1271_event_handle(struct wl1271 *wl, u8 mbox_num)
          * TODO: we just need this because one bit is in a different
          * place.  Is there any better way?
          */
-        wl->ops->ack_event(wl);
+        ret = wl->ops->ack_event(wl);
 
-        return 0;
+        return ret;
 }
diff --git a/drivers/net/wireless/ti/wlcore/hw_ops.h b/drivers/net/wireless/ti/wlcore/hw_ops.h
index 9e7787ba9610..2673d783ec1e 100644
--- a/drivers/net/wireless/ti/wlcore/hw_ops.h
+++ b/drivers/net/wireless/ti/wlcore/hw_ops.h
@@ -65,11 +65,13 @@ wlcore_hw_get_rx_buf_align(struct wl1271 *wl, u32 rx_desc)
         return wl->ops->get_rx_buf_align(wl, rx_desc);
 }
 
-static inline void
+static inline int
 wlcore_hw_prepare_read(struct wl1271 *wl, u32 rx_desc, u32 len)
 {
         if (wl->ops->prepare_read)
-                wl->ops->prepare_read(wl, rx_desc, len);
+                return wl->ops->prepare_read(wl, rx_desc, len);
+
+        return 0;
 }
 
 static inline u32
@@ -81,10 +83,12 @@ wlcore_hw_get_rx_packet_len(struct wl1271 *wl, void *rx_data, u32 data_len)
         return wl->ops->get_rx_packet_len(wl, rx_data, data_len);
 }
 
-static inline void wlcore_hw_tx_delayed_compl(struct wl1271 *wl)
+static inline int wlcore_hw_tx_delayed_compl(struct wl1271 *wl)
 {
         if (wl->ops->tx_delayed_compl)
-                wl->ops->tx_delayed_compl(wl);
+                return wl->ops->tx_delayed_compl(wl);
+
+        return 0;
 }
 
 static inline void wlcore_hw_tx_immediate_compl(struct wl1271 *wl)
diff --git a/drivers/net/wireless/ti/wlcore/ini.h b/drivers/net/wireless/ti/wlcore/ini.h
index 4cf9ecc56212..d24fe3bbc672 100644
--- a/drivers/net/wireless/ti/wlcore/ini.h
+++ b/drivers/net/wireless/ti/wlcore/ini.h
@@ -172,7 +172,19 @@ struct wl128x_ini_fem_params_5 {
 
 /* NVS data structure */
 #define WL1271_INI_NVS_SECTION_SIZE                  468
-#define WL1271_INI_FEM_MODULE_COUNT                  2
+
+/* We have four FEM module types: 0-RFMD, 1-TQS, 2-SKW, 3-TQS_HP */
+#define WL1271_INI_FEM_MODULE_COUNT                  4
+
+/*
+ * In NVS we only store two FEM module entries -
+ *        FEM modules 0,2,3 are stored in entry 0
+ *        FEM module 1 is stored in entry 1
+ */
+#define WL12XX_NVS_FEM_MODULE_COUNT                  2
+
+#define WL12XX_FEM_TO_NVS_ENTRY(ini_fem_module)      \
+        ((ini_fem_module) == 1 ? 1 : 0)
 
 #define WL1271_INI_LEGACY_NVS_FILE_SIZE              800
 
@@ -188,13 +200,13 @@ struct wl1271_nvs_file {
         struct {
                 struct wl1271_ini_fem_params_2 params;
                 u8 padding;
-        } dyn_radio_params_2[WL1271_INI_FEM_MODULE_COUNT];
+        } dyn_radio_params_2[WL12XX_NVS_FEM_MODULE_COUNT];
         struct wl1271_ini_band_params_5 stat_radio_params_5;
         u8 padding3;
         struct {
                 struct wl1271_ini_fem_params_5 params;
                 u8 padding;
-        } dyn_radio_params_5[WL1271_INI_FEM_MODULE_COUNT];
+        } dyn_radio_params_5[WL12XX_NVS_FEM_MODULE_COUNT];
 } __packed;
 
 struct wl128x_nvs_file {
@@ -209,12 +221,12 @@ struct wl128x_nvs_file {
         struct {
                 struct wl128x_ini_fem_params_2 params;
                 u8 padding;
-        } dyn_radio_params_2[WL1271_INI_FEM_MODULE_COUNT];
+        } dyn_radio_params_2[WL12XX_NVS_FEM_MODULE_COUNT];
         struct wl128x_ini_band_params_5 stat_radio_params_5;
         u8 padding3;
         struct {
                 struct wl128x_ini_fem_params_5 params;
                 u8 padding;
-        } dyn_radio_params_5[WL1271_INI_FEM_MODULE_COUNT];
+        } dyn_radio_params_5[WL12XX_NVS_FEM_MODULE_COUNT];
 } __packed;
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/init.c b/drivers/net/wireless/ti/wlcore/init.c
index 645abd4b660d..8a8a8971befa 100644
--- a/drivers/net/wireless/ti/wlcore/init.c
+++ b/drivers/net/wireless/ti/wlcore/init.c
@@ -554,29 +554,28 @@ int wl1271_init_vif_specific(struct wl1271 *wl, struct ieee80211_vif *vif)
         bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
         int ret, i;
 
-        /*
-         * consider all existing roles before configuring psm.
-         * TODO: reconfigure on interface removal.
-         */
-        if (!wl->ap_count) {
-                if (is_ap) {
-                        /* Configure for power always on */
+        /* consider all existing roles before configuring psm. */
+
+        if (wl->ap_count == 0 && is_ap) { /* first AP */
+                /* Configure for power always on */
+                ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
+                if (ret < 0)
+                        return ret;
+        /* first STA, no APs */
+        } else if (wl->sta_count == 0 && wl->ap_count == 0 && !is_ap) {
+                u8 sta_auth = wl->conf.conn.sta_sleep_auth;
+                /* Configure for power according to debugfs */
+                if (sta_auth != WL1271_PSM_ILLEGAL)
+                        ret = wl1271_acx_sleep_auth(wl, sta_auth);
+                /* Configure for power always on */
+                else if (wl->quirks & WLCORE_QUIRK_NO_ELP)
                         ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
-                        if (ret < 0)
-                                return ret;
-                } else if (!wl->sta_count) {
-                        if (wl->quirks & WLCORE_QUIRK_NO_ELP) {
-                                /* Configure for power always on */
-                                ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
-                                if (ret < 0)
-                                        return ret;
-                        } else {
-                                /* Configure for ELP power saving */
-                                ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
-                                if (ret < 0)
-                                        return ret;
-                        }
-                }
+                /* Configure for ELP power saving */
+                else
+                        ret = wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
+
+                if (ret < 0)
+                        return ret;
         }
 
         /* Mode specific init */
diff --git a/drivers/net/wireless/ti/wlcore/io.c b/drivers/net/wireless/ti/wlcore/io.c
index 7cd0081aede5..9976219c4e49 100644
--- a/drivers/net/wireless/ti/wlcore/io.c
+++ b/drivers/net/wireless/ti/wlcore/io.c
@@ -48,6 +48,12 @@ void wlcore_disable_interrupts(struct wl1271 *wl)
 }
 EXPORT_SYMBOL_GPL(wlcore_disable_interrupts);
 
+void wlcore_disable_interrupts_nosync(struct wl1271 *wl)
+{
+        disable_irq_nosync(wl->irq);
+}
+EXPORT_SYMBOL_GPL(wlcore_disable_interrupts_nosync);
+
 void wlcore_enable_interrupts(struct wl1271 *wl)
 {
         enable_irq(wl->irq);
@@ -122,9 +128,11 @@ EXPORT_SYMBOL_GPL(wlcore_translate_addr);
  *                                    |    |
  *
  */
-void wlcore_set_partition(struct wl1271 *wl,
-                          const struct wlcore_partition_set *p)
+int wlcore_set_partition(struct wl1271 *wl,
+                         const struct wlcore_partition_set *p)
 {
+        int ret;
+
         /* copy partition info */
         memcpy(&wl->curr_part, p, sizeof(*p));
 
@@ -137,28 +145,41 @@ void wlcore_set_partition(struct wl1271 *wl,
         wl1271_debug(DEBUG_IO, "mem3_start %08X mem3_size %08X",
                      p->mem3.start, p->mem3.size);
 
-        wl1271_raw_write32(wl, HW_PART0_START_ADDR, p->mem.start);
-        wl1271_raw_write32(wl, HW_PART0_SIZE_ADDR, p->mem.size);
-        wl1271_raw_write32(wl, HW_PART1_START_ADDR, p->reg.start);
-        wl1271_raw_write32(wl, HW_PART1_SIZE_ADDR, p->reg.size);
-        wl1271_raw_write32(wl, HW_PART2_START_ADDR, p->mem2.start);
-        wl1271_raw_write32(wl, HW_PART2_SIZE_ADDR, p->mem2.size);
+        ret = wlcore_raw_write32(wl, HW_PART0_START_ADDR, p->mem.start);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART0_SIZE_ADDR, p->mem.size);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART1_START_ADDR, p->reg.start);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART1_SIZE_ADDR, p->reg.size);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART2_START_ADDR, p->mem2.start);
+        if (ret < 0)
+                goto out;
+
+        ret = wlcore_raw_write32(wl, HW_PART2_SIZE_ADDR, p->mem2.size);
+        if (ret < 0)
+                goto out;
+
         /*
          * We don't need the size of the last partition, as it is
          * automatically calculated based on the total memory size and
          * the sizes of the previous partitions.
          */
-        wl1271_raw_write32(wl, HW_PART3_START_ADDR, p->mem3.start);
-}
-EXPORT_SYMBOL_GPL(wlcore_set_partition);
+        ret = wlcore_raw_write32(wl, HW_PART3_START_ADDR, p->mem3.start);
 
-void wlcore_select_partition(struct wl1271 *wl, u8 part)
-{
-        wl1271_debug(DEBUG_IO, "setting partition %d", part);
-
-        wlcore_set_partition(wl, &wl->ptable[part]);
+out:
+        return ret;
 }
-EXPORT_SYMBOL_GPL(wlcore_select_partition);
+EXPORT_SYMBOL_GPL(wlcore_set_partition);
 
 void wl1271_io_reset(struct wl1271 *wl)
 {
diff --git a/drivers/net/wireless/ti/wlcore/io.h b/drivers/net/wireless/ti/wlcore/io.h
index 8942954b56a0..fef80adc8bf5 100644
--- a/drivers/net/wireless/ti/wlcore/io.h
+++ b/drivers/net/wireless/ti/wlcore/io.h
@@ -45,6 +45,7 @@
 struct wl1271;
 
 void wlcore_disable_interrupts(struct wl1271 *wl);
+void wlcore_disable_interrupts_nosync(struct wl1271 *wl);
 void wlcore_enable_interrupts(struct wl1271 *wl);
 
 void wl1271_io_reset(struct wl1271 *wl);
@@ -52,79 +53,113 @@ void wl1271_io_init(struct wl1271 *wl);
 int wlcore_translate_addr(struct wl1271 *wl, int addr);
 
 /* Raw target IO, address is not translated */
-static inline void wl1271_raw_write(struct wl1271 *wl, int addr, void *buf,
-                                    size_t len, bool fixed)
+static inline int __must_check wlcore_raw_write(struct wl1271 *wl, int addr,
+                                                void *buf, size_t len,
+                                                bool fixed)
 {
-        wl->if_ops->write(wl->dev, addr, buf, len, fixed);
+        int ret;
+
+        if (test_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags))
+                return -EIO;
+
+        ret = wl->if_ops->write(wl->dev, addr, buf, len, fixed);
+        if (ret)
+                set_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags);
+
+        return ret;
 }
 
-static inline void wl1271_raw_read(struct wl1271 *wl, int addr, void *buf,
-                                   size_t len, bool fixed)
+static inline int __must_check wlcore_raw_read(struct wl1271 *wl, int addr,
+                                               void *buf, size_t len,
+                                               bool fixed)
 {
-        wl->if_ops->read(wl->dev, addr, buf, len, fixed);
+        int ret;
+
+        if (test_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags))
+                return -EIO;
+
+        ret = wl->if_ops->read(wl->dev, addr, buf, len, fixed);
+        if (ret)
+                set_bit(WL1271_FLAG_SDIO_FAILED, &wl->flags);
+
+        return ret;
 }
 
-static inline void wlcore_raw_read_data(struct wl1271 *wl, int reg, void *buf,
-                                        size_t len, bool fixed)
+static inline int __must_check wlcore_raw_read_data(struct wl1271 *wl, int reg,
+                                                    void *buf, size_t len,
+                                                    bool fixed)
 {
-        wl1271_raw_read(wl, wl->rtable[reg], buf, len, fixed);
+        return wlcore_raw_read(wl, wl->rtable[reg], buf, len, fixed);
 }
 
-static inline void wlcore_raw_write_data(struct wl1271 *wl, int reg, void *buf,
-                                         size_t len, bool fixed)
+static inline int __must_check wlcore_raw_write_data(struct wl1271 *wl, int reg,
+                                                     void *buf, size_t len,
+                                                     bool fixed)
 {
-        wl1271_raw_write(wl, wl->rtable[reg], buf, len, fixed);
+        return wlcore_raw_write(wl, wl->rtable[reg], buf, len, fixed);
 }
 
-static inline u32 wl1271_raw_read32(struct wl1271 *wl, int addr)
+static inline int __must_check wlcore_raw_read32(struct wl1271 *wl, int addr,
+                                                 u32 *val)
 {
-        wl1271_raw_read(wl, addr, &wl->buffer_32,
-                            sizeof(wl->buffer_32), false);
+        int ret;
+
+        ret = wlcore_raw_read(wl, addr, &wl->buffer_32,
+                              sizeof(wl->buffer_32), false);
+        if (ret < 0)
+                return ret;
+
+        if (val)
+                *val = le32_to_cpu(wl->buffer_32);
 
-        return le32_to_cpu(wl->buffer_32);
+        return 0;
 }
 
-static inline void wl1271_raw_write32(struct wl1271 *wl, int addr, u32 val)
+static inline int __must_check wlcore_raw_write32(struct wl1271 *wl, int addr,
+                                                  u32 val)
 {
         wl->buffer_32 = cpu_to_le32(val);
-        wl1271_raw_write(wl, addr, &wl->buffer_32,
-                             sizeof(wl->buffer_32), false);
+        return wlcore_raw_write(wl, addr, &wl->buffer_32,
+                                sizeof(wl->buffer_32), false);
 }
 
-static inline void wl1271_read(struct wl1271 *wl, int addr, void *buf,
-                               size_t len, bool fixed)
+static inline int __must_check wlcore_read(struct wl1271 *wl, int addr,
+                                           void *buf, size_t len, bool fixed)
 {
         int physical;
 
         physical = wlcore_translate_addr(wl, addr);
 
-        wl1271_raw_read(wl, physical, buf, len, fixed);
+        return wlcore_raw_read(wl, physical, buf, len, fixed);
 }
 
-static inline void wl1271_write(struct wl1271 *wl, int addr, void *buf,
-                                size_t len, bool fixed)
+static inline int __must_check wlcore_write(struct wl1271 *wl, int addr,
+                                            void *buf, size_t len, bool fixed)
 {
         int physical;
 
         physical = wlcore_translate_addr(wl, addr);
 
-        wl1271_raw_write(wl, physical, buf, len, fixed);
+        return wlcore_raw_write(wl, physical, buf, len, fixed);
 }
 
-static inline void wlcore_write_data(struct wl1271 *wl, int reg, void *buf,
-                                     size_t len, bool fixed)
+static inline int __must_check wlcore_write_data(struct wl1271 *wl, int reg,
+                                                 void *buf, size_t len,
+                                                 bool fixed)
 {
-        wl1271_write(wl, wl->rtable[reg], buf, len, fixed);
+        return wlcore_write(wl, wl->rtable[reg], buf, len, fixed);
 }
 
-static inline void wlcore_read_data(struct wl1271 *wl, int reg, void *buf,
-                                    size_t len, bool fixed)
+static inline int __must_check wlcore_read_data(struct wl1271 *wl, int reg,
+                                                void *buf, size_t len,
+                                                bool fixed)
 {
-        wl1271_read(wl, wl->rtable[reg], buf, len, fixed);
+        return wlcore_read(wl, wl->rtable[reg], buf, len, fixed);
 }
 
-static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr,
-                                      void *buf, size_t len, bool fixed)
+static inline int __must_check wlcore_read_hwaddr(struct wl1271 *wl, int hwaddr,
+                                                  void *buf, size_t len,
+                                                  bool fixed)
 {
         int physical;
         int addr;
@@ -134,34 +169,47 @@ static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr,
 
         physical = wlcore_translate_addr(wl, addr);
 
-        wl1271_raw_read(wl, physical, buf, len, fixed);
+        return wlcore_raw_read(wl, physical, buf, len, fixed);
 }
 
-static inline u32 wl1271_read32(struct wl1271 *wl, int addr)
+static inline int __must_check wlcore_read32(struct wl1271 *wl, int addr,
+                                             u32 *val)
 {
-        return wl1271_raw_read32(wl, wlcore_translate_addr(wl, addr));
+        return wlcore_raw_read32(wl, wlcore_translate_addr(wl, addr), val);
 }
 
-static inline void wl1271_write32(struct wl1271 *wl, int addr, u32 val)
+static inline int __must_check wlcore_write32(struct wl1271 *wl, int addr,
+                                              u32 val)
 {
-        wl1271_raw_write32(wl, wlcore_translate_addr(wl, addr), val);
+        return wlcore_raw_write32(wl, wlcore_translate_addr(wl, addr), val);
 }
 
-static inline u32 wlcore_read_reg(struct wl1271 *wl, int reg)
+static inline int __must_check wlcore_read_reg(struct wl1271 *wl, int reg,
+                                               u32 *val)
 {
-        return wl1271_raw_read32(wl,
-                                 wlcore_translate_addr(wl, wl->rtable[reg]));
+        return wlcore_raw_read32(wl,
+                                 wlcore_translate_addr(wl, wl->rtable[reg]),
+                                 val);
 }
 
-static inline void wlcore_write_reg(struct wl1271 *wl, int reg, u32 val)
+static inline int __must_check wlcore_write_reg(struct wl1271 *wl, int reg,
+                                                u32 val)
 {
-        wl1271_raw_write32(wl, wlcore_translate_addr(wl, wl->rtable[reg]), val);
+        return wlcore_raw_write32(wl,
+                                  wlcore_translate_addr(wl, wl->rtable[reg]),
+                                  val);
 }
 
 static inline void wl1271_power_off(struct wl1271 *wl)
 {
-        wl->if_ops->power(wl->dev, false);
-        clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
+        int ret;
+
+        if (!test_bit(WL1271_FLAG_GPIO_POWER, &wl->flags))
+                return;
+
+        ret = wl->if_ops->power(wl->dev, false);
+        if (!ret)
+                clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
 }
 
 static inline int wl1271_power_on(struct wl1271 *wl)
@@ -173,8 +221,8 @@ static inline int wl1271_power_on(struct wl1271 *wl)
         return ret;
 }
 
-void wlcore_set_partition(struct wl1271 *wl,
-                          const struct wlcore_partition_set *p);
+int wlcore_set_partition(struct wl1271 *wl,
+                         const struct wlcore_partition_set *p);
 
 bool wl1271_set_block_size(struct wl1271 *wl);
 
@@ -182,6 +230,4 @@ bool wl1271_set_block_size(struct wl1271 *wl);
 
 int wl1271_tx_dummy_packet(struct wl1271 *wl);
 
-void wlcore_select_partition(struct wl1271 *wl, u8 part);
-
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 1156e3f578c1..2240cca597ac 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -378,9 +378,9 @@ static void wl12xx_irq_update_links_status(struct wl1271 *wl,
         }
 }
 
-static void wl12xx_fw_status(struct wl1271 *wl,
-                             struct wl_fw_status_1 *status_1,
-                             struct wl_fw_status_2 *status_2)
+static int wlcore_fw_status(struct wl1271 *wl,
+                            struct wl_fw_status_1 *status_1,
+                            struct wl_fw_status_2 *status_2)
 {
         struct wl12xx_vif *wlvif;
         struct timespec ts;
@@ -388,12 +388,15 @@ static void wl12xx_fw_status(struct wl1271 *wl,
         int avail, freed_blocks;
         int i;
         size_t status_len;
+        int ret;
 
         status_len = WLCORE_FW_STATUS_1_LEN(wl->num_rx_desc) +
                 sizeof(*status_2) + wl->fw_status_priv_len;
 
-        wlcore_raw_read_data(wl, REG_RAW_FW_STATUS_ADDR, status_1,
-                             status_len, false);
+        ret = wlcore_raw_read_data(wl, REG_RAW_FW_STATUS_ADDR, status_1,
+                                   status_len, false);
+        if (ret < 0)
+                return ret;
 
         wl1271_debug(DEBUG_IRQ, "intr: 0x%x (fw_rx_counter = %d, "
                      "drv_rx_counter = %d, tx_results_counter = %d)",
@@ -462,6 +465,8 @@ static void wl12xx_fw_status(struct wl1271 *wl,
         getnstimeofday(&ts);
         wl->time_offset = (timespec_to_ns(&ts) >> 10) -
                 (s64)le32_to_cpu(status_2->fw_localtime);
+
+        return 0;
 }
 
 static void wl1271_flush_deferred_work(struct wl1271 *wl)
@@ -489,20 +494,15 @@ static void wl1271_netstack_work(struct work_struct *work)
 
 #define WL1271_IRQ_MAX_LOOPS 256
 
-static irqreturn_t wl1271_irq(int irq, void *cookie)
+static int wlcore_irq_locked(struct wl1271 *wl)
 {
-        int ret;
+        int ret = 0;
         u32 intr;
         int loopcount = WL1271_IRQ_MAX_LOOPS;
-        struct wl1271 *wl = (struct wl1271 *)cookie;
         bool done = false;
         unsigned int defer_count;
         unsigned long flags;
 
-        /* TX might be handled here, avoid redundant work */
-        set_bit(WL1271_FLAG_TX_PENDING, &wl->flags);
-        cancel_work_sync(&wl->tx_work);
-
         /*
          * In case edge triggered interrupt must be used, we cannot iterate
          * more than once without introducing race conditions with the hardirq.
@@ -510,8 +510,6 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
         if (wl->platform_quirks & WL12XX_PLATFORM_QUIRK_EDGE_IRQ)
                 loopcount = 1;
 
-        mutex_lock(&wl->mutex);
-
         wl1271_debug(DEBUG_IRQ, "IRQ work");
 
         if (unlikely(wl->state == WL1271_STATE_OFF))
@@ -530,7 +528,9 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                 clear_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags);
                 smp_mb__after_clear_bit();
 
-                wl12xx_fw_status(wl, wl->fw_status_1, wl->fw_status_2);
+                ret = wlcore_fw_status(wl, wl->fw_status_1, wl->fw_status_2);
+                if (ret < 0)
+                        goto out;
 
                 wlcore_hw_tx_immediate_compl(wl);
 
@@ -544,7 +544,7 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                 if (unlikely(intr & WL1271_ACX_INTR_WATCHDOG)) {
                         wl1271_error("HW watchdog interrupt received! starting recovery.");
                         wl->watchdog_recovery = true;
-                        wl12xx_queue_recovery_work(wl);
+                        ret = -EIO;
 
                         /* restarting the chip. ignore any other interrupt. */
                         goto out;
@@ -554,7 +554,7 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                         wl1271_error("SW watchdog interrupt received! "
                                      "starting recovery.");
                         wl->watchdog_recovery = true;
-                        wl12xx_queue_recovery_work(wl);
+                        ret = -EIO;
 
                         /* restarting the chip. ignore any other interrupt. */
                         goto out;
@@ -563,7 +563,9 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                 if (likely(intr & WL1271_ACX_INTR_DATA)) {
                         wl1271_debug(DEBUG_IRQ, "WL1271_ACX_INTR_DATA");
 
-                        wl12xx_rx(wl, wl->fw_status_1);
+                        ret = wlcore_rx(wl, wl->fw_status_1);
+                        if (ret < 0)
+                                goto out;
 
                         /* Check if any tx blocks were freed */
                         spin_lock_irqsave(&wl->wl_lock, flags);
@@ -574,13 +576,17 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
                                  * In order to avoid starvation of the TX path,
                                  * call the work function directly.
                                  */
-                                wl1271_tx_work_locked(wl);
+                                ret = wlcore_tx_work_locked(wl);
+                                if (ret < 0)
+                                        goto out;
                         } else {
                                 spin_unlock_irqrestore(&wl->wl_lock, flags);
                         }
 
                         /* check for tx results */
-                        wlcore_hw_tx_delayed_compl(wl);
+                        ret = wlcore_hw_tx_delayed_compl(wl);
+                        if (ret < 0)
+                                goto out;
 
                         /* Make sure the deferred queues don't get too long */
                         defer_count = skb_queue_len(&wl->deferred_tx_queue) +
@@ -591,12 +597,16 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
 
                 if (intr & WL1271_ACX_INTR_EVENT_A) {
                         wl1271_debug(DEBUG_IRQ, "WL1271_ACX_INTR_EVENT_A");
-                        wl1271_event_handle(wl, 0);
+                        ret = wl1271_event_handle(wl, 0);
+                        if (ret < 0)
+                                goto out;
                 }
 
                 if (intr & WL1271_ACX_INTR_EVENT_B) {
                         wl1271_debug(DEBUG_IRQ, "WL1271_ACX_INTR_EVENT_B");
-                        wl1271_event_handle(wl, 1);
+                        ret = wl1271_event_handle(wl, 1);
+                        if (ret < 0)
+                                goto out;
                 }
 
                 if (intr & WL1271_ACX_INTR_INIT_COMPLETE)
@@ -610,6 +620,25 @@ static irqreturn_t wl1271_irq(int irq, void *cookie)
         wl1271_ps_elp_sleep(wl);
 
 out:
+        return ret;
+}
+
+static irqreturn_t wlcore_irq(int irq, void *cookie)
+{
+        int ret;
+        unsigned long flags;
+        struct wl1271 *wl = cookie;
+
+        /* TX might be handled here, avoid redundant work */
+        set_bit(WL1271_FLAG_TX_PENDING, &wl->flags);
+        cancel_work_sync(&wl->tx_work);
+
+        mutex_lock(&wl->mutex);
+
+        ret = wlcore_irq_locked(wl);
+        if (ret)
+                wl12xx_queue_recovery_work(wl);
+
         spin_lock_irqsave(&wl->wl_lock, flags);
         /* In case TX was not handled here, queue TX work */
         clear_bit(WL1271_FLAG_TX_PENDING, &wl->flags);
@@ -743,8 +772,13 @@ out:
 
 void wl12xx_queue_recovery_work(struct wl1271 *wl)
 {
-        if (!test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags))
+        WARN_ON(!test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags));
+
+        /* Avoid a recursive recovery */
+        if (!test_and_set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags)) {
+                wlcore_disable_interrupts_nosync(wl);
                 ieee80211_queue_work(wl->hw, &wl->recovery_work);
+        }
 }
 
 size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen)
@@ -770,14 +804,17 @@ size_t wl12xx_copy_fwlog(struct wl1271 *wl, u8 *memblock, size_t maxlen)
         return len;
 }
 
+#define WLCORE_FW_LOG_END 0x2000000
+
 static void wl12xx_read_fwlog_panic(struct wl1271 *wl)
 {
         u32 addr;
-        u32 first_addr;
+        u32 offset;
+        u32 end_of_log;
         u8 *block;
+        int ret;
 
         if ((wl->quirks & WLCORE_QUIRK_FWLOG_NOT_IMPLEMENTED) ||
-            (wl->conf.fwlog.mode != WL12XX_FWLOG_ON_DEMAND) ||
             (wl->conf.fwlog.mem_blocks == 0))
                 return;
 
@@ -791,34 +828,47 @@ static void wl12xx_read_fwlog_panic(struct wl1271 *wl)
          * Make sure the chip is awake and the logger isn't active.
          * Do not send a stop fwlog command if the fw is hanged.
          */
-        if (!wl1271_ps_elp_wakeup(wl) && !wl->watchdog_recovery)
-                wl12xx_cmd_stop_fwlog(wl);
-        else
+        if (wl1271_ps_elp_wakeup(wl))
                 goto out;
+        if (!wl->watchdog_recovery)
+                wl12xx_cmd_stop_fwlog(wl);
 
         /* Read the first memory block address */
-        wl12xx_fw_status(wl, wl->fw_status_1, wl->fw_status_2);
-        first_addr = le32_to_cpu(wl->fw_status_2->log_start_addr);
-        if (!first_addr)
+        ret = wlcore_fw_status(wl, wl->fw_status_1, wl->fw_status_2);
+        if (ret < 0)
+                goto out;
+
+        addr = le32_to_cpu(wl->fw_status_2->log_start_addr);
+        if (!addr)
                 goto out;
 
+        if (wl->conf.fwlog.mode == WL12XX_FWLOG_CONTINUOUS) {
+                offset = sizeof(addr) + sizeof(struct wl1271_rx_descriptor);
+                end_of_log = WLCORE_FW_LOG_END;
+        } else {
+                offset = sizeof(addr);
+                end_of_log = addr;
+        }
+
         /* Traverse the memory blocks linked list */
-        addr = first_addr;
         do {
                 memset(block, 0, WL12XX_HW_BLOCK_SIZE);
-                wl1271_read_hwaddr(wl, addr, block, WL12XX_HW_BLOCK_SIZE,
-                                   false);
+                ret = wlcore_read_hwaddr(wl, addr, block, WL12XX_HW_BLOCK_SIZE,
+                                         false);
+                if (ret < 0)
+                        goto out;
 
                 /*
                  * Memory blocks are linked to one another. The first 4 bytes
                  * of each memory block hold the hardware address of the next
-                 * one. The last memory block points to the first one.
+                 * one. The last memory block points to the first one in
+                 * on demand mode and is equal to 0x2000000 in continuous mode.
                  */
                 addr = le32_to_cpup((__le32 *)block);
-                if (!wl12xx_copy_fwlog(wl, block + sizeof(addr),
-                                       WL12XX_HW_BLOCK_SIZE - sizeof(addr)))
+                if (!wl12xx_copy_fwlog(wl, block + offset,
+                                       WL12XX_HW_BLOCK_SIZE - offset))
                         break;
-        } while (addr && (addr != first_addr));
+        } while (addr && (addr != end_of_log));
 
         wake_up_interruptible(&wl->fwlog_waitq);
 
@@ -826,6 +876,34 @@ out:
         kfree(block);
 }
 
+static void wlcore_print_recovery(struct wl1271 *wl)
+{
+        u32 pc = 0;
+        u32 hint_sts = 0;
+        int ret;
+
+        wl1271_info("Hardware recovery in progress. FW ver: %s",
+                    wl->chip.fw_ver_str);
+
+        /* change partitions momentarily so we can read the FW pc */
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                return;
+
+        ret = wlcore_read_reg(wl, REG_PC_ON_RECOVERY, &pc);
+        if (ret < 0)
+                return;
+
+        ret = wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR, &hint_sts);
+        if (ret < 0)
+                return;
+
+        wl1271_info("pc: 0x%x, hint_sts: 0x%08x", pc, hint_sts);
+
+        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+}
+
+
 static void wl1271_recovery_work(struct work_struct *work)
 {
         struct wl1271 *wl =
@@ -838,19 +916,9 @@ static void wl1271_recovery_work(struct work_struct *work)
         if (wl->state != WL1271_STATE_ON || wl->plt)
                 goto out_unlock;
 
-        /* Avoid a recursive recovery */
-        set_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
-
         wl12xx_read_fwlog_panic(wl);
 
-        /* change partitions momentarily so we can read the FW pc */
-        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
-        wl1271_info("Hardware recovery in progress. FW ver: %s pc: 0x%x "
-                    "hint_sts: 0x%08x",
-                    wl->chip.fw_ver_str,
-                    wlcore_read_reg(wl, REG_PC_ON_RECOVERY),
-                    wlcore_read_reg(wl, REG_INTERRUPT_NO_CLEAR));
-        wlcore_set_partition(wl, &wl->ptable[PART_WORK]);
+        wlcore_print_recovery(wl);
 
         BUG_ON(bug_on_recovery &&
                !test_bit(WL1271_FLAG_INTENDED_FW_RECOVERY, &wl->flags));
@@ -892,8 +960,6 @@ static void wl1271_recovery_work(struct work_struct *work)
         mutex_unlock(&wl->mutex);
         wl1271_op_stop(wl->hw);
 
-        clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags);
-
         ieee80211_restart_hw(wl->hw);
 
         /*
@@ -907,9 +973,9 @@ out_unlock:
         mutex_unlock(&wl->mutex);
 }
 
-static void wl1271_fw_wakeup(struct wl1271 *wl)
+static int wlcore_fw_wakeup(struct wl1271 *wl)
 {
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
+        return wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
 }
 
 static int wl1271_setup(struct wl1271 *wl)
@@ -945,13 +1011,21 @@ static int wl12xx_set_power_on(struct wl1271 *wl)
         wl1271_io_reset(wl);
         wl1271_io_init(wl);
 
-        wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        ret = wlcore_set_partition(wl, &wl->ptable[PART_BOOT]);
+        if (ret < 0)
+                goto fail;
 
         /* ELP module wake up */
-        wl1271_fw_wakeup(wl);
+        ret = wlcore_fw_wakeup(wl);
+        if (ret < 0)
+                goto fail;
 
 out:
         return ret;
+
+fail:
+        wl1271_power_off(wl);
+        return ret;
 }
 
 static int wl12xx_chip_wakeup(struct wl1271 *wl, bool plt)
@@ -1082,6 +1156,7 @@ int wl1271_plt_stop(struct wl1271 *wl)
         mutex_lock(&wl->mutex);
         wl1271_power_off(wl);
         wl->flags = 0;
+        wl->sleep_auth = WL1271_PSM_ILLEGAL;
         wl->state = WL1271_STATE_OFF;
         wl->plt = false;
         wl->rx_counter = 0;
@@ -1173,7 +1248,7 @@ int wl1271_tx_dummy_packet(struct wl1271 *wl)
 
         /* The FW is low on RX memory blocks, so send the dummy packet asap */
         if (!test_bit(WL1271_FLAG_FW_TX_BUSY, &wl->flags))
-                wl1271_tx_work_locked(wl);
+                return wlcore_tx_work_locked(wl);
 
         /*
          * If the FW TX is busy, TX work will be scheduled by the threaded
@@ -1440,8 +1515,15 @@ static int wl1271_configure_wowlan(struct wl1271 *wl,
         int i, ret;
 
         if (!wow || wow->any || !wow->n_patterns) {
-                wl1271_acx_default_rx_filter_enable(wl, 0, FILTER_SIGNAL);
-                wl1271_rx_filter_clear_all(wl);
+                ret = wl1271_acx_default_rx_filter_enable(wl, 0,
+                                                          FILTER_SIGNAL);
+                if (ret)
+                        goto out;
+
+                ret = wl1271_rx_filter_clear_all(wl);
+                if (ret)
+                        goto out;
+
                 return 0;
         }
 
@@ -1457,8 +1539,13 @@ static int wl1271_configure_wowlan(struct wl1271 *wl,
                 }
         }
 
-        wl1271_acx_default_rx_filter_enable(wl, 0, FILTER_SIGNAL);
-        wl1271_rx_filter_clear_all(wl);
+        ret = wl1271_acx_default_rx_filter_enable(wl, 0, FILTER_SIGNAL);
+        if (ret)
+                goto out;
+
+        ret = wl1271_rx_filter_clear_all(wl);
+        if (ret)
+                goto out;
 
         /* Translate WoWLAN patterns into filters */
         for (i = 0; i < wow->n_patterns; i++) {
@@ -1500,7 +1587,10 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
         if (ret < 0)
                 goto out;
 
-        wl1271_configure_wowlan(wl, wow);
+        ret = wl1271_configure_wowlan(wl, wow);
+        if (ret < 0)
+                goto out_sleep;
+
         ret = wl1271_acx_wake_up_conditions(wl, wlvif,
                                     wl->conf.conn.suspend_wake_up_event,
                                     wl->conf.conn.suspend_listen_interval);
@@ -1508,8 +1598,8 @@ static int wl1271_configure_suspend_sta(struct wl1271 *wl,
         if (ret < 0)
                 wl1271_error("suspend: set wake up conditions failed: %d", ret);
 
+out_sleep:
         wl1271_ps_elp_sleep(wl);
-
 out:
         return ret;
 
@@ -1588,6 +1678,12 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
         wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow);
         WARN_ON(!wow);
 
+        /* we want to perform the recovery before suspending */
+        if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags)) {
+                wl1271_warning("postponing suspend to perform recovery");
+                return -EBUSY;
+        }
+
         wl1271_tx_flush(wl);
 
         mutex_lock(&wl->mutex);
@@ -1628,7 +1724,8 @@ static int wl1271_op_resume(struct ieee80211_hw *hw)
         struct wl1271 *wl = hw->priv;
         struct wl12xx_vif *wlvif;
         unsigned long flags;
-        bool run_irq_work = false;
+        bool run_irq_work = false, pending_recovery;
+        int ret;
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 resume wow=%d",
                      wl->wow_enabled);
@@ -1644,17 +1741,37 @@ static int wl1271_op_resume(struct ieee80211_hw *hw)
                 run_irq_work = true;
         spin_unlock_irqrestore(&wl->wl_lock, flags);
 
+        mutex_lock(&wl->mutex);
+
+        /* test the recovery flag before calling any SDIO functions */
+        pending_recovery = test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS,
+                                    &wl->flags);
+
         if (run_irq_work) {
                 wl1271_debug(DEBUG_MAC80211,
                              "run postponed irq_work directly");
-                wl1271_irq(0, wl);
+
+                /* don't talk to the HW if recovery is pending */
+                if (!pending_recovery) {
+                        ret = wlcore_irq_locked(wl);
+                        if (ret)
+                                wl12xx_queue_recovery_work(wl);
+                }
+
                 wlcore_enable_interrupts(wl);
         }
 
-        mutex_lock(&wl->mutex);
+        if (pending_recovery) {
+                wl1271_warning("queuing forgotten recovery on resume");
+                ieee80211_queue_work(wl->hw, &wl->recovery_work);
+                goto out;
+        }
+
         wl12xx_for_each_wlvif(wl, wlvif) {
                 wl1271_configure_resume(wl, wlvif);
         }
+
+out:
         wl->wow_enabled = false;
         mutex_unlock(&wl->mutex);
 
@@ -1695,6 +1812,10 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
         wlcore_disable_interrupts(wl);
         mutex_lock(&wl->mutex);
         if (wl->state == WL1271_STATE_OFF) {
+                if (test_and_clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS,
+                                        &wl->flags))
+                        wlcore_enable_interrupts(wl);
+
                 mutex_unlock(&wl->mutex);
 
                 /*
@@ -1726,6 +1847,13 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
         mutex_lock(&wl->mutex);
 
         wl1271_power_off(wl);
+        /*
+         * In case a recovery was scheduled, interrupts were disabled to avoid
+         * an interrupt storm. Now that the power is down, it is safe to
+         * re-enable interrupts to balance the disable depth
+         */
+        if (test_and_clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags))
+                wlcore_enable_interrupts(wl);
 
         wl->band = IEEE80211_BAND_2GHZ;
 
@@ -1740,6 +1868,7 @@ static void wl1271_op_stop(struct ieee80211_hw *hw)
         wl->ap_fw_ps_map = 0;
         wl->ap_ps_map = 0;
         wl->sched_scanning = false;
+        wl->sleep_auth = WL1271_PSM_ILLEGAL;
         memset(wl->roles_map, 0, sizeof(wl->roles_map));
         memset(wl->links_map, 0, sizeof(wl->links_map));
         memset(wl->roc_map, 0, sizeof(wl->roc_map));
@@ -2146,6 +2275,7 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl,
 {
         struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
         int i, ret;
+        bool is_ap = (wlvif->bss_type == BSS_TYPE_AP_BSS);
 
         wl1271_debug(DEBUG_MAC80211, "mac80211 remove interface");
 
@@ -2226,11 +2356,25 @@ deinit:
         wlvif->role_id = WL12XX_INVALID_ROLE_ID;
         wlvif->dev_role_id = WL12XX_INVALID_ROLE_ID;
 
-        if (wlvif->bss_type == BSS_TYPE_AP_BSS)
+        if (is_ap)
                 wl->ap_count--;
         else
                 wl->sta_count--;
 
+        /* Last AP, have more stations. Configure according to STA. */
+        if (wl->ap_count == 0 && is_ap && wl->sta_count) {
+                u8 sta_auth = wl->conf.conn.sta_sleep_auth;
+                /* Configure for power according to debugfs */
+                if (sta_auth != WL1271_PSM_ILLEGAL)
+                        wl1271_acx_sleep_auth(wl, sta_auth);
+                /* Configure for power always on */
+                else if (wl->quirks & WLCORE_QUIRK_NO_ELP)
+                        wl1271_acx_sleep_auth(wl, WL1271_PSM_CAM);
+                /* Configure for ELP power saving */
+                else
+                        wl1271_acx_sleep_auth(wl, WL1271_PSM_ELP);
+        }
+
         mutex_unlock(&wl->mutex);
 
         del_timer_sync(&wlvif->rx_streaming_timer);
@@ -2448,12 +2592,16 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif,
              (wlvif->channel != channel) ||
              (wlvif->channel_type != conf->channel_type))) {
                 /* send all pending packets */
-                wl1271_tx_work_locked(wl);
+                ret = wlcore_tx_work_locked(wl);
+                if (ret < 0)
+                        return ret;
+
                 wlvif->band = conf->channel->band;
                 wlvif->channel = channel;
                 wlvif->channel_type = conf->channel_type;
 
                 if (is_ap) {
+                        wl1271_set_band_rate(wl, wlvif);
                         ret = wl1271_init_ap_rates(wl, wlvif);
                         if (ret < 0)
                                 wl1271_error("AP rate policy change failed %d",
@@ -4090,16 +4238,13 @@ out:
 static int wl1271_op_get_survey(struct ieee80211_hw *hw, int idx,
                                 struct survey_info *survey)
 {
-        struct wl1271 *wl = hw->priv;
         struct ieee80211_conf *conf = &hw->conf;
 
         if (idx != 0)
                 return -ENOENT;
 
         survey->channel = conf->channel;
-        survey->filled = SURVEY_INFO_NOISE_DBM;
-        survey->noise = wl->noise;
-
+        survey->filled = 0;
         return 0;
 }
 
@@ -4365,9 +4510,14 @@ static int wl1271_op_ampdu_action(struct ieee80211_hw *hw,
 
         case IEEE80211_AMPDU_RX_STOP:
                 if (!(*ba_bitmap & BIT(tid))) {
-                        ret = -EINVAL;
-                        wl1271_error("no active RX BA session on tid: %d",
+                        /*
+                         * this happens on reconfig - so only output a debug
+                         * message for now, and don't fail the function.
+                         */
+                        wl1271_debug(DEBUG_MAC80211,
+                                     "no active RX BA session on tid: %d",
                                      tid);
+                        ret = 0;
                         break;
                 }
 
@@ -4904,18 +5054,22 @@ static int wl12xx_get_hw_info(struct wl1271 *wl)
         if (ret < 0)
                 goto out;
 
-        wl->chip.id = wlcore_read_reg(wl, REG_CHIP_ID_B);
+        ret = wlcore_read_reg(wl, REG_CHIP_ID_B, &wl->chip.id);
+        if (ret < 0)
+                goto out;
 
         wl->fuse_oui_addr = 0;
         wl->fuse_nic_addr = 0;
 
-        wl->hw_pg_ver = wl->ops->get_pg_ver(wl);
+        ret = wl->ops->get_pg_ver(wl, &wl->hw_pg_ver);
+        if (ret < 0)
+                goto out;
 
         if (wl->ops->get_mac)
-                wl->ops->get_mac(wl);
+                ret = wl->ops->get_mac(wl);
 
-        wl1271_power_off(wl);
 out:
+        wl1271_power_off(wl);
         return ret;
 }
 
@@ -4976,6 +5130,29 @@ static void wl1271_unregister_hw(struct wl1271 *wl)
 
 }
 
+static const struct ieee80211_iface_limit wlcore_iface_limits[] = {
+        {
+                .max = 2,
+                .types = BIT(NL80211_IFTYPE_STATION),
+        },
+        {
+                .max = 1,
+                .types = BIT(NL80211_IFTYPE_AP) |
+                         BIT(NL80211_IFTYPE_P2P_GO) |
+                         BIT(NL80211_IFTYPE_P2P_CLIENT),
+        },
+};
+
+static const struct ieee80211_iface_combination
+wlcore_iface_combinations[] = {
+        {
+          .num_different_channels = 1,
+          .max_interfaces = 2,
+          .limits = wlcore_iface_limits,
+          .n_limits = ARRAY_SIZE(wlcore_iface_limits),
+        },
+};
+
 static int wl1271_init_ieee80211(struct wl1271 *wl)
 {
         static const u32 cipher_suites[] = {
@@ -5069,6 +5246,11 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
                 NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |
                 NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P;
 
+        /* allowed interface combinations */
+        wl->hw->wiphy->iface_combinations = wlcore_iface_combinations;
+        wl->hw->wiphy->n_iface_combinations =
+                ARRAY_SIZE(wlcore_iface_combinations);
+
         SET_IEEE80211_DEV(wl->hw, wl->dev);
 
         wl->hw->sta_data_size = sizeof(struct wl1271_station);
@@ -5140,6 +5322,7 @@ struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size)
         wl->channel_type = NL80211_CHAN_NO_HT;
         wl->flags = 0;
         wl->sg_enabled = true;
+        wl->sleep_auth = WL1271_PSM_ILLEGAL;
         wl->hw_pg_ver = -1;
         wl->ap_ps_map = 0;
         wl->ap_fw_ps_map = 0;
@@ -5313,7 +5496,7 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
         else
                 irqflags = IRQF_TRIGGER_HIGH | IRQF_ONESHOT;
 
-        ret = request_threaded_irq(wl->irq, wl12xx_hardirq, wl1271_irq,
+        ret = request_threaded_irq(wl->irq, wl12xx_hardirq, wlcore_irq,
                                    irqflags,
                                    pdev->name, wl);
         if (ret < 0) {
@@ -5339,12 +5522,12 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
         ret = wl12xx_get_hw_info(wl);
         if (ret < 0) {
                 wl1271_error("couldn't get hw info");
-                goto out;
+                goto out_irq;
         }
 
         ret = wl->ops->identify_chip(wl);
         if (ret < 0)
-                goto out;
+                goto out_irq;
 
         ret = wl1271_init_ieee80211(wl);
         if (ret)
@@ -5358,7 +5541,7 @@ int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev)
         ret = device_create_file(wl->dev, &dev_attr_bt_coex_state);
         if (ret < 0) {
                 wl1271_error("failed to create sysfs file bt_coex_state");
-                goto out_irq;
+                goto out_unreg;
         }
 
         /* Create sysfs file to get HW PG version */
@@ -5383,6 +5566,9 @@ out_hw_pg_ver:
 out_bt_coex_state:
         device_remove_file(wl->dev, &dev_attr_bt_coex_state);
 
+out_unreg:
+        wl1271_unregister_hw(wl);
+
 out_irq:
         free_irq(wl->irq, wl);
 
diff --git a/drivers/net/wireless/ti/wlcore/ps.c b/drivers/net/wireless/ti/wlcore/ps.c
index 47e81b32f7da..46d36fd30eba 100644
--- a/drivers/net/wireless/ti/wlcore/ps.c
+++ b/drivers/net/wireless/ti/wlcore/ps.c
@@ -35,6 +35,7 @@ void wl1271_elp_work(struct work_struct *work)
         struct delayed_work *dwork;
         struct wl1271 *wl;
         struct wl12xx_vif *wlvif;
+        int ret;
 
         dwork = container_of(work, struct delayed_work, work);
         wl = container_of(dwork, struct wl1271, elp_work);
@@ -63,7 +64,12 @@ void wl1271_elp_work(struct work_struct *work)
         }
 
         wl1271_debug(DEBUG_PSM, "chip to elp");
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP);
+        ret = wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_SLEEP);
+        if (ret < 0) {
+                wl12xx_queue_recovery_work(wl);
+                goto out;
+        }
+
         set_bit(WL1271_FLAG_IN_ELP, &wl->flags);
 
 out:
@@ -76,7 +82,7 @@ void wl1271_ps_elp_sleep(struct wl1271 *wl)
         struct wl12xx_vif *wlvif;
         u32 timeout;
 
-        if (wl->quirks & WLCORE_QUIRK_NO_ELP)
+        if (wl->sleep_auth != WL1271_PSM_ELP)
                 return;
 
         /* we shouldn't get consecutive sleep requests */
@@ -135,7 +141,11 @@ int wl1271_ps_elp_wakeup(struct wl1271 *wl)
                 wl->elp_compl = &compl;
         spin_unlock_irqrestore(&wl->wl_lock, flags);
 
-        wl1271_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
+        ret = wlcore_raw_write32(wl, HW_ACCESS_ELP_CTRL_REG, ELPCTRL_WAKE_UP);
+        if (ret < 0) {
+                wl12xx_queue_recovery_work(wl);
+                goto err;
+        }
 
         if (!pending) {
                 ret = wait_for_completion_timeout(
diff --git a/drivers/net/wireless/ti/wlcore/rx.c b/drivers/net/wireless/ti/wlcore/rx.c
index 78200dcacfca..f55e2f9e7ac5 100644
--- a/drivers/net/wireless/ti/wlcore/rx.c
+++ b/drivers/net/wireless/ti/wlcore/rx.c
@@ -127,7 +127,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
         }
 
         if (rx_align == WLCORE_RX_BUF_UNALIGNED)
-                reserved = NET_IP_ALIGN;
+                reserved = RX_BUF_ALIGN;
 
         /* the data read starts with the descriptor */
         desc = (struct wl1271_rx_descriptor *) data;
@@ -175,7 +175,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
          */
         memcpy(buf, data + sizeof(*desc), pkt_data_len);
         if (rx_align == WLCORE_RX_BUF_PADDED)
-                skb_pull(skb, NET_IP_ALIGN);
+                skb_pull(skb, RX_BUF_ALIGN);
 
         *hlid = desc->hlid;
 
@@ -200,7 +200,7 @@ static int wl1271_rx_handle_data(struct wl1271 *wl, u8 *data, u32 length,
         return is_data;
 }
 
-void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status_1 *status)
+int wlcore_rx(struct wl1271 *wl, struct wl_fw_status_1 *status)
 {
         unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};
         u32 buf_size;
@@ -211,6 +211,7 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status_1 *status)
         u32 pkt_offset, des;
         u8 hlid;
         enum wl_rx_buf_align rx_align;
+        int ret = 0;
 
         while (drv_rx_counter != fw_rx_counter) {
                 buf_size = 0;
@@ -234,9 +235,14 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status_1 *status)
 
                 /* Read all available packets at once */
                 des = le32_to_cpu(status->rx_pkt_descs[drv_rx_counter]);
-                wlcore_hw_prepare_read(wl, des, buf_size);
-                wlcore_read_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
-                                 buf_size, true);
+                ret = wlcore_hw_prepare_read(wl, des, buf_size);
+                if (ret < 0)
+                        goto out;
+
+                ret = wlcore_read_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
+                                       buf_size, true);
+                if (ret < 0)
+                        goto out;
 
                 /* Split data into separate packets */
                 pkt_offset = 0;
@@ -273,11 +279,17 @@ void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status_1 *status)
          * Write the driver's packet counter to the FW. This is only required
          * for older hardware revisions
          */
-        if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION)
-                wl1271_write32(wl, WL12XX_REG_RX_DRIVER_COUNTER,
-                               wl->rx_counter);
+        if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION) {
+                ret = wlcore_write32(wl, WL12XX_REG_RX_DRIVER_COUNTER,
+                                     wl->rx_counter);
+                if (ret < 0)
+                        goto out;
+        }
 
         wl12xx_rearm_rx_streaming(wl, active_hlids);
+
+out:
+        return ret;
 }
 
 #ifdef CONFIG_PM
@@ -306,14 +318,19 @@ int wl1271_rx_filter_enable(struct wl1271 *wl,
         return 0;
 }
 
-void wl1271_rx_filter_clear_all(struct wl1271 *wl)
+int wl1271_rx_filter_clear_all(struct wl1271 *wl)
 {
-        int i;
+        int i, ret = 0;
 
         for (i = 0; i < WL1271_MAX_RX_FILTERS; i++) {
                 if (!wl->rx_filter_enabled[i])
                         continue;
-                wl1271_rx_filter_enable(wl, i, 0, NULL);
+                ret = wl1271_rx_filter_enable(wl, i, 0, NULL);
+                if (ret)
+                        goto out;
         }
+
+out:
+        return ret;
 }
 #endif /* CONFIG_PM */
diff --git a/drivers/net/wireless/ti/wlcore/rx.h b/drivers/net/wireless/ti/wlcore/rx.h
index 9be780179456..71eba1899915 100644
--- a/drivers/net/wireless/ti/wlcore/rx.h
+++ b/drivers/net/wireless/ti/wlcore/rx.h
@@ -103,6 +103,12 @@
 /* If set, the buffer was padded by the FW to be 4 bytes aligned */
 #define RX_BUF_PADDED_PAYLOAD        BIT(30)
 
+/*
+ * Account for the padding inserted by the FW in case of RX_ALIGNMENT
+ * or for fixing alignment in case the packet wasn't aligned.
+ */
+#define RX_BUF_ALIGN                 2
+
 /* Describes the alignment state of a Rx buffer */
 enum wl_rx_buf_align {
         WLCORE_RX_BUF_ALIGNED,
@@ -137,11 +143,11 @@ struct wl1271_rx_descriptor {
         u8  reserved;
 } __packed;
 
-void wl12xx_rx(struct wl1271 *wl, struct wl_fw_status_1 *status);
+int wlcore_rx(struct wl1271 *wl, struct wl_fw_status_1 *status);
 u8 wl1271_rate_to_idx(int rate, enum ieee80211_band band);
 int wl1271_rx_filter_enable(struct wl1271 *wl,
                             int index, bool enable,
                             struct wl12xx_rx_filter *filter);
-void wl1271_rx_filter_clear_all(struct wl1271 *wl);
+int wl1271_rx_filter_clear_all(struct wl1271 *wl);
 
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index c67ec482e445..204e69fa9327 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -71,8 +71,8 @@ static void wl1271_sdio_set_block_size(struct device *child,
         sdio_release_host(func);
 }
 
-static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,
-                                 size_t len, bool fixed)
+static int __must_check wl12xx_sdio_raw_read(struct device *child, int addr,
+                                             void *buf, size_t len, bool fixed)
 {
         int ret;
         struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
@@ -103,12 +103,14 @@ static void wl12xx_sdio_raw_read(struct device *child, int addr, void *buf,
 
         sdio_release_host(func);
 
-        if (ret)
+        if (WARN_ON(ret))
                 dev_err(child->parent, "sdio read failed (%d)\n", ret);
+
+        return ret;
 }
 
-static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,
-                                  size_t len, bool fixed)
+static int __must_check wl12xx_sdio_raw_write(struct device *child, int addr,
+                                              void *buf, size_t len, bool fixed)
 {
         int ret;
         struct wl12xx_sdio_glue *glue = dev_get_drvdata(child->parent);
@@ -139,25 +141,30 @@ static void wl12xx_sdio_raw_write(struct device *child, int addr, void *buf,
 
         sdio_release_host(func);
 
-        if (ret)
+        if (WARN_ON(ret))
                 dev_err(child->parent, "sdio write failed (%d)\n", ret);
+
+        return ret;
 }
 
 static int wl12xx_sdio_power_on(struct wl12xx_sdio_glue *glue)
 {
         int ret;
         struct sdio_func *func = dev_to_sdio_func(glue->dev);
+        struct mmc_card *card = func->card;
 
-        /* If enabled, tell runtime PM not to power off the card */
-        if (pm_runtime_enabled(&func->dev)) {
-                ret = pm_runtime_get_sync(&func->dev);
-                if (ret < 0)
-                        goto out;
-        } else {
-                /* Runtime PM is disabled: power up the card manually */
-                ret = mmc_power_restore_host(func->card->host);
-                if (ret < 0)
+        ret = pm_runtime_get_sync(&card->dev);
+        if (ret) {
+                /*
+                 * Runtime PM might be temporarily disabled, or the device
+                 * might have a positive reference counter. Make sure it is
+                 * really powered on.
+                 */
+                ret = mmc_power_restore_host(card->host);
+                if (ret < 0) {
+                        pm_runtime_put_sync(&card->dev);
                         goto out;
+                }
         }
 
         sdio_claim_host(func);
@@ -172,20 +179,21 @@ static int wl12xx_sdio_power_off(struct wl12xx_sdio_glue *glue)
 {
         int ret;
         struct sdio_func *func = dev_to_sdio_func(glue->dev);
+        struct mmc_card *card = func->card;
 
         sdio_claim_host(func);
         sdio_disable_func(func);
         sdio_release_host(func);
 
-        /* Power off the card manually, even if runtime PM is enabled. */
-        ret = mmc_power_save_host(func->card->host);
+        /* Power off the card manually in case it wasn't powered off above */
+        ret = mmc_power_save_host(card->host);
         if (ret < 0)
-                return ret;
+                goto out;
 
-        /* If enabled, let runtime PM know the card is powered off */
-        if (pm_runtime_enabled(&func->dev))
-                ret = pm_runtime_put_sync(&func->dev);
+        /* Let runtime PM know the card is powered off */
+        pm_runtime_put_sync(&card->dev);
 
+out:
         return ret;
 }
 
diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index 553cd3cbb98c..6420abae40ee 100644
--- a/drivers/net/wireless/ti/wlcore/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@ -193,8 +193,8 @@ static int wl12xx_spi_read_busy(struct device *child)
         return -ETIMEDOUT;
 }
 
-static void wl12xx_spi_raw_read(struct device *child, int addr, void *buf,
-                                size_t len, bool fixed)
+static int __must_check wl12xx_spi_raw_read(struct device *child, int addr,
+                                            void *buf, size_t len, bool fixed)
 {
         struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
         struct wl1271 *wl = dev_get_drvdata(child);
@@ -238,7 +238,7 @@ static void wl12xx_spi_raw_read(struct device *child, int addr, void *buf,
                 if (!(busy_buf[WL1271_BUSY_WORD_CNT - 1] & 0x1) &&
                     wl12xx_spi_read_busy(child)) {
                         memset(buf, 0, chunk_len);
-                        return;
+                        return 0;
                 }
 
                 spi_message_init(&m);
@@ -256,10 +256,12 @@ static void wl12xx_spi_raw_read(struct device *child, int addr, void *buf,
                 buf += chunk_len;
                 len -= chunk_len;
         }
+
+        return 0;
 }
 
-static void wl12xx_spi_raw_write(struct device *child, int addr, void *buf,
-                                 size_t len, bool fixed)
+static int __must_check wl12xx_spi_raw_write(struct device *child, int addr,
+                                             void *buf, size_t len, bool fixed)
 {
         struct wl12xx_spi_glue *glue = dev_get_drvdata(child->parent);
         struct spi_transfer t[2 * WSPI_MAX_NUM_OF_CHUNKS];
@@ -304,6 +306,8 @@ static void wl12xx_spi_raw_write(struct device *child, int addr, void *buf,
         }
 
         spi_sync(to_spi_device(glue->dev), &m);
+
+        return 0;
 }
 
 static struct wl1271_if_operations spi_ops = {
diff --git a/drivers/net/wireless/ti/wlcore/testmode.c b/drivers/net/wireless/ti/wlcore/testmode.c
index 0e59ea2cdd39..eeb339d61d1e 100644
--- a/drivers/net/wireless/ti/wlcore/testmode.c
+++ b/drivers/net/wireless/ti/wlcore/testmode.c
@@ -108,6 +108,20 @@ static int wl1271_tm_cmd_test(struct wl1271 *wl, struct nlattr *tb[])
         }
 
         if (answer) {
+                /* If we got bip calibration answer print radio status */
+                struct wl1271_cmd_cal_p2g *params =
+                        (struct wl1271_cmd_cal_p2g *) buf;
+
+                s16 radio_status = (s16) le16_to_cpu(params->radio_status);
+
+                if (params->test.id == TEST_CMD_P2G_CAL &&
+                    radio_status < 0)
+                        wl1271_warning("testmode cmd: radio status=%d",
+                                        radio_status);
+                else
+                        wl1271_info("testmode cmd: radio status=%d",
+                                        radio_status);
+
                 len = nla_total_size(buf_len);
                 skb = cfg80211_testmode_alloc_reply_skb(wl->hw->wiphy, len);
                 if (!skb) {
diff --git a/drivers/net/wireless/ti/wlcore/tx.c b/drivers/net/wireless/ti/wlcore/tx.c
index 9273fdb3aaec..8038a5026933 100644
--- a/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@ -305,11 +305,15 @@ static void wl1271_tx_fill_hdr(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         if (is_dummy || !wlvif)
                 rate_idx = 0;
         else if (wlvif->bss_type != BSS_TYPE_AP_BSS) {
-                /* if the packets are destined for AP (have a STA entry)
-                   send them with AP rate policies, otherwise use default
-                   basic rates */
+                /*
+                 * if the packets are destined for AP (have a STA entry)
+                 * send them with AP rate policies (EAPOLs are an exception),
+                 * otherwise use default basic rates
+                 */
                 if (control->flags & IEEE80211_TX_CTL_NO_CCK_RATE)
                         rate_idx = wlvif->sta.p2p_rate_idx;
+                else if (skb->protocol == cpu_to_be16(ETH_P_PAE))
+                        rate_idx = wlvif->sta.basic_rate_idx;
                 else if (control->control.sta)
                         rate_idx = wlvif->sta.ap_rate_idx;
                 else
@@ -348,8 +352,10 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         bool is_dummy;
         bool is_gem = false;
 
-        if (!skb)
+        if (!skb) {
+                wl1271_error("discarding null skb");
                 return -EINVAL;
+        }
 
         info = IEEE80211_SKB_CB(skb);
 
@@ -658,7 +664,17 @@ void wl12xx_rearm_rx_streaming(struct wl1271 *wl, unsigned long *active_hlids)
         }
 }
 
-void wl1271_tx_work_locked(struct wl1271 *wl)
+/*
+ * Returns failure values only in case of failed bus ops within this function.
+ * wl1271_prepare_tx_frame retvals won't be returned in order to avoid
+ * triggering recovery by higher layers when not necessary.
+ * In case a FW command fails within wl1271_prepare_tx_frame fails a recovery
+ * will be queued in wl1271_cmd_send. -EAGAIN/-EBUSY from prepare_tx_frame
+ * can occur and are legitimate so don't propagate. -EINVAL will emit a WARNING
+ * within prepare_tx_frame code but there's nothing we should do about those
+ * as well.
+ */
+int wlcore_tx_work_locked(struct wl1271 *wl)
 {
         struct wl12xx_vif *wlvif;
         struct sk_buff *skb;
@@ -666,10 +682,11 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
         u32 buf_offset = 0, last_len = 0;
         bool sent_packets = false;
         unsigned long active_hlids[BITS_TO_LONGS(WL12XX_MAX_LINKS)] = {0};
-        int ret;
+        int ret = 0;
+        int bus_ret = 0;
 
         if (unlikely(wl->state == WL1271_STATE_OFF))
-                return;
+                return 0;
 
         while ((skb = wl1271_skb_dequeue(wl))) {
                 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
@@ -690,8 +707,11 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
 
                         buf_offset = wlcore_hw_pre_pkt_send(wl, buf_offset,
                                                             last_len);
-                        wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
-                                          buf_offset, true);
+                        bus_ret = wlcore_write_data(wl, REG_SLV_MEM_DATA,
+                                             wl->aggr_buf, buf_offset, true);
+                        if (bus_ret < 0)
+                                goto out;
+
                         sent_packets = true;
                         buf_offset = 0;
                         continue;
@@ -727,8 +747,11 @@ void wl1271_tx_work_locked(struct wl1271 *wl)
 out_ack:
         if (buf_offset) {
                 buf_offset = wlcore_hw_pre_pkt_send(wl, buf_offset, last_len);
-                wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
-                                  buf_offset, true);
+                bus_ret = wlcore_write_data(wl, REG_SLV_MEM_DATA, wl->aggr_buf,
+                                             buf_offset, true);
+                if (bus_ret < 0)
+                        goto out;
+
                 sent_packets = true;
         }
         if (sent_packets) {
@@ -736,13 +759,19 @@ out_ack:
                  * Interrupt the firmware with the new packets. This is only
                  * required for older hardware revisions
                  */
-                if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION)
-                        wl1271_write32(wl, WL12XX_HOST_WR_ACCESS,
-                                       wl->tx_packets_count);
+                if (wl->quirks & WLCORE_QUIRK_END_OF_TRANSACTION) {
+                        bus_ret = wlcore_write32(wl, WL12XX_HOST_WR_ACCESS,
+                                             wl->tx_packets_count);
+                        if (bus_ret < 0)
+                                goto out;
+                }
 
                 wl1271_handle_tx_low_watermark(wl);
         }
         wl12xx_rearm_rx_streaming(wl, active_hlids);
+
+out:
+        return bus_ret;
 }
 
 void wl1271_tx_work(struct work_struct *work)
@@ -755,7 +784,11 @@ void wl1271_tx_work(struct work_struct *work)
         if (ret < 0)
                 goto out;
 
-        wl1271_tx_work_locked(wl);
+        ret = wlcore_tx_work_locked(wl);
+        if (ret < 0) {
+                wl12xx_queue_recovery_work(wl);
+                goto out;
+        }
 
         wl1271_ps_elp_sleep(wl);
 out:
@@ -877,21 +910,27 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
 }
 
 /* Called upon reception of a TX complete interrupt */
-void wl1271_tx_complete(struct wl1271 *wl)
+int wlcore_tx_complete(struct wl1271 *wl)
 {
         struct wl1271_acx_mem_map *memmap = wl->target_mem_map;
         u32 count, fw_counter;
         u32 i;
+        int ret;
 
         /* read the tx results from the chipset */
-        wl1271_read(wl, le32_to_cpu(memmap->tx_result),
-                    wl->tx_res_if, sizeof(*wl->tx_res_if), false);
+        ret = wlcore_read(wl, le32_to_cpu(memmap->tx_result),
+                          wl->tx_res_if, sizeof(*wl->tx_res_if), false);
+        if (ret < 0)
+                goto out;
+
         fw_counter = le32_to_cpu(wl->tx_res_if->tx_result_fw_counter);
 
         /* write host counter to chipset (to ack) */
-        wl1271_write32(wl, le32_to_cpu(memmap->tx_result) +
-                       offsetof(struct wl1271_tx_hw_res_if,
-                                tx_result_host_counter), fw_counter);
+        ret = wlcore_write32(wl, le32_to_cpu(memmap->tx_result) +
+                             offsetof(struct wl1271_tx_hw_res_if,
+                                      tx_result_host_counter), fw_counter);
+        if (ret < 0)
+                goto out;
 
         count = fw_counter - wl->tx_results_count;
         wl1271_debug(DEBUG_TX, "tx_complete received, packets: %d", count);
@@ -911,8 +950,11 @@ void wl1271_tx_complete(struct wl1271 *wl)
 
                 wl->tx_results_count++;
         }
+
+out:
+        return ret;
 }
-EXPORT_SYMBOL(wl1271_tx_complete);
+EXPORT_SYMBOL(wlcore_tx_complete);
 
 void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid)
 {
diff --git a/drivers/net/wireless/ti/wlcore/tx.h b/drivers/net/wireless/ti/wlcore/tx.h
index fa4be1b91135..1e939b016155 100644
--- a/drivers/net/wireless/ti/wlcore/tx.h
+++ b/drivers/net/wireless/ti/wlcore/tx.h
@@ -234,8 +234,8 @@ static inline int wl1271_tx_total_queue_count(struct wl1271 *wl)
 }
 
 void wl1271_tx_work(struct work_struct *work);
-void wl1271_tx_work_locked(struct wl1271 *wl);
-void wl1271_tx_complete(struct wl1271 *wl);
+int wlcore_tx_work_locked(struct wl1271 *wl);
+int wlcore_tx_complete(struct wl1271 *wl);
 void wl12xx_tx_reset_wlvif(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 void wl12xx_tx_reset(struct wl1271 *wl);
 void wl1271_tx_flush(struct wl1271 *wl);
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 761a72f4b8d1..e796974df59b 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -41,9 +41,9 @@ struct wlcore_ops {
         int (*identify_fw)(struct wl1271 *wl);
         int (*boot)(struct wl1271 *wl);
         int (*plt_init)(struct wl1271 *wl);
-        void (*trigger_cmd)(struct wl1271 *wl, int cmd_box_addr,
-                            void *buf, size_t len);
-        void (*ack_event)(struct wl1271 *wl);
+        int (*trigger_cmd)(struct wl1271 *wl, int cmd_box_addr,
+                           void *buf, size_t len);
+        int (*ack_event)(struct wl1271 *wl);
         u32 (*calc_tx_blocks)(struct wl1271 *wl, u32 len, u32 spare_blks);
         void (*set_tx_desc_blocks)(struct wl1271 *wl,
                                    struct wl1271_tx_hw_descr *desc,
@@ -53,17 +53,17 @@ struct wlcore_ops {
                                      struct sk_buff *skb);
         enum wl_rx_buf_align (*get_rx_buf_align)(struct wl1271 *wl,
                                                  u32 rx_desc);
-        void (*prepare_read)(struct wl1271 *wl, u32 rx_desc, u32 len);
+        int (*prepare_read)(struct wl1271 *wl, u32 rx_desc, u32 len);
         u32 (*get_rx_packet_len)(struct wl1271 *wl, void *rx_data,
                                  u32 data_len);
-        void (*tx_delayed_compl)(struct wl1271 *wl);
+        int (*tx_delayed_compl)(struct wl1271 *wl);
         void (*tx_immediate_compl)(struct wl1271 *wl);
         int (*hw_init)(struct wl1271 *wl);
         int (*init_vif)(struct wl1271 *wl, struct wl12xx_vif *wlvif);
         u32 (*sta_get_ap_rate_mask)(struct wl1271 *wl,
                                     struct wl12xx_vif *wlvif);
-        s8 (*get_pg_ver)(struct wl1271 *wl);
-        void (*get_mac)(struct wl1271 *wl);
+        int (*get_pg_ver)(struct wl1271 *wl, s8 *ver);
+        int (*get_mac)(struct wl1271 *wl);
         void (*set_tx_desc_csum)(struct wl1271 *wl,
                                  struct wl1271_tx_hw_descr *desc,
                                  struct sk_buff *skb);
@@ -387,6 +387,9 @@ struct wl1271 {
 
         /* mutex for protecting the tx_flush function */
         struct mutex flush_mutex;
+
+        /* sleep auth value currently configured to FW */
+        int sleep_auth;
 };
 
 int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);
@@ -398,6 +401,13 @@ int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
                    struct ieee80211_sta *sta,
                    struct ieee80211_key_conf *key_conf);
 
+static inline void
+wlcore_set_ht_cap(struct wl1271 *wl, enum ieee80211_band band,
+                  struct ieee80211_sta_ht_cap *ht_cap)
+{
+        memcpy(&wl->ht_cap[band], ht_cap, sizeof(*ht_cap));
+}
+
 /* Firmware image load chunk size */
 #define CHUNK_SIZE      16384
 
diff --git a/drivers/net/wireless/ti/wlcore/wlcore_i.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h
index 8260b1e9288a..4273a21cdde1 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore_i.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@ -209,10 +209,10 @@ struct wl1271_scan {
 };
 
 struct wl1271_if_operations {
-        void (*read)(struct device *child, int addr, void *buf, size_t len,
-                     bool fixed);
-        void (*write)(struct device *child, int addr, void *buf, size_t len,
-                     bool fixed);
+        int __must_check (*read)(struct device *child, int addr, void *buf,
+                                 size_t len, bool fixed);
+        int __must_check (*write)(struct device *child, int addr, void *buf,
+                                  size_t len, bool fixed);
         void (*reset)(struct device *child);
         void (*init)(struct device *child);
         int (*power)(struct device *child, bool enable);
@@ -247,6 +247,7 @@ enum wl12xx_flags {
         WL1271_FLAG_RECOVERY_IN_PROGRESS,
         WL1271_FLAG_VIF_CHANGE_IN_PROGRESS,
         WL1271_FLAG_INTENDED_FW_RECOVERY,
+        WL1271_FLAG_SDIO_FAILED,
 };
 
 enum wl12xx_vif_flags {
diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 8deaf6d050c3..12334f9190cb 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -70,6 +70,13 @@ struct bcma_host_ops {
 
 /* Core-ID values. */
 #define BCMA_CORE_OOB_ROUTER            0x367   /* Out of band */
+#define BCMA_CORE_4706_CHIPCOMMON       0x500
+#define BCMA_CORE_4706_SOC_RAM          0x50E
+#define BCMA_CORE_4706_MAC_GBIT         0x52D
+#define BCMA_CORE_AMEMC                 0x52E   /* DDR1/2 memory controller core */
+#define BCMA_CORE_ALTA                  0x534   /* I2S core */
+#define BCMA_CORE_4706_MAC_GBIT_COMMON  0x5DC
+#define BCMA_CORE_DDR23_PHY             0x5DD
 #define BCMA_CORE_INVALID               0x700
 #define BCMA_CORE_CHIPCOMMON            0x800
 #define BCMA_CORE_ILINE20               0x801
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index ce9af8918514..318fc1f705b1 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -568,6 +568,26 @@ struct ieee80211s_hdr {
 #define MESH_FLAGS_PS_DEEP      0x4
 
 /**
+ * enum ieee80211_preq_flags - mesh PREQ element flags
+ *
+ * @IEEE80211_PREQ_PROACTIVE_PREP_FLAG: proactive PREP subfield
+ */
+enum ieee80211_preq_flags {
+        IEEE80211_PREQ_PROACTIVE_PREP_FLAG      = 1<<2,
+};
+
+/**
+ * enum ieee80211_preq_target_flags - mesh PREQ element per target flags
+ *
+ * @IEEE80211_PREQ_TO_FLAG: target only subfield
+ * @IEEE80211_PREQ_USN_FLAG: unknown target HWMP sequence number subfield
+ */
+enum ieee80211_preq_target_flags {
+        IEEE80211_PREQ_TO_FLAG  = 1<<0,
+        IEEE80211_PREQ_USN_FLAG = 1<<2,
+};
+
+/**
  * struct ieee80211_quiet_ie
  *
  * This structure refers to "Quiet information element"
@@ -1443,7 +1463,7 @@ enum ieee80211_tdls_actioncode {
  *
  * @IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET: the default synchronization method
  * @IEEE80211_SYNC_METHOD_VENDOR: a vendor specific synchronization method
- * that will be specified in a vendor specific information element
+ *      that will be specified in a vendor specific information element
  */
 enum {
         IEEE80211_SYNC_METHOD_NEIGHBOR_OFFSET = 1,
@@ -1455,7 +1475,7 @@ enum {
  *
  * @IEEE80211_PATH_PROTOCOL_HWMP: the default path selection protocol
  * @IEEE80211_PATH_PROTOCOL_VENDOR: a vendor specific protocol that will
- * be specified in a vendor specific information element
+ *      be specified in a vendor specific information element
  */
 enum {
         IEEE80211_PATH_PROTOCOL_HWMP = 1,
@@ -1467,13 +1487,35 @@ enum {
  *
  * @IEEE80211_PATH_METRIC_AIRTIME: the default path selection metric
  * @IEEE80211_PATH_METRIC_VENDOR: a vendor specific metric that will be
- * specified in a vendor specific information element
+ *      specified in a vendor specific information element
  */
 enum {
         IEEE80211_PATH_METRIC_AIRTIME = 1,
         IEEE80211_PATH_METRIC_VENDOR = 255,
 };
 
+/**
+ * enum ieee80211_root_mode_identifier - root mesh STA mode identifier
+ *
+ * These attribute are used by dot11MeshHWMPRootMode to set root mesh STA mode
+ *
+ * @IEEE80211_ROOTMODE_NO_ROOT: the mesh STA is not a root mesh STA (default)
+ * @IEEE80211_ROOTMODE_ROOT: the mesh STA is a root mesh STA if greater than
+ *      this value
+ * @IEEE80211_PROACTIVE_PREQ_NO_PREP: the mesh STA is a root mesh STA supports
+ *      the proactive PREQ with proactive PREP subfield set to 0
+ * @IEEE80211_PROACTIVE_PREQ_WITH_PREP: the mesh STA is a root mesh STA
+ *      supports the proactive PREQ with proactive PREP subfield set to 1
+ * @IEEE80211_PROACTIVE_RANN: the mesh STA is a root mesh STA supports
+ *      the proactive RANN
+ */
+enum ieee80211_root_mode_identifier {
+        IEEE80211_ROOTMODE_NO_ROOT = 0,
+        IEEE80211_ROOTMODE_ROOT = 1,
+        IEEE80211_PROACTIVE_PREQ_NO_PREP = 2,
+        IEEE80211_PROACTIVE_PREQ_WITH_PREP = 3,
+        IEEE80211_PROACTIVE_RANN = 4,
+};
 
 /*
  * IEEE 802.11-2007 7.3.2.9 Country information element
@@ -1589,6 +1631,10 @@ enum ieee80211_sa_query_action {
 
 #define WLAN_OUI_WFA                    0x506f9a
 #define WLAN_OUI_TYPE_WFA_P2P           9
+#define WLAN_OUI_MICROSOFT              0x0050f2
+#define WLAN_OUI_TYPE_MICROSOFT_WPA     1
+#define WLAN_OUI_TYPE_MICROSOFT_WMM     2
+#define WLAN_OUI_TYPE_MICROSOFT_WPS     4
 
 /*
  * WMM/802.11e Tspec Element
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index 970afdf5a605..c0fc5d277338 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -277,6 +277,12 @@
  * @NL80211_CMD_NEW_SURVEY_RESULTS: survey data notification (as a reply to
  *      NL80211_CMD_GET_SURVEY and on the "scan" multicast group)
  *
+ * @NL80211_CMD_SET_PMKSA: Add a PMKSA cache entry, using %NL80211_ATTR_MAC
+ *      (for the BSSID) and %NL80211_ATTR_PMKID.
+ * @NL80211_CMD_DEL_PMKSA: Delete a PMKSA cache entry, using %NL80211_ATTR_MAC
+ *      (for the BSSID) and %NL80211_ATTR_PMKID.
+ * @NL80211_CMD_FLUSH_PMKSA: Flush all PMKSA cache entries.
+ *
  * @NL80211_CMD_REG_CHANGE: indicates to userspace the regulatory domain
  *      has been changed and provides details of the request information
  *      that caused the change such as who initiated the regulatory request
@@ -456,6 +462,10 @@
  *      the frame.
  * @NL80211_CMD_ACTION_TX_STATUS: Alias for @NL80211_CMD_FRAME_TX_STATUS for
  *      backward compatibility.
+ *
+ * @NL80211_CMD_SET_POWER_SAVE: Set powersave, using %NL80211_ATTR_PS_STATE
+ * @NL80211_CMD_GET_POWER_SAVE: Get powersave status in %NL80211_ATTR_PS_STATE
+ *
  * @NL80211_CMD_SET_CQM: Connection quality monitor configuration. This command
  *      is used to configure connection quality monitoring notification trigger
  *      levels.
@@ -771,6 +781,13 @@ enum nl80211_commands {
  *      section 7.3.2.25.1, e.g. 0x000FAC04)
  * @NL80211_ATTR_KEY_SEQ: transmit key sequence number (IV/PN) for TKIP and
  *      CCMP keys, each six bytes in little endian
+ * @NL80211_ATTR_KEY_DEFAULT: Flag attribute indicating the key is default key
+ * @NL80211_ATTR_KEY_DEFAULT_MGMT: Flag attribute indicating the key is the
+ *      default management key
+ * @NL80211_ATTR_CIPHER_SUITES_PAIRWISE: For crypto settings for connect or
+ *      other commands, indicates which pairwise cipher suites are used
+ * @NL80211_ATTR_CIPHER_SUITE_GROUP: For crypto settings for connect or
+ *      other commands, indicates which group cipher suite is used
  *
  * @NL80211_ATTR_BEACON_INTERVAL: beacon interval in TU
  * @NL80211_ATTR_DTIM_PERIOD: DTIM period for beaconing
@@ -1006,6 +1023,8 @@ enum nl80211_commands {
  * @NL80211_ATTR_ACK: Flag attribute indicating that the frame was
  *      acknowledged by the recipient.
  *
+ * @NL80211_ATTR_PS_STATE: powersave state, using &enum nl80211_ps_state values.
+ *
  * @NL80211_ATTR_CQM: connection quality monitor configuration in a
  *      nested attribute with %NL80211_ATTR_CQM_* sub-attributes.
  *
@@ -1063,7 +1082,7 @@ enum nl80211_commands {
  *      flag isn't set, the frame will be rejected. This is also used as an
  *      nl80211 capability flag.
  *
- * @NL80211_ATTR_BSS_HTOPMODE: HT operation mode (u16)
+ * @NL80211_ATTR_BSS_HT_OPMODE: HT operation mode (u16)
  *
  * @NL80211_ATTR_KEY_DEFAULT_TYPES: A nested attribute containing flags
  *      attributes, specifying what a key should be set as default as.
@@ -1087,10 +1106,10 @@ enum nl80211_commands {
  *      indicate which WoW triggers should be enabled. This is also
  *      used by %NL80211_CMD_GET_WOWLAN to get the currently enabled WoWLAN
  *      triggers.
-
+ *
  * @NL80211_ATTR_SCHED_SCAN_INTERVAL: Interval between scheduled scan
  *      cycles, in msecs.
-
+ *
  * @NL80211_ATTR_SCHED_SCAN_MATCH: Nested attribute with one or more
  *      sets of attributes to match during scheduled scans.  Only BSSs
  *      that match any of the sets will be reported.  These are
@@ -1117,7 +1136,7 @@ enum nl80211_commands {
  *      are managed in software: interfaces of these types aren't subject to
  *      any restrictions in their number or combinations.
  *
- * @%NL80211_ATTR_REKEY_DATA: nested attribute containing the information
+ * @NL80211_ATTR_REKEY_DATA: nested attribute containing the information
  *      necessary for GTK rekeying in the device, see &enum nl80211_rekey_data.
  *
  * @NL80211_ATTR_SCAN_SUPP_RATES: rates per to be advertised as supported in scan,
@@ -1184,7 +1203,6 @@ enum nl80211_commands {
  * @NL80211_ATTR_FEATURE_FLAGS: This u32 attribute contains flags from
  *      &enum nl80211_feature_flags and is advertised in wiphy information.
  * @NL80211_ATTR_PROBE_RESP_OFFLOAD: Indicates that the HW responds to probe
- *
  *      requests while operating in AP-mode.
  *      This attribute holds a bitmap of the supported protocols for
  *      offloading (see &enum nl80211_probe_resp_offload_support_attr).
@@ -1524,6 +1542,9 @@ enum nl80211_attrs {
 
 #define NL80211_MIN_REMAIN_ON_CHANNEL_TIME      10
 
+/* default RSSI threshold for scan results if none specified. */
+#define NL80211_SCAN_RSSI_THOLD_OFF             -300
+
 /**
  * enum nl80211_iftype - (virtual) interface types
  *
@@ -1956,6 +1977,8 @@ enum nl80211_reg_rule_attr {
  * @__NL80211_SCHED_SCAN_MATCH_ATTR_INVALID: attribute number 0 is reserved
  * @NL80211_SCHED_SCAN_MATCH_ATTR_SSID: SSID to be used for matching,
  * only report BSS with matching SSID.
+ * @NL80211_SCHED_SCAN_MATCH_ATTR_RSSI: RSSI threshold (in dBm) for reporting a
+ *      BSS in scan results. Filtering is turned off if not specified.
  * @NL80211_SCHED_SCAN_MATCH_ATTR_MAX: highest scheduled scan filter
  *      attribute number currently defined
  * @__NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST: internal use
@@ -1963,7 +1986,8 @@ enum nl80211_reg_rule_attr {
 enum nl80211_sched_scan_match_attr {
         __NL80211_SCHED_SCAN_MATCH_ATTR_INVALID,
 
-        NL80211_ATTR_SCHED_SCAN_MATCH_SSID,
+        NL80211_SCHED_SCAN_MATCH_ATTR_SSID,
+        NL80211_SCHED_SCAN_MATCH_ATTR_RSSI,
 
         /* keep last */
         __NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST,
@@ -1971,6 +1995,9 @@ enum nl80211_sched_scan_match_attr {
                 __NL80211_SCHED_SCAN_MATCH_ATTR_AFTER_LAST - 1
 };
 
+/* only for backward compatibility */
+#define NL80211_ATTR_SCHED_SCAN_MATCH_SSID NL80211_SCHED_SCAN_MATCH_ATTR_SSID
+
 /**
  * enum nl80211_reg_rule_flags - regulatory rule flags
  *
@@ -2090,78 +2117,91 @@ enum nl80211_mntr_flags {
  * @__NL80211_MESHCONF_INVALID: internal use
  *
  * @NL80211_MESHCONF_RETRY_TIMEOUT: specifies the initial retry timeout in
- * millisecond units, used by the Peer Link Open message
+ *      millisecond units, used by the Peer Link Open message
  *
  * @NL80211_MESHCONF_CONFIRM_TIMEOUT: specifies the initial confirm timeout, in
- * millisecond units, used by the peer link management to close a peer link
+ *      millisecond units, used by the peer link management to close a peer link
  *
  * @NL80211_MESHCONF_HOLDING_TIMEOUT: specifies the holding timeout, in
- * millisecond units
+ *      millisecond units
  *
  * @NL80211_MESHCONF_MAX_PEER_LINKS: maximum number of peer links allowed
- * on this mesh interface
+ *      on this mesh interface
  *
  * @NL80211_MESHCONF_MAX_RETRIES: specifies the maximum number of peer link
- * open retries that can be sent to establish a new peer link instance in a
- * mesh
+ *      open retries that can be sent to establish a new peer link instance in a
+ *      mesh
  *
  * @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
- * point.
+ *      point.
  *
  * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically
- * open peer links when we detect compatible mesh peers.
+ *      open peer links when we detect compatible mesh peers.
  *
  * @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
- * containing a PREQ that an MP can send to a particular destination (path
- * target)
+ *      containing a PREQ that an MP can send to a particular destination (path
+ *      target)
  *
  * @NL80211_MESHCONF_PATH_REFRESH_TIME: how frequently to refresh mesh paths
- * (in milliseconds)
+ *      (in milliseconds)
  *
  * @NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT: minimum length of time to wait
- * until giving up on a path discovery (in milliseconds)
+ *      until giving up on a path discovery (in milliseconds)
  *
  * @NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT: The time (in TUs) for which mesh
- * points receiving a PREQ shall consider the forwarding information from the
- * root to be valid. (TU = time unit)
+ *      points receiving a PREQ shall consider the forwarding information from
+ *      the root to be valid. (TU = time unit)
  *
  * @NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL: The minimum interval of time (in
- * TUs) during which an MP can send only one action frame containing a PREQ
- * reference element
+ *      TUs) during which an MP can send only one action frame containing a PREQ
+ *      reference element
  *
  * @NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME: The interval of time (in TUs)
- * that it takes for an HWMP information element to propagate across the mesh
+ *      that it takes for an HWMP information element to propagate across the
+ *      mesh
  *
  * @NL80211_MESHCONF_HWMP_ROOTMODE: whether root mode is enabled or not
  *
  * @NL80211_MESHCONF_ELEMENT_TTL: specifies the value of TTL field set at a
- * source mesh point for path selection elements.
+ *      source mesh point for path selection elements.
  *
  * @NL80211_MESHCONF_HWMP_RANN_INTERVAL:  The interval of time (in TUs) between
- * root announcements are transmitted.
+ *      root announcements are transmitted.
  *
  * @NL80211_MESHCONF_GATE_ANNOUNCEMENTS: Advertise that this mesh station has
- * access to a broader network beyond the MBSS.  This is done via Root
- * Announcement frames.
+ *      access to a broader network beyond the MBSS.  This is done via Root
+ *      Announcement frames.
  *
  * @NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL: The minimum interval of time (in
- * TUs) during which a mesh STA can send only one Action frame containing a
- * PERR element.
+ *      TUs) during which a mesh STA can send only one Action frame containing a
+ *      PERR element.
  *
  * @NL80211_MESHCONF_FORWARDING: set Mesh STA as forwarding or non-forwarding
- * or forwarding entity (default is TRUE - forwarding entity)
+ *      or forwarding entity (default is TRUE - forwarding entity)
  *
  * @NL80211_MESHCONF_RSSI_THRESHOLD: RSSI threshold in dBm. This specifies the
- * threshold for average signal strength of candidate station to establish
- * a peer link.
- *
- * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
+ *      threshold for average signal strength of candidate station to establish
+ *      a peer link.
  *
  * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors
- * to synchronize to for 11s default synchronization method (see 11C.12.2.2)
+ *      to synchronize to for 11s default synchronization method
+ *      (see 11C.12.2.2)
  *
  * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode.
  *
+ * @NL80211_MESHCONF_ATTR_MAX: highest possible mesh configuration attribute
+ *
+ * @NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT: The time (in TUs) for
+ *      which mesh STAs receiving a proactive PREQ shall consider the forwarding
+ *      information to the root mesh STA to be valid.
+ *
+ * @NL80211_MESHCONF_HWMP_ROOT_INTERVAL: The interval of time (in TUs) between
+ *      proactive PREQs are transmitted.
+ *
+ * @NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL: The minimum interval of time
+ *      (in TUs) during which a mesh STA can send only one Action frame
+ *      containing a PREQ element for root path confirmation.
+ *
  * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use
  */
 enum nl80211_meshconf_params {
@@ -2188,6 +2228,9 @@ enum nl80211_meshconf_params {
         NL80211_MESHCONF_RSSI_THRESHOLD,
         NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
         NL80211_MESHCONF_HT_OPMODE,
+        NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
+        NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
+        NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
 
         /* keep last */
         __NL80211_MESHCONF_ATTR_AFTER_LAST,
@@ -2203,34 +2246,36 @@ enum nl80211_meshconf_params {
  * @__NL80211_MESH_SETUP_INVALID: Internal use
  *
  * @NL80211_MESH_SETUP_ENABLE_VENDOR_PATH_SEL: Enable this option to use a
- * vendor specific path selection algorithm or disable it to use the default
- * HWMP.
+ *      vendor specific path selection algorithm or disable it to use the
+ *      default HWMP.
  *
  * @NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC: Enable this option to use a
- * vendor specific path metric or disable it to use the default Airtime
- * metric.
+ *      vendor specific path metric or disable it to use the default Airtime
+ *      metric.
  *
  * @NL80211_MESH_SETUP_IE: Information elements for this mesh, for instance, a
- * robust security network ie, or a vendor specific information element that
- * vendors will use to identify the path selection methods and metrics in use.
+ *      robust security network ie, or a vendor specific information element
+ *      that vendors will use to identify the path selection methods and
+ *      metrics in use.
  *
  * @NL80211_MESH_SETUP_USERSPACE_AUTH: Enable this option if an authentication
- * daemon will be authenticating mesh candidates.
+ *      daemon will be authenticating mesh candidates.
  *
  * @NL80211_MESH_SETUP_USERSPACE_AMPE: Enable this option if an authentication
- * daemon will be securing peer link frames.  AMPE is a secured version of Mesh
- * Peering Management (MPM) and is implemented with the assistance of a
- * userspace daemon.  When this flag is set, the kernel will send peer
- * management frames to a userspace daemon that will implement AMPE
- * functionality (security capabilities selection, key confirmation, and key
- * management).  When the flag is unset (default), the kernel can autonomously
- * complete (unsecured) mesh peering without the need of a userspace daemon.
- *
- * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
+ *      daemon will be securing peer link frames.  AMPE is a secured version of
+ *      Mesh Peering Management (MPM) and is implemented with the assistance of
+ *      a userspace daemon.  When this flag is set, the kernel will send peer
+ *      management frames to a userspace daemon that will implement AMPE
+ *      functionality (security capabilities selection, key confirmation, and
+ *      key management).  When the flag is unset (default), the kernel can
+ *      autonomously complete (unsecured) mesh peering without the need of a
+ *      userspace daemon.
  *
  * @NL80211_MESH_SETUP_ENABLE_VENDOR_SYNC: Enable this option to use a
- * vendor specific synchronization method or disable it to use the default
- * neighbor offset synchronization
+ *      vendor specific synchronization method or disable it to use the default
+ *      neighbor offset synchronization
+ *
+ * @NL80211_MESH_SETUP_ATTR_MAX: highest possible mesh setup attribute number
  *
  * @__NL80211_MESH_SETUP_ATTR_AFTER_LAST: Internal use
  */
@@ -2500,6 +2545,11 @@ enum nl80211_band {
         NL80211_BAND_5GHZ,
 };
 
+/**
+ * enum nl80211_ps_state - powersave state
+ * @NL80211_PS_DISABLED: powersave is disabled
+ * @NL80211_PS_ENABLED: powersave is enabled
+ */
 enum nl80211_ps_state {
         NL80211_PS_DISABLED,
         NL80211_PS_ENABLED,
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 7319f25250b6..061c01957e54 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -627,10 +627,10 @@ struct sta_bss_parameters {
  * @llid: mesh local link id
  * @plid: mesh peer link id
  * @plink_state: mesh peer link state
- * @signal: the signal strength, type depends on the wiphy's signal_type
-        NOTE: For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
- * @signal_avg: avg signal strength, type depends on the wiphy's signal_type
-        NOTE: For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
+ * @signal: The signal strength, type depends on the wiphy's signal_type.
+ *      For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
+ * @signal_avg: Average signal strength, type depends on the wiphy's signal_type.
+ *      For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
  * @txrate: current unicast bitrate from this station
  * @rxrate: current unicast bitrate to this station
  * @rx_packets: packets received from this station
@@ -790,43 +790,95 @@ struct bss_parameters {
         int ht_opmode;
 };
 
-/*
+/**
  * struct mesh_config - 802.11s mesh configuration
  *
  * These parameters can be changed while the mesh is active.
+ *
+ * @dot11MeshRetryTimeout: the initial retry timeout in millisecond units used
+ *      by the Mesh Peering Open message
+ * @dot11MeshConfirmTimeout: the initial retry timeout in millisecond units
+ *      used by the Mesh Peering Open message
+ * @dot11MeshHoldingTimeout: the confirm timeout in millisecond units used by
+ *      the mesh peering management to close a mesh peering
+ * @dot11MeshMaxPeerLinks: the maximum number of peer links allowed on this
+ *      mesh interface
+ * @dot11MeshMaxRetries: the maximum number of peer link open retries that can
+ *      be sent to establish a new peer link instance in a mesh
+ * @dot11MeshTTL: the value of TTL field set at a source mesh STA
+ * @element_ttl: the value of TTL field set at a mesh STA for path selection
+ *      elements
+ * @auto_open_plinks: whether we should automatically open peer links when we
+ *      detect compatible mesh peers
+ * @dot11MeshNbrOffsetMaxNeighbor: the maximum number of neighbors to
+ *      synchronize to for 11s default synchronization method
+ * @dot11MeshHWMPmaxPREQretries: the number of action frames containing a PREQ
+ *      that an originator mesh STA can send to a particular path target
+ * @path_refresh_time: how frequently to refresh mesh paths in milliseconds
+ * @min_discovery_timeout: the minimum length of time to wait until giving up on
+ *      a path discovery in milliseconds
+ * @dot11MeshHWMPactivePathTimeout: the time (in TUs) for which mesh STAs
+ *      receiving a PREQ shall consider the forwarding information from the
+ *      root to be valid. (TU = time unit)
+ * @dot11MeshHWMPpreqMinInterval: the minimum interval of time (in TUs) during
+ *      which a mesh STA can send only one action frame containing a PREQ
+ *      element
+ * @dot11MeshHWMPperrMinInterval: the minimum interval of time (in TUs) during
+ *      which a mesh STA can send only one Action frame containing a PERR
+ *      element
+ * @dot11MeshHWMPnetDiameterTraversalTime: the interval of time (in TUs) that
+ *      it takes for an HWMP information element to propagate across the mesh
+ * @dot11MeshHWMPRootMode: the configuration of a mesh STA as root mesh STA
+ * @dot11MeshHWMPRannInterval: the interval of time (in TUs) between root
+ *      announcements are transmitted
+ * @dot11MeshGateAnnouncementProtocol: whether to advertise that this mesh
+ *      station has access to a broader network beyond the MBSS. (This is
+ *      missnamed in draft 12.0: dot11MeshGateAnnouncementProtocol set to true
+ *      only means that the station will announce others it's a mesh gate, but
+ *      not necessarily using the gate announcement protocol. Still keeping the
+ *      same nomenclature to be in sync with the spec)
+ * @dot11MeshForwarding: whether the Mesh STA is forwarding or non-forwarding
+ *      entity (default is TRUE - forwarding entity)
+ * @rssi_threshold: the threshold for average signal strength of candidate
+ *      station to establish a peer link
+ * @ht_opmode: mesh HT protection mode
+ *
+ * @dot11MeshHWMPactivePathToRootTimeout: The time (in TUs) for which mesh STAs
+ *      receiving a proactive PREQ shall consider the forwarding information to
+ *      the root mesh STA to be valid.
+ *
+ * @dot11MeshHWMProotInterval: The interval of time (in TUs) between proactive
+ *      PREQs are transmitted.
+ * @dot11MeshHWMPconfirmationInterval: The minimum interval of time (in TUs)
+ *      during which a mesh STA can send only one Action frame containing
+ *      a PREQ element for root path confirmation.
  */
 struct mesh_config {
-        /* Timeouts in ms */
-        /* Mesh plink management parameters */
         u16 dot11MeshRetryTimeout;
         u16 dot11MeshConfirmTimeout;
         u16 dot11MeshHoldingTimeout;
         u16 dot11MeshMaxPeerLinks;
-        u8  dot11MeshMaxRetries;
-        u8  dot11MeshTTL;
-        /* ttl used in path selection information elements */
-        u8  element_ttl;
+        u8 dot11MeshMaxRetries;
+        u8 dot11MeshTTL;
+        u8 element_ttl;
         bool auto_open_plinks;
-        /* neighbor offset synchronization */
         u32 dot11MeshNbrOffsetMaxNeighbor;
-        /* HWMP parameters */
-        u8  dot11MeshHWMPmaxPREQretries;
+        u8 dot11MeshHWMPmaxPREQretries;
         u32 path_refresh_time;
         u16 min_discovery_timeout;
         u32 dot11MeshHWMPactivePathTimeout;
         u16 dot11MeshHWMPpreqMinInterval;
         u16 dot11MeshHWMPperrMinInterval;
         u16 dot11MeshHWMPnetDiameterTraversalTime;
-        u8  dot11MeshHWMPRootMode;
+        u8 dot11MeshHWMPRootMode;
         u16 dot11MeshHWMPRannInterval;
-        /* This is missnamed in draft 12.0: dot11MeshGateAnnouncementProtocol
-         * set to true only means that the station will announce others it's a
-         * mesh gate, but not necessarily using the gate announcement protocol.
-         * Still keeping the same nomenclature to be in sync with the spec. */
-        bool  dot11MeshGateAnnouncementProtocol;
+        bool dot11MeshGateAnnouncementProtocol;
         bool dot11MeshForwarding;
         s32 rssi_threshold;
         u16 ht_opmode;
+        u32 dot11MeshHWMPactivePathToRootTimeout;
+        u16 dot11MeshHWMProotInterval;
+        u16 dot11MeshHWMPconfirmationInterval;
 };
 
 /**
@@ -975,6 +1027,7 @@ struct cfg80211_match_set {
  * @wiphy: the wiphy this was for
  * @dev: the interface
  * @channels: channels to scan
+ * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
  */
 struct cfg80211_sched_scan_request {
         struct cfg80211_ssid *ssids;
@@ -985,6 +1038,7 @@ struct cfg80211_sched_scan_request {
         size_t ie_len;
         struct cfg80211_match_set *match_sets;
         int n_match_sets;
+        s32 rssi_thold;
 
         /* internal */
         struct wiphy *wiphy;
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 6914f9978aea..670a58ba8a41 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -2254,6 +2254,9 @@ enum ieee80211_rate_control_changed {
  * @get_et_strings:  Ethtool API to get a set of strings to describe stats
  *      and perhaps other supported types of ethtool data-sets.
  *
+ * @get_rssi: Get current signal strength in dBm, the function is optional
+ *      and can sleep.
+ *
  */
 struct ieee80211_ops {
         void (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
@@ -2393,6 +2396,8 @@ struct ieee80211_ops {
         void    (*get_et_strings)(struct ieee80211_hw *hw,
                                   struct ieee80211_vif *vif,
                                   u32 sset, u8 *data);
+        int     (*get_rssi)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                            struct ieee80211_sta *sta, s8 *rssi_dbm);
 };
 
 /**
@@ -3843,28 +3848,4 @@ int ieee80211_add_ext_srates_ie(struct ieee80211_vif *vif,
  */
 int ieee80211_ave_rssi(struct ieee80211_vif *vif);
 
-/* Extra debugging macros */
-
-#ifdef CONFIG_MAC80211_HT_DEBUG
-#define ht_vdbg(fmt, ...)                       \
-        pr_debug(fmt, ##__VA_ARGS__)
-#else
-#define ht_vdbg(fmt, ...)                       \
-do {                                            \
-        if (0)                                  \
-                pr_debug(fmt, ##__VA_ARGS__);   \
-} while (0)
-#endif
-
-#ifdef CONFIG_MAC80211_IBSS_DEBUG
-#define ibss_vdbg(fmt, ...)                     \
-        pr_debug(fmt, ##__VA_ARGS__)
-#else
-#define ibss_vdbg(fmt, ...)                     \
-do {                                            \
-        if (0)                                  \
-                pr_debug(fmt, ##__VA_ARGS__);   \
-} while (0)
-#endif
-
 #endif /* MAC80211_H */
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 8d249d705980..63af25458fda 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -107,6 +107,19 @@ config MAC80211_DEBUGFS
 
           Say N unless you know you need this.
 
+config MAC80211_MESSAGE_TRACING
+        bool "Trace all mac80211 debug messages"
+        depends on MAC80211
+        ---help---
+          Select this option to have mac80211 register the
+          mac80211_msg trace subsystem with tracepoints to
+          collect all debugging messages, independent of
+          printing them into the kernel log.
+
+          The overhead in this option is that all the messages
+          need to be present in the binary and formatted at
+          runtime for tracing.
+
 menuconfig MAC80211_DEBUG_MENU
         bool "Select mac80211 debugging features"
         depends on MAC80211
@@ -140,26 +153,35 @@ config MAC80211_VERBOSE_DEBUG
 
           Do not select this option.
 
-config MAC80211_HT_DEBUG
-        bool "Verbose HT debugging"
+config MAC80211_MLME_DEBUG
+        bool "Verbose managed MLME output"
         depends on MAC80211_DEBUG_MENU
         ---help---
-          This option enables 802.11n High Throughput features
-          debug tracing output.
-
-          It should not be selected on production systems as some
+          Selecting this option causes mac80211 to print out
+          debugging messages for the managed-mode MLME. It
+          should not be selected on production systems as some
           of the messages are remotely triggerable.
 
           Do not select this option.
 
-config MAC80211_TKIP_DEBUG
-        bool "Verbose TKIP debugging"
+config MAC80211_STA_DEBUG
+        bool "Verbose station debugging"
         depends on MAC80211_DEBUG_MENU
         ---help---
           Selecting this option causes mac80211 to print out
-          very verbose TKIP debugging messages. It should not
-          be selected on production systems as those messages
-          are remotely triggerable.
+          debugging messages for station addition/removal.
+
+          Do not select this option.
+
+config MAC80211_HT_DEBUG
+        bool "Verbose HT debugging"
+        depends on MAC80211_DEBUG_MENU
+        ---help---
+          This option enables 802.11n High Throughput features
+          debug tracing output.
+
+          It should not be selected on production systems as some
+          of the messages are remotely triggerable.
 
           Do not select this option.
 
@@ -174,7 +196,7 @@ config MAC80211_IBSS_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_PS_DEBUG
+config MAC80211_PS_DEBUG
         bool "Verbose powersave mode debugging"
         depends on MAC80211_DEBUG_MENU
         ---help---
@@ -186,7 +208,7 @@ config MAC80211_VERBOSE_PS_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_MPL_DEBUG
+config MAC80211_MPL_DEBUG
         bool "Verbose mesh peer link debugging"
         depends on MAC80211_DEBUG_MENU
         depends on MAC80211_MESH
@@ -199,7 +221,7 @@ config MAC80211_VERBOSE_MPL_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_MPATH_DEBUG
+config MAC80211_MPATH_DEBUG
         bool "Verbose mesh path debugging"
         depends on MAC80211_DEBUG_MENU
         depends on MAC80211_MESH
@@ -212,7 +234,7 @@ config MAC80211_VERBOSE_MPATH_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_MHWMP_DEBUG
+config MAC80211_MHWMP_DEBUG
         bool "Verbose mesh HWMP routing debugging"
         depends on MAC80211_DEBUG_MENU
         depends on MAC80211_MESH
@@ -225,7 +247,7 @@ config MAC80211_VERBOSE_MHWMP_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_MESH_SYNC_DEBUG
+config MAC80211_MESH_SYNC_DEBUG
         bool "Verbose mesh mesh synchronization debugging"
         depends on MAC80211_DEBUG_MENU
         depends on MAC80211_MESH
@@ -236,7 +258,7 @@ config MAC80211_VERBOSE_MESH_SYNC_DEBUG
 
           Do not select this option.
 
-config MAC80211_VERBOSE_TDLS_DEBUG
+config MAC80211_TDLS_DEBUG
         bool "Verbose TDLS debugging"
         depends on MAC80211_DEBUG_MENU
         ---help---
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 2b1470bac178..a7dd110faafa 100644
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -24,7 +24,7 @@ mac80211-y := \
         wme.o \
         event.o \
         chan.o \
-        driver-trace.o mlme.o
+        trace.o mlme.o
 
 mac80211-$(CONFIG_MAC80211_LEDS) += led.o
 mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
@@ -42,7 +42,7 @@ mac80211-$(CONFIG_MAC80211_MESH) += \
 
 mac80211-$(CONFIG_PM) += pm.o
 
-CFLAGS_driver-trace.o := -I$(src)
+CFLAGS_trace.o := -I$(src)
 
 # objects for PID algorithm
 rc80211_pid-y := rc80211_pid_algo.o
@@ -58,4 +58,4 @@ mac80211-$(CONFIG_MAC80211_RC_PID) += $(rc80211_pid-y)
 mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y)
 mac80211-$(CONFIG_MAC80211_RC_MINSTREL_HT) += $(rc80211_minstrel_ht-y)
 
-ccflags-y += -D__CHECK_ENDIAN__
+ccflags-y += -D__CHECK_ENDIAN__ -DDEBUG
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 32ef11d69798..186d9919b043 100644
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -74,15 +74,17 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
 
         RCU_INIT_POINTER(sta->ampdu_mlme.tid_rx[tid], NULL);
 
-        ht_vdbg("Rx BA session stop requested for %pM tid %u %s reason: %d\n",
-                sta->sta.addr, tid,
-                initiator == WLAN_BACK_RECIPIENT ? "recipient" : "inititator",
-                (int)reason);
+        ht_dbg(sta->sdata,
+               "Rx BA session stop requested for %pM tid %u %s reason: %d\n",
+               sta->sta.addr, tid,
+               initiator == WLAN_BACK_RECIPIENT ? "recipient" : "inititator",
+               (int)reason);
 
         if (drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_STOP,
                              &sta->sta, tid, NULL, 0))
-                pr_debug("HW problem - can not stop rx aggregation for tid %d\n",
-                         tid);
+                sdata_info(sta->sdata,
+                           "HW problem - can not stop rx aggregation for tid %d\n",
+                           tid);
 
         /* check if this is a self generated aggregation halt */
         if (initiator == WLAN_BACK_RECIPIENT && tx)
@@ -157,7 +159,7 @@ static void sta_rx_agg_session_timer_expired(unsigned long data)
         }
         rcu_read_unlock();
 
-        ht_vdbg("rx session timer expired on tid %d\n", (u16)*ptid);
+        ht_dbg(sta->sdata, "rx session timer expired on tid %d\n", (u16)*ptid);
 
         set_bit(*ptid, sta->ampdu_mlme.tid_rx_timer_expired);
         ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work);
@@ -245,7 +247,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
         status = WLAN_STATUS_REQUEST_DECLINED;
 
         if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
-                ht_vdbg("Suspend in progress - Denying ADDBA request\n");
+                ht_dbg(sta->sdata, "Suspend in progress - Denying ADDBA request\n");
                 goto end_no_lock;
         }
 
@@ -257,10 +259,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
              (!(sta->sta.ht_cap.cap & IEEE80211_HT_CAP_DELAY_BA))) ||
             (buf_size > IEEE80211_MAX_AMPDU_BUF)) {
                 status = WLAN_STATUS_INVALID_QOS_PARAM;
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                net_dbg_ratelimited("AddBA Req with bad params from %pM on tid %u. policy %d, buffer size %d\n",
-                                    mgmt->sa, tid, ba_policy, buf_size);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+                ht_dbg_ratelimited(sta->sdata,
+                                   "AddBA Req with bad params from %pM on tid %u. policy %d, buffer size %d\n",
+                                   mgmt->sa, tid, ba_policy, buf_size);
                 goto end_no_lock;
         }
         /* determine default buffer size */
@@ -275,10 +276,9 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
         mutex_lock(&sta->ampdu_mlme.mtx);
 
         if (sta->ampdu_mlme.tid_rx[tid]) {
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                net_dbg_ratelimited("unexpected AddBA Req from %pM on tid %u\n",
-                                    mgmt->sa, tid);
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+                ht_dbg_ratelimited(sta->sdata,
+                                   "unexpected AddBA Req from %pM on tid %u\n",
+                                   mgmt->sa, tid);
 
                 /* delete existing Rx BA session on the same tid */
                 ___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
@@ -317,7 +317,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
 
         ret = drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_START,
                                &sta->sta, tid, &start_seq_num, 0);
-        ht_vdbg("Rx A-MPDU request on tid %d result %d\n", tid, ret);
+        ht_dbg(sta->sdata, "Rx A-MPDU request on tid %d result %d\n", tid, ret);
         if (ret) {
                 kfree(tid_agg_rx->reorder_buf);
                 kfree(tid_agg_rx->reorder_time);
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index da07f01cfe4d..5cc1bf7d8033 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -184,8 +184,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
 
         spin_unlock_bh(&sta->lock);
 
-        ht_vdbg("Tx BA session stop requested for %pM tid %u\n",
-                sta->sta.addr, tid);
+        ht_dbg(sta->sdata, "Tx BA session stop requested for %pM tid %u\n",
+               sta->sta.addr, tid);
 
         del_timer_sync(&tid_tx->addba_resp_timer);
         del_timer_sync(&tid_tx->session_timer);
@@ -251,12 +251,13 @@ static void sta_addba_resp_timer_expired(unsigned long data)
         if (!tid_tx ||
             test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) {
                 rcu_read_unlock();
-                ht_vdbg("timer expired on tid %d but we are not (or no longer) expecting addBA response there\n",
-                        tid);
+                ht_dbg(sta->sdata,
+                       "timer expired on tid %d but we are not (or no longer) expecting addBA response there\n",
+                       tid);
                 return;
         }
 
-        ht_vdbg("addBA response timer expired on tid %d\n", tid);
+        ht_dbg(sta->sdata, "addBA response timer expired on tid %d\n", tid);
 
         ieee80211_stop_tx_ba_session(&sta->sta, tid);
         rcu_read_unlock();
@@ -316,8 +317,9 @@ ieee80211_agg_splice_packets(struct ieee80211_sub_if_data *sdata,
 
         ieee80211_stop_queue_agg(sdata, tid);
 
-        if (WARN(!tid_tx, "TID %d gone but expected when splicing aggregates"
-                          " from the pending queue\n", tid))
+        if (WARN(!tid_tx,
+                 "TID %d gone but expected when splicing aggregates from the pending queue\n",
+                 tid))
                 return;
 
         if (!skb_queue_empty(&tid_tx->pending)) {
@@ -365,7 +367,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
         ret = drv_ampdu_action(local, sdata, IEEE80211_AMPDU_TX_START,
                                &sta->sta, tid, &start_seq_num, 0);
         if (ret) {
-                ht_vdbg("BA request denied - HW unavailable for tid %d\n", tid);
+                ht_dbg(sdata,
+                       "BA request denied - HW unavailable for tid %d\n", tid);
                 spin_lock_bh(&sta->lock);
                 ieee80211_agg_splice_packets(sdata, tid_tx, tid);
                 ieee80211_assign_tid_tx(sta, tid, NULL);
@@ -378,7 +381,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
 
         /* activate the timer for the recipient's addBA response */
         mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);
-        ht_vdbg("activated addBA response timer on tid %d\n", tid);
+        ht_dbg(sdata, "activated addBA response timer on tid %d\n", tid);
 
         spin_lock_bh(&sta->lock);
         sta->ampdu_mlme.last_addba_req_time[tid] = jiffies;
@@ -425,7 +428,7 @@ static void sta_tx_agg_session_timer_expired(unsigned long data)
 
         rcu_read_unlock();
 
-        ht_vdbg("tx session timer expired on tid %d\n", (u16)*ptid);
+        ht_dbg(sta->sdata, "tx session timer expired on tid %d\n", (u16)*ptid);
 
         ieee80211_stop_tx_ba_session(&sta->sta, *ptid);
 }
@@ -449,8 +452,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
             (local->hw.flags & IEEE80211_HW_TX_AMPDU_SETUP_IN_HW))
                 return -EINVAL;
 
-        ht_vdbg("Open BA session requested for %pM tid %u\n",
-                pubsta->addr, tid);
+        ht_dbg(sdata, "Open BA session requested for %pM tid %u\n",
+               pubsta->addr, tid);
 
         if (sdata->vif.type != NL80211_IFTYPE_STATION &&
             sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
@@ -460,7 +463,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
                 return -EINVAL;
 
         if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
-                ht_vdbg("BA sessions blocked - Denying BA session request\n");
+                ht_dbg(sdata,
+                       "BA sessions blocked - Denying BA session request\n");
                 return -EINVAL;
         }
 
@@ -478,8 +482,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
          */
         if (sta->sdata->vif.type == NL80211_IFTYPE_ADHOC &&
             !sta->sta.ht_cap.ht_supported) {
-                ht_vdbg("BA request denied - IBSS STA %pM does not advertise HT support\n",
-                        pubsta->addr);
+                ht_dbg(sdata,
+                       "BA request denied - IBSS STA %pM does not advertise HT support\n",
+                       pubsta->addr);
                 return -EINVAL;
         }
 
@@ -499,8 +504,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
         if (sta->ampdu_mlme.addba_req_num[tid] > HT_AGG_BURST_RETRIES &&
             time_before(jiffies, sta->ampdu_mlme.last_addba_req_time[tid] +
                         HT_AGG_RETRIES_PERIOD)) {
-                ht_vdbg("BA request denied - waiting a grace period after %d failed requests on tid %u\n",
-                        sta->ampdu_mlme.addba_req_num[tid], tid);
+                ht_dbg(sdata,
+                       "BA request denied - waiting a grace period after %d failed requests on tid %u\n",
+                       sta->ampdu_mlme.addba_req_num[tid], tid);
                 ret = -EBUSY;
                 goto err_unlock_sta;
         }
@@ -508,8 +514,9 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
         /* check if the TID is not in aggregation flow already */
         if (tid_tx || sta->ampdu_mlme.tid_start_tx[tid]) {
-                ht_vdbg("BA request denied - session is not idle on tid %u\n",
-                        tid);
+                ht_dbg(sdata,
+                       "BA request denied - session is not idle on tid %u\n",
+                       tid);
                 ret = -EAGAIN;
                 goto err_unlock_sta;
         }
@@ -564,7 +571,7 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local,
 
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 
-        ht_vdbg("Aggregation is on for tid %d\n", tid);
+        ht_dbg(sta->sdata, "Aggregation is on for tid %d\n", tid);
 
         drv_ampdu_action(local, sta->sdata,
                          IEEE80211_AMPDU_TX_OPERATIONAL,
@@ -598,7 +605,8 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         trace_api_start_tx_ba_cb(sdata, ra, tid);
 
         if (tid >= STA_TID_NUM) {
-                ht_vdbg("Bad TID value: tid = %d (>= %d)\n", tid, STA_TID_NUM);
+                ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n",
+                       tid, STA_TID_NUM);
                 return;
         }
 
@@ -606,7 +614,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         sta = sta_info_get_bss(sdata, ra);
         if (!sta) {
                 mutex_unlock(&local->sta_mtx);
-                ht_vdbg("Could not find station: %pM\n", ra);
+                ht_dbg(sdata, "Could not find station: %pM\n", ra);
                 return;
         }
 
@@ -614,7 +622,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 
         if (WARN_ON(!tid_tx)) {
-                ht_vdbg("addBA was not requested!\n");
+                ht_dbg(sdata, "addBA was not requested!\n");
                 goto unlock;
         }
 
@@ -714,17 +722,18 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
         trace_api_stop_tx_ba_cb(sdata, ra, tid);
 
         if (tid >= STA_TID_NUM) {
-                ht_vdbg("Bad TID value: tid = %d (>= %d)\n", tid, STA_TID_NUM);
+                ht_dbg(sdata, "Bad TID value: tid = %d (>= %d)\n",
+                       tid, STA_TID_NUM);
                 return;
         }
 
-        ht_vdbg("Stopping Tx BA session for %pM tid %d\n", ra, tid);
+        ht_dbg(sdata, "Stopping Tx BA session for %pM tid %d\n", ra, tid);
 
         mutex_lock(&local->sta_mtx);
 
         sta = sta_info_get_bss(sdata, ra);
         if (!sta) {
-                ht_vdbg("Could not find station: %pM\n", ra);
+                ht_dbg(sdata, "Could not find station: %pM\n", ra);
                 goto unlock;
         }
 
@@ -733,7 +742,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
         tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
 
         if (!tid_tx || !test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
-                ht_vdbg("unexpected callback to A-MPDU stop\n");
+                ht_dbg(sdata, "unexpected callback to A-MPDU stop\n");
                 goto unlock_sta;
         }
 
@@ -809,13 +818,13 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
                 goto out;
 
         if (mgmt->u.action.u.addba_resp.dialog_token != tid_tx->dialog_token) {
-                ht_vdbg("wrong addBA response token, tid %d\n", tid);
+                ht_dbg(sta->sdata, "wrong addBA response token, tid %d\n", tid);
                 goto out;
         }
 
         del_timer_sync(&tid_tx->addba_resp_timer);
 
-        ht_vdbg("switched off addBA timer for tid %d\n", tid);
+        ht_dbg(sta->sdata, "switched off addBA timer for tid %d\n", tid);
 
         /*
          * addba_resp_timer may have fired before we got here, and
@@ -824,8 +833,9 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
          */
         if (test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state) ||
             test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
-                ht_vdbg("got addBA resp for tid %d but we already gave up\n",
-                        tid);
+                ht_dbg(sta->sdata,
+                       "got addBA resp for tid %d but we already gave up\n",
+                       tid);
                 goto out;
         }
 
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 85ac364f4636..c2a2dcbfdf01 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -353,6 +353,7 @@ void sta_set_rate_info_tx(struct sta_info *sta,
 static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
 {
         struct ieee80211_sub_if_data *sdata = sta->sdata;
+        struct ieee80211_local *local = sdata->local;
         struct timespec uptime;
 
         sinfo->generation = sdata->local->sta_generation;
@@ -388,7 +389,9 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
         if ((sta->local->hw.flags & IEEE80211_HW_SIGNAL_DBM) ||
             (sta->local->hw.flags & IEEE80211_HW_SIGNAL_UNSPEC)) {
                 sinfo->filled |= STATION_INFO_SIGNAL | STATION_INFO_SIGNAL_AVG;
-                sinfo->signal = (s8)sta->last_signal;
+                if (!local->ops->get_rssi ||
+                    drv_get_rssi(local, sdata, &sta->sta, &sinfo->signal))
+                        sinfo->signal = (s8)sta->last_signal;
                 sinfo->signal_avg = (s8) -ewma_read(&sta->avg_signal);
         }
 
@@ -517,7 +520,7 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,
          * network device.
          */
 
-        rcu_read_lock();
+        mutex_lock(&local->sta_mtx);
 
         if (sdata->vif.type == NL80211_IFTYPE_STATION) {
                 sta = sta_info_get_bss(sdata, sdata->u.mgd.bssid);
@@ -546,7 +549,7 @@ static void ieee80211_get_et_stats(struct wiphy *wiphy,
                         data[i] = (u8)sinfo.signal_avg;
                 i++;
         } else {
-                list_for_each_entry_rcu(sta, &local->sta_list, list) {
+                list_for_each_entry(sta, &local->sta_list, list) {
                         /* Make sure this station belongs to the proper dev */
                         if (sta->sdata->dev != dev)
                                 continue;
@@ -603,7 +606,7 @@ do_survey:
         else
                 data[i++] = -1LL;
 
-        rcu_read_unlock();
+        mutex_unlock(&local->sta_mtx);
 
         if (WARN_ON(i != STA_STATS_LEN))
                 return;
@@ -629,10 +632,11 @@ static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
                                  int idx, u8 *mac, struct station_info *sinfo)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = sdata->local;
         struct sta_info *sta;
         int ret = -ENOENT;
 
-        rcu_read_lock();
+        mutex_lock(&local->sta_mtx);
 
         sta = sta_info_get_by_idx(sdata, idx);
         if (sta) {
@@ -641,7 +645,7 @@ static int ieee80211_dump_station(struct wiphy *wiphy, struct net_device *dev,
                 sta_set_sinfo(sta, sinfo);
         }
 
-        rcu_read_unlock();
+        mutex_unlock(&local->sta_mtx);
 
         return ret;
 }
@@ -658,10 +662,11 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
                                  u8 *mac, struct station_info *sinfo)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
+        struct ieee80211_local *local = sdata->local;
         struct sta_info *sta;
         int ret = -ENOENT;
 
-        rcu_read_lock();
+        mutex_lock(&local->sta_mtx);
 
         sta = sta_info_get_bss(sdata, mac);
         if (sta) {
@@ -669,7 +674,7 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
                 sta_set_sinfo(sta, sinfo);
         }
 
-        rcu_read_unlock();
+        mutex_unlock(&local->sta_mtx);
 
         return ret;
 }
@@ -689,7 +694,8 @@ static int ieee80211_set_channel(struct wiphy *wiphy,
         case CHAN_MODE_HOPPING:
                 return -EBUSY;
         case CHAN_MODE_FIXED:
-                if (local->oper_channel != chan)
+                if (local->oper_channel != chan ||
+                    (!sdata && local->_oper_channel_type != channel_type))
                         return -EBUSY;
                 if (!sdata && local->_oper_channel_type == channel_type)
                         return 0;
@@ -1529,7 +1535,7 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
         if (_chg_mesh_attr(NL80211_MESHCONF_TTL, mask))
                 conf->dot11MeshTTL = nconf->dot11MeshTTL;
         if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask))
-                conf->dot11MeshTTL = nconf->element_ttl;
+                conf->element_ttl = nconf->element_ttl;
         if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask))
                 conf->auto_open_plinks = nconf->auto_open_plinks;
         if (_chg_mesh_attr(NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, mask))
@@ -1564,17 +1570,16 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
                  * announcements, so require this ifmsh to also be a root node
                  * */
                 if (nconf->dot11MeshGateAnnouncementProtocol &&
-                    !conf->dot11MeshHWMPRootMode) {
-                        conf->dot11MeshHWMPRootMode = 1;
+                    !(conf->dot11MeshHWMPRootMode > IEEE80211_ROOTMODE_ROOT)) {
+                        conf->dot11MeshHWMPRootMode = IEEE80211_PROACTIVE_RANN;
                         ieee80211_mesh_root_setup(ifmsh);
                 }
                 conf->dot11MeshGateAnnouncementProtocol =
                         nconf->dot11MeshGateAnnouncementProtocol;
         }
-        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) {
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask))
                 conf->dot11MeshHWMPRannInterval =
                         nconf->dot11MeshHWMPRannInterval;
-        }
         if (_chg_mesh_attr(NL80211_MESHCONF_FORWARDING, mask))
                 conf->dot11MeshForwarding = nconf->dot11MeshForwarding;
         if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) {
@@ -1590,6 +1595,15 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
                 sdata->vif.bss_conf.ht_operation_mode = nconf->ht_opmode;
                 ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_HT);
         }
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT, mask))
+                conf->dot11MeshHWMPactivePathToRootTimeout =
+                        nconf->dot11MeshHWMPactivePathToRootTimeout;
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ROOT_INTERVAL, mask))
+                conf->dot11MeshHWMProotInterval =
+                        nconf->dot11MeshHWMProotInterval;
+        if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL, mask))
+                conf->dot11MeshHWMPconfirmationInterval =
+                        nconf->dot11MeshHWMPconfirmationInterval;
         return 0;
 }
 
@@ -2309,6 +2323,21 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
 
         mutex_lock(&local->mtx);
         list_for_each_entry_safe(roc, tmp, &local->roc_list, list) {
+                struct ieee80211_roc_work *dep, *tmp2;
+
+                list_for_each_entry_safe(dep, tmp2, &roc->dependents, list) {
+                        if (!mgmt_tx && (unsigned long)dep != cookie)
+                                continue;
+                        else if (mgmt_tx && dep->mgmt_tx_cookie != cookie)
+                                continue;
+                        /* found dependent item -- just remove it */
+                        list_del(&dep->list);
+                        mutex_unlock(&local->mtx);
+
+                        ieee80211_roc_notify_destroy(dep);
+                        return 0;
+                }
+
                 if (!mgmt_tx && (unsigned long)roc != cookie)
                         continue;
                 else if (mgmt_tx && roc->mgmt_tx_cookie != cookie)
@@ -2323,6 +2352,13 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
                 return -ENOENT;
         }
 
+        /*
+         * We found the item to cancel, so do that. Note that it
+         * may have dependents, which we also cancel (and send
+         * the expired signal for.) Not doing so would be quite
+         * tricky here, but we may need to fix it later.
+         */
+
         if (local->ops->remain_on_channel) {
                 if (found->started) {
                         ret = drv_cancel_remain_on_channel(local);
@@ -2334,8 +2370,8 @@ static int ieee80211_cancel_roc(struct ieee80211_local *local,
 
                 list_del(&found->list);
 
-                ieee80211_run_deferred_scan(local);
-                ieee80211_start_next_roc(local);
+                if (found->started)
+                        ieee80211_start_next_roc(local);
                 mutex_unlock(&local->mtx);
 
                 ieee80211_roc_notify_destroy(found);
@@ -2489,16 +2525,30 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
                                           u16 frame_type, bool reg)
 {
         struct ieee80211_local *local = wiphy_priv(wiphy);
+        struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
 
-        if (frame_type != (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ))
-                return;
+        switch (frame_type) {
+        case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH:
+                if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
+                        struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
 
-        if (reg)
-                local->probe_req_reg++;
-        else
-                local->probe_req_reg--;
+                        if (reg)
+                                ifibss->auth_frame_registrations++;
+                        else
+                                ifibss->auth_frame_registrations--;
+                }
+                break;
+        case IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ:
+                if (reg)
+                        local->probe_req_reg++;
+                else
+                        local->probe_req_reg--;
 
-        ieee80211_queue_work(&local->hw, &local->reconfig_filter);
+                ieee80211_queue_work(&local->hw, &local->reconfig_filter);
+                break;
+        default:
+                break;
+        }
 }
 
 static int ieee80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)
@@ -2724,9 +2774,8 @@ static int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
             !sdata->u.mgd.associated)
                 return -EINVAL;
 
-#ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG
-        pr_debug("TDLS mgmt action %d peer %pM\n", action_code, peer);
-#endif
+        tdls_dbg(sdata, "TDLS mgmt action %d peer %pM\n",
+                 action_code, peer);
 
         skb = dev_alloc_skb(local->hw.extra_tx_headroom +
                             max(sizeof(struct ieee80211_mgmt),
@@ -2835,9 +2884,7 @@ static int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
         if (sdata->vif.type != NL80211_IFTYPE_STATION)
                 return -EINVAL;
 
-#ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG
-        pr_debug("TDLS oper %d peer %pM\n", oper, peer);
-#endif
+        tdls_dbg(sdata, "TDLS oper %d peer %pM\n", oper, peer);
 
         switch (oper) {
         case NL80211_TDLS_ENABLE_LINK:
diff --git a/net/mac80211/debug.h b/net/mac80211/debug.h
new file mode 100644
index 000000000000..8f383a576016
--- /dev/null
+++ b/net/mac80211/debug.h
@@ -0,0 +1,170 @@
+#ifndef __MAC80211_DEBUG_H
+#define __MAC80211_DEBUG_H
+#include <net/cfg80211.h>
+
+#ifdef CONFIG_MAC80211_IBSS_DEBUG
+#define MAC80211_IBSS_DEBUG 1
+#else
+#define MAC80211_IBSS_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_PS_DEBUG
+#define MAC80211_PS_DEBUG 1
+#else
+#define MAC80211_PS_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_HT_DEBUG
+#define MAC80211_HT_DEBUG 1
+#else
+#define MAC80211_HT_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MPL_DEBUG
+#define MAC80211_MPL_DEBUG 1
+#else
+#define MAC80211_MPL_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MPATH_DEBUG
+#define MAC80211_MPATH_DEBUG 1
+#else
+#define MAC80211_MPATH_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MHWMP_DEBUG
+#define MAC80211_MHWMP_DEBUG 1
+#else
+#define MAC80211_MHWMP_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MESH_SYNC_DEBUG
+#define MAC80211_MESH_SYNC_DEBUG 1
+#else
+#define MAC80211_MESH_SYNC_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_TDLS_DEBUG
+#define MAC80211_TDLS_DEBUG 1
+#else
+#define MAC80211_TDLS_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_STA_DEBUG
+#define MAC80211_STA_DEBUG 1
+#else
+#define MAC80211_STA_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MLME_DEBUG
+#define MAC80211_MLME_DEBUG 1
+#else
+#define MAC80211_MLME_DEBUG 0
+#endif
+
+#ifdef CONFIG_MAC80211_MESSAGE_TRACING
+void __sdata_info(const char *fmt, ...) __printf(1, 2);
+void __sdata_dbg(bool print, const char *fmt, ...) __printf(2, 3);
+void __sdata_err(const char *fmt, ...) __printf(1, 2);
+void __wiphy_dbg(struct wiphy *wiphy, bool print, const char *fmt, ...)
+        __printf(3, 4);
+
+#define _sdata_info(sdata, fmt, ...)                                    \
+        __sdata_info("%s: " fmt, (sdata)->name, ##__VA_ARGS__)
+#define _sdata_dbg(print, sdata, fmt, ...)                              \
+        __sdata_dbg(print, "%s: " fmt, (sdata)->name, ##__VA_ARGS__)
+#define _sdata_err(sdata, fmt, ...)                                     \
+        __sdata_err("%s: " fmt, (sdata)->name, ##__VA_ARGS__)
+#define _wiphy_dbg(print, wiphy, fmt, ...)                              \
+        __wiphy_dbg(wiphy, print, fmt, ##__VA_ARGS__)
+#else
+#define _sdata_info(sdata, fmt, ...)                                    \
+do {                                                                    \
+        pr_info("%s: " fmt,                                             \
+                (sdata)->name, ##__VA_ARGS__);                          \
+} while (0)
+
+#define _sdata_dbg(print, sdata, fmt, ...)                              \
+do {                                                                    \
+        if (print)                                                      \
+                pr_debug("%s: " fmt,                                    \
+                         (sdata)->name, ##__VA_ARGS__);                 \
+} while (0)
+
+#define _sdata_err(sdata, fmt, ...)                                     \
+do {                                                                    \
+        pr_err("%s: " fmt,                                              \
+               (sdata)->name, ##__VA_ARGS__);                           \
+} while (0)
+
+#define _wiphy_dbg(print, wiphy, fmt, ...)                              \
+do {                                                                    \
+        if (print)                                                      \
+                wiphy_dbg((wiphy), fmt, ##__VA_ARGS__);                 \
+} while (0)
+#endif
+
+#define sdata_info(sdata, fmt, ...)                                     \
+        _sdata_info(sdata, fmt, ##__VA_ARGS__)
+#define sdata_err(sdata, fmt, ...)                                      \
+        _sdata_err(sdata, fmt, ##__VA_ARGS__)
+#define sdata_dbg(sdata, fmt, ...)                                      \
+        _sdata_dbg(1, sdata, fmt, ##__VA_ARGS__)
+
+#define ht_dbg(sdata, fmt, ...)                                         \
+        _sdata_dbg(MAC80211_HT_DEBUG,                                   \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define ht_dbg_ratelimited(sdata, fmt, ...)                             \
+        _sdata_dbg(MAC80211_HT_DEBUG && net_ratelimit(),                \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define ibss_dbg(sdata, fmt, ...)                                       \
+        _sdata_dbg(MAC80211_IBSS_DEBUG,                                 \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define ps_dbg(sdata, fmt, ...)                                         \
+        _sdata_dbg(MAC80211_PS_DEBUG,                                   \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define ps_dbg_hw(hw, fmt, ...)                                         \
+        _wiphy_dbg(MAC80211_PS_DEBUG,                                   \
+                   (hw)->wiphy, fmt, ##__VA_ARGS__)
+
+#define ps_dbg_ratelimited(sdata, fmt, ...)                             \
+        _sdata_dbg(MAC80211_PS_DEBUG && net_ratelimit(),                \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mpl_dbg(sdata, fmt, ...)                                        \
+        _sdata_dbg(MAC80211_MPL_DEBUG,                                  \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mpath_dbg(sdata, fmt, ...)                                      \
+        _sdata_dbg(MAC80211_MPATH_DEBUG,                                \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mhwmp_dbg(sdata, fmt, ...)                                      \
+        _sdata_dbg(MAC80211_MHWMP_DEBUG,                                \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define msync_dbg(sdata, fmt, ...)                                      \
+        _sdata_dbg(MAC80211_MESH_SYNC_DEBUG,                            \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define tdls_dbg(sdata, fmt, ...)                                       \
+        _sdata_dbg(MAC80211_TDLS_DEBUG,                                 \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define sta_dbg(sdata, fmt, ...)                                        \
+        _sdata_dbg(MAC80211_STA_DEBUG,                                  \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mlme_dbg(sdata, fmt, ...)                                       \
+        _sdata_dbg(MAC80211_MLME_DEBUG,                                 \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#define mlme_dbg_ratelimited(sdata, fmt, ...)                           \
+        _sdata_dbg(MAC80211_MLME_DEBUG && net_ratelimit(),              \
+                   sdata, fmt, ##__VA_ARGS__)
+
+#endif /* __MAC80211_DEBUG_H */
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index d4272ff43f71..6d5aec9418ee 100644
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -468,48 +468,54 @@ IEEE80211_IF_FILE(fwded_unicast, u.mesh.mshstats.fwded_unicast, DEC);
 IEEE80211_IF_FILE(fwded_frames, u.mesh.mshstats.fwded_frames, DEC);
 IEEE80211_IF_FILE(dropped_frames_ttl, u.mesh.mshstats.dropped_frames_ttl, DEC);
 IEEE80211_IF_FILE(dropped_frames_congestion,
-                u.mesh.mshstats.dropped_frames_congestion, DEC);
+                  u.mesh.mshstats.dropped_frames_congestion, DEC);
 IEEE80211_IF_FILE(dropped_frames_no_route,
-                u.mesh.mshstats.dropped_frames_no_route, DEC);
+                  u.mesh.mshstats.dropped_frames_no_route, DEC);
 IEEE80211_IF_FILE(estab_plinks, u.mesh.mshstats.estab_plinks, ATOMIC);
 
 /* Mesh parameters */
 IEEE80211_IF_FILE(dot11MeshMaxRetries,
-                u.mesh.mshcfg.dot11MeshMaxRetries, DEC);
+                  u.mesh.mshcfg.dot11MeshMaxRetries, DEC);
 IEEE80211_IF_FILE(dot11MeshRetryTimeout,
-                u.mesh.mshcfg.dot11MeshRetryTimeout, DEC);
+                  u.mesh.mshcfg.dot11MeshRetryTimeout, DEC);
 IEEE80211_IF_FILE(dot11MeshConfirmTimeout,
-                u.mesh.mshcfg.dot11MeshConfirmTimeout, DEC);
+                  u.mesh.mshcfg.dot11MeshConfirmTimeout, DEC);
 IEEE80211_IF_FILE(dot11MeshHoldingTimeout,
-                u.mesh.mshcfg.dot11MeshHoldingTimeout, DEC);
+                  u.mesh.mshcfg.dot11MeshHoldingTimeout, DEC);
 IEEE80211_IF_FILE(dot11MeshTTL, u.mesh.mshcfg.dot11MeshTTL, DEC);
 IEEE80211_IF_FILE(element_ttl, u.mesh.mshcfg.element_ttl, DEC);
 IEEE80211_IF_FILE(auto_open_plinks, u.mesh.mshcfg.auto_open_plinks, DEC);
 IEEE80211_IF_FILE(dot11MeshMaxPeerLinks,
-                u.mesh.mshcfg.dot11MeshMaxPeerLinks, DEC);
+                  u.mesh.mshcfg.dot11MeshMaxPeerLinks, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPactivePathTimeout,
-                u.mesh.mshcfg.dot11MeshHWMPactivePathTimeout, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPactivePathTimeout, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPpreqMinInterval,
-                u.mesh.mshcfg.dot11MeshHWMPpreqMinInterval, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPpreqMinInterval, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPperrMinInterval,
-                u.mesh.mshcfg.dot11MeshHWMPperrMinInterval, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPperrMinInterval, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPnetDiameterTraversalTime,
-                u.mesh.mshcfg.dot11MeshHWMPnetDiameterTraversalTime, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPnetDiameterTraversalTime, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPmaxPREQretries,
-                u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries, DEC);
 IEEE80211_IF_FILE(path_refresh_time,
-                u.mesh.mshcfg.path_refresh_time, DEC);
+                  u.mesh.mshcfg.path_refresh_time, DEC);
 IEEE80211_IF_FILE(min_discovery_timeout,
-                u.mesh.mshcfg.min_discovery_timeout, DEC);
+                  u.mesh.mshcfg.min_discovery_timeout, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPRootMode,
-                u.mesh.mshcfg.dot11MeshHWMPRootMode, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPRootMode, DEC);
 IEEE80211_IF_FILE(dot11MeshGateAnnouncementProtocol,
-                u.mesh.mshcfg.dot11MeshGateAnnouncementProtocol, DEC);
+                  u.mesh.mshcfg.dot11MeshGateAnnouncementProtocol, DEC);
 IEEE80211_IF_FILE(dot11MeshHWMPRannInterval,
-                u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC);
+                  u.mesh.mshcfg.dot11MeshHWMPRannInterval, DEC);
 IEEE80211_IF_FILE(dot11MeshForwarding, u.mesh.mshcfg.dot11MeshForwarding, DEC);
 IEEE80211_IF_FILE(rssi_threshold, u.mesh.mshcfg.rssi_threshold, DEC);
 IEEE80211_IF_FILE(ht_opmode, u.mesh.mshcfg.ht_opmode, DEC);
+IEEE80211_IF_FILE(dot11MeshHWMPactivePathToRootTimeout,
+                  u.mesh.mshcfg.dot11MeshHWMPactivePathToRootTimeout, DEC);
+IEEE80211_IF_FILE(dot11MeshHWMProotInterval,
+                  u.mesh.mshcfg.dot11MeshHWMProotInterval, DEC);
+IEEE80211_IF_FILE(dot11MeshHWMPconfirmationInterval,
+                  u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval, DEC);
 #endif
 
 #define DEBUGFS_ADD_MODE(name, mode) \
@@ -611,6 +617,9 @@ static void add_mesh_config(struct ieee80211_sub_if_data *sdata)
         MESHPARAMS_ADD(dot11MeshGateAnnouncementProtocol);
         MESHPARAMS_ADD(rssi_threshold);
         MESHPARAMS_ADD(ht_opmode);
+        MESHPARAMS_ADD(dot11MeshHWMPactivePathToRootTimeout);
+        MESHPARAMS_ADD(dot11MeshHWMProotInterval);
+        MESHPARAMS_ADD(dot11MeshHWMPconfirmationInterval);
 #undef MESHPARAMS_ADD
 }
 #endif
@@ -686,6 +695,7 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata)
 
         sprintf(buf, "netdev:%s", sdata->name);
         if (!debugfs_rename(dir->d_parent, dir, dir->d_parent, buf))
-                pr_err("mac80211: debugfs: failed to rename debugfs "
-                       "dir to %s\n", buf);
+                sdata_err(sdata,
+                          "debugfs: failed to rename debugfs dir to %s\n",
+                          buf);
 }
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 6d33a0c743ab..44e8c1242781 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -3,7 +3,7 @@
 
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
-#include "driver-trace.h"
+#include "trace.h"
 
 static inline void check_sdata_in_driver(struct ieee80211_sub_if_data *sdata)
 {
@@ -845,4 +845,19 @@ drv_allow_buffered_frames(struct ieee80211_local *local,
                                                   more_data);
         trace_drv_return_void(local);
 }
+
+static inline int drv_get_rssi(struct ieee80211_local *local,
+                                struct ieee80211_sub_if_data *sdata,
+                                struct ieee80211_sta *sta,
+                                s8 *rssi_dbm)
+{
+        int ret;
+
+        might_sleep();
+
+        ret = local->ops->get_rssi(&local->hw, &sdata->vif, sta, rssi_dbm);
+        trace_drv_get_rssi(local, sta, *rssi_dbm, ret);
+
+        return ret;
+}
 #endif /* __MAC80211_DRIVER_OPS */
diff --git a/net/mac80211/driver-trace.c b/net/mac80211/driver-trace.c
deleted file mode 100644
index 8ed8711b1a6d..000000000000
--- a/net/mac80211/driver-trace.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* bug in tracepoint.h, it should include this */
-#include <linux/module.h>
-
-/* sparse isn't too happy with all macros... */
-#ifndef __CHECKER__
-#include "driver-ops.h"
-#define CREATE_TRACE_POINTS
-#include "driver-trace.h"
-#endif
diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c
index 6f8615c54b22..4b4538d63925 100644
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
@@ -305,12 +305,10 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
         tid = (params & IEEE80211_DELBA_PARAM_TID_MASK) >> 12;
         initiator = (params & IEEE80211_DELBA_PARAM_INITIATOR_MASK) >> 11;
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-        net_dbg_ratelimited("delba from %pM (%s) tid %d reason code %d\n",
-                            mgmt->sa, initiator ? "initiator" : "recipient",
-                            tid,
-                            le16_to_cpu(mgmt->u.action.u.delba.reason_code));
-#endif /* CONFIG_MAC80211_HT_DEBUG */
+        ht_dbg_ratelimited(sdata, "delba from %pM (%s) tid %d reason code %d\n",
+                           mgmt->sa, initiator ? "initiator" : "recipient",
+                           tid,
+                           le16_to_cpu(mgmt->u.action.u.delba.reason_code));
 
         if (initiator == WLAN_BACK_INITIATOR)
                 __ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_INITIATOR, 0,
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 725cb4be229d..5746d62faba1 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -261,11 +261,7 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
 
         memcpy(addr, sta->sta.addr, ETH_ALEN);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(sdata->local->hw.wiphy,
-                    "Adding new IBSS station %pM (dev=%s)\n",
-                    addr, sdata->name);
-#endif
+        ibss_dbg(sdata, "Adding new IBSS station %pM\n", addr);
 
         sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
         sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
@@ -279,9 +275,10 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
         /* If it fails, maybe we raced another insertion? */
         if (sta_info_insert_rcu(sta))
                 return sta_info_get(sdata, addr);
-        if (auth) {
-                ibss_vdbg("TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",
-                          sdata->vif.addr, sdata->u.ibss.bssid, addr);
+        if (auth && !sdata->u.ibss.auth_frame_registrations) {
+                ibss_dbg(sdata,
+                         "TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",
+                         sdata->vif.addr, sdata->u.ibss.bssid, addr);
                 ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0,
                                     addr, sdata->u.ibss.bssid, NULL, 0, 0);
         }
@@ -304,7 +301,7 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata,
          *      allow new one to be added.
          */
         if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-                net_dbg_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
+                net_info_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
                                     sdata->name, addr);
                 rcu_read_lock();
                 return NULL;
@@ -351,9 +348,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
 
         if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1)
                 return;
-        ibss_vdbg("%s: RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",
-                  sdata->name, mgmt->sa, mgmt->da, mgmt->bssid,
-                  auth_transaction);
+        ibss_dbg(sdata,
+                 "RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",
+                 mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction);
         sta_info_destroy_addr(sdata, mgmt->sa);
         ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, 0, false);
         rcu_read_unlock();
@@ -416,10 +413,10 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                                         ieee80211_mandatory_rates(local, band);
 
                                 if (sta->sta.supp_rates[band] != prev_rates) {
-                                        ibss_vdbg("%s: updated supp_rates set for %pM based on beacon/probe_resp (0x%x -> 0x%x)\n",
-                                                  sdata->name, sta->sta.addr,
-                                                  prev_rates,
-                                                  sta->sta.supp_rates[band]);
+                                        ibss_dbg(sdata,
+                                                 "updated supp_rates set for %pM based on beacon/probe_resp (0x%x -> 0x%x)\n",
+                                                 sta->sta.addr, prev_rates,
+                                                 sta->sta.supp_rates[band]);
                                         rates_updated = true;
                                 }
                         } else {
@@ -534,16 +531,18 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
                 rx_timestamp = drv_get_tsf(local, sdata);
         }
 
-        ibss_vdbg("RX beacon SA=%pM BSSID=%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
-                  mgmt->sa, mgmt->bssid,
-                  (unsigned long long)rx_timestamp,
-                  (unsigned long long)beacon_timestamp,
-                  (unsigned long long)(rx_timestamp - beacon_timestamp),
-                  jiffies);
+        ibss_dbg(sdata,
+                 "RX beacon SA=%pM BSSID=%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
+                 mgmt->sa, mgmt->bssid,
+                 (unsigned long long)rx_timestamp,
+                 (unsigned long long)beacon_timestamp,
+                 (unsigned long long)(rx_timestamp - beacon_timestamp),
+                 jiffies);
 
         if (beacon_timestamp > rx_timestamp) {
-                ibss_vdbg("%s: beacon TSF higher than local TSF - IBSS merge with BSSID %pM\n",
-                          sdata->name, mgmt->bssid);
+                ibss_dbg(sdata,
+                         "beacon TSF higher than local TSF - IBSS merge with BSSID %pM\n",
+                         mgmt->bssid);
                 ieee80211_sta_join_ibss(sdata, bss);
                 supp_rates = ieee80211_sta_get_rates(local, elems, band, NULL);
                 ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa,
@@ -569,7 +568,7 @@ void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata,
          *      allow new one to be added.
          */
         if (local->num_sta >= IEEE80211_IBSS_MAX_STA_ENTRIES) {
-                net_dbg_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
+                net_info_ratelimited("%s: No room for a new IBSS STA entry %pM\n",
                                     sdata->name, addr);
                 return;
         }
@@ -645,8 +644,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
         if (ifibss->fixed_channel)
                 return;
 
-        pr_debug("%s: No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n",
-                 sdata->name);
+        sdata_info(sdata,
+                   "No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n");
 
         ieee80211_request_internal_scan(sdata,
                         ifibss->ssid, ifibss->ssid_len, NULL);
@@ -674,8 +673,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
                 bssid[0] |= 0x02;
         }
 
-        pr_debug("%s: Creating new IBSS network, BSSID %pM\n",
-                 sdata->name, bssid);
+        sdata_info(sdata, "Creating new IBSS network, BSSID %pM\n", bssid);
 
         capability = WLAN_CAPABILITY_IBSS;
 
@@ -706,8 +704,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
         lockdep_assert_held(&ifibss->mtx);
 
         active_ibss = ieee80211_sta_active_ibss(sdata);
-        ibss_vdbg("%s: sta_find_ibss (active_ibss=%d)\n",
-                  sdata->name, active_ibss);
+        ibss_dbg(sdata, "sta_find_ibss (active_ibss=%d)\n", active_ibss);
 
         if (active_ibss)
                 return;
@@ -730,23 +727,24 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
                 struct ieee80211_bss *bss;
 
                 bss = (void *)cbss->priv;
-                ibss_vdbg("   sta_find_ibss: selected %pM current %pM\n",
-                          cbss->bssid, ifibss->bssid);
-                pr_debug("%s: Selected IBSS BSSID %pM based on configured SSID\n",
-                         sdata->name, cbss->bssid);
+                ibss_dbg(sdata,
+                         "sta_find_ibss: selected %pM current %pM\n",
+                         cbss->bssid, ifibss->bssid);
+                sdata_info(sdata,
+                           "Selected IBSS BSSID %pM based on configured SSID\n",
+                           cbss->bssid);
 
                 ieee80211_sta_join_ibss(sdata, bss);
                 ieee80211_rx_bss_put(local, bss);
                 return;
         }
 
-        ibss_vdbg("   did not try to join ibss\n");
+        ibss_dbg(sdata, "sta_find_ibss: did not try to join ibss\n");
 
         /* Selected IBSS not found in current scan results - try to scan */
         if (time_after(jiffies, ifibss->last_scan_completed +
                                         IEEE80211_SCAN_INTERVAL)) {
-                pr_debug("%s: Trigger new scan to find an IBSS to join\n",
-                         sdata->name);
+                sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
 
                 ieee80211_request_internal_scan(sdata,
                                 ifibss->ssid, ifibss->ssid_len,
@@ -760,9 +758,8 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
                                 ieee80211_sta_create_ibss(sdata);
                                 return;
                         }
-                        pr_debug("%s: IBSS not allowed on %d MHz\n",
-                                 sdata->name,
-                                 local->hw.conf.channel->center_freq);
+                        sdata_info(sdata, "IBSS not allowed on %d MHz\n",
+                                   local->hw.conf.channel->center_freq);
 
                         /* No IBSS found - decrease scan interval and continue
                          * scanning. */
@@ -797,9 +794,9 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
 
         tx_last_beacon = drv_tx_last_beacon(local);
 
-        ibss_vdbg("%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",
-                  sdata->name, mgmt->sa, mgmt->da,
-                  mgmt->bssid, tx_last_beacon);
+        ibss_dbg(sdata,
+                 "RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",
+                 mgmt->sa, mgmt->da, mgmt->bssid, tx_last_beacon);
 
         if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
                 return;
@@ -812,8 +809,8 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
         pos = mgmt->u.probe_req.variable;
         if (pos[0] != WLAN_EID_SSID ||
             pos + 2 + pos[1] > end) {
-                ibss_vdbg("%s: Invalid SSID IE in ProbeReq from %pM\n",
-                          sdata->name, mgmt->sa);
+                ibss_dbg(sdata, "Invalid SSID IE in ProbeReq from %pM\n",
+                         mgmt->sa);
                 return;
         }
         if (pos[1] != 0 &&
@@ -830,7 +827,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
 
         resp = (struct ieee80211_mgmt *) skb->data;
         memcpy(resp->da, mgmt->sa, ETH_ALEN);
-        ibss_vdbg("%s: Sending ProbeResp to %pM\n", sdata->name, resp->da);
+        ibss_dbg(sdata, "Sending ProbeResp to %pM\n", resp->da);
         IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
         ieee80211_tx_skb(sdata, skb);
 }
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index e6cbf5b68c89..f834a005e1c5 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -30,6 +30,7 @@
 #include <net/mac80211.h>
 #include "key.h"
 #include "sta_info.h"
+#include "debug.h"
 
 struct ieee80211_local;
 
@@ -55,11 +56,14 @@ struct ieee80211_local;
 #define TU_TO_JIFFIES(x)        (usecs_to_jiffies((x) * 1024))
 #define TU_TO_EXP_TIME(x)       (jiffies + TU_TO_JIFFIES(x))
 
+/*
+ * Some APs experience problems when working with U-APSD. Decrease the
+ * probability of that happening by using legacy mode for all ACs but VO.
+ * The AP that caused us trouble was a Cisco 4410N. It ignores our
+ * setting, and always treats non-VO ACs as legacy.
+ */
 #define IEEE80211_DEFAULT_UAPSD_QUEUES \
-        (IEEE80211_WMM_IE_STA_QOSINFO_AC_BK |   \
-         IEEE80211_WMM_IE_STA_QOSINFO_AC_BE |   \
-         IEEE80211_WMM_IE_STA_QOSINFO_AC_VI |   \
-         IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)
+        IEEE80211_WMM_IE_STA_QOSINFO_AC_VO
 
 #define IEEE80211_DEFAULT_MAX_SP_LEN            \
         IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL
@@ -508,6 +512,7 @@ struct ieee80211_if_ibss {
         bool privacy;
 
         bool control_port;
+        unsigned int auth_frame_registrations;
 
         u8 bssid[ETH_ALEN] __aligned(2);
         u8 ssid[IEEE80211_MAX_SSID_LEN];
@@ -677,6 +682,9 @@ struct ieee80211_sub_if_data {
         /* TID bitmap for NoAck policy */
         u16 noack_map;
 
+        /* bit field of ACM bits (BIT(802.1D tag)) */
+        u8 wmm_acm;
+
         struct ieee80211_key __rcu *keys[NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS];
         struct ieee80211_key __rcu *default_unicast_key;
         struct ieee80211_key __rcu *default_multicast_key;
@@ -881,6 +889,9 @@ struct ieee80211_local {
         /* device is started */
         bool started;
 
+        /* device is during a HW reconfig */
+        bool in_reconfig;
+
         /* wowlan is enabled -- don't reconfig on resume */
         bool wowlan;
 
@@ -1019,7 +1030,6 @@ struct ieee80211_local {
         int total_ps_buffered; /* total number of all buffered unicast and
                                 * multicast packets for power saving stations
                                 */
-        unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */
 
         bool pspolling;
         bool offchannel_ps_enabled;
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 87aeb4f21ffd..58c2ab3d483a 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -57,9 +57,6 @@ static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
                 return -EINVAL;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        pr_debug("%s: setting MTU %d\n", dev->name, new_mtu);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
         dev->mtu = new_mtu;
         return 0;
 }
@@ -100,15 +97,12 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_sub_if_data *nsdata;
-        struct net_device *dev = sdata->dev;
 
         ASSERT_RTNL();
 
         /* we hold the RTNL here so can safely walk the list */
         list_for_each_entry(nsdata, &local->interfaces, list) {
-                struct net_device *ndev = nsdata->dev;
-
-                if (ndev != dev && ieee80211_sdata_running(nsdata)) {
+                if (nsdata != sdata && ieee80211_sdata_running(nsdata)) {
                         /*
                          * Allow only a single IBSS interface to be up at any
                          * time. This is restricted because beacon distribution
@@ -127,7 +121,8 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata,
                          * The remaining checks are only performed for interfaces
                          * with the same MAC address.
                          */
-                        if (!ether_addr_equal(dev->dev_addr, ndev->dev_addr))
+                        if (!ether_addr_equal(sdata->vif.addr,
+                                              nsdata->vif.addr))
                                 continue;
 
                         /*
@@ -808,7 +803,7 @@ static u16 ieee80211_monitor_select_queue(struct net_device *dev,
 
         hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len));
 
-        return ieee80211_select_queue_80211(local, skb, hdr);
+        return ieee80211_select_queue_80211(sdata, skb, hdr);
 }
 
 static const struct net_device_ops ieee80211_monitorif_ops = {
@@ -1223,7 +1218,7 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local,
 
                 if (__ffs64(mask) + hweight64(mask) != fls64(mask)) {
                         /* not a contiguous mask ... not handled now! */
-                        pr_debug("not contiguous\n");
+                        pr_info("not contiguous\n");
                         break;
                 }
 
@@ -1414,10 +1409,6 @@ static u32 ieee80211_idle_off(struct ieee80211_local *local,
         if (!(local->hw.conf.flags & IEEE80211_CONF_IDLE))
                 return 0;
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "device no longer idle - %s\n", reason);
-#endif
-
         local->hw.conf.flags &= ~IEEE80211_CONF_IDLE;
         return IEEE80211_CONF_CHANGE_IDLE;
 }
@@ -1427,10 +1418,6 @@ static u32 ieee80211_idle_on(struct ieee80211_local *local)
         if (local->hw.conf.flags & IEEE80211_CONF_IDLE)
                 return 0;
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "device now idle\n");
-#endif
-
         drv_flush(local, false);
 
         local->hw.conf.flags |= IEEE80211_CONF_IDLE;
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 5bb600d93d77..b3b7e526e245 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -139,7 +139,7 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
         }
 
         if (ret != -ENOSPC && ret != -EOPNOTSUPP)
-                wiphy_err(key->local->hw.wiphy,
+                sdata_err(sdata,
                           "failed to set key (%d, %pM) to hardware (%d)\n",
                           key->conf.keyidx,
                           sta ? sta->sta.addr : bcast_addr, ret);
@@ -186,7 +186,7 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
                           sta ? &sta->sta : NULL, &key->conf);
 
         if (ret)
-                wiphy_err(key->local->hw.wiphy,
+                sdata_err(sdata,
                           "failed to remove key (%d, %pM) from hardware (%d)\n",
                           key->conf.keyidx,
                           sta ? sta->sta.addr : bcast_addr, ret);
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index d81c178c7712..0b040fb73673 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -345,6 +345,13 @@ void ieee80211_restart_hw(struct ieee80211_hw *hw)
         ieee80211_stop_queues_by_reason(hw,
                 IEEE80211_QUEUE_STOP_REASON_SUSPEND);
 
+        /*
+         * Stop all Rx during the reconfig. We don't want state changes
+         * or driver callbacks while this is in progress.
+         */
+        local->in_reconfig = true;
+        barrier();
+
         schedule_work(&local->restart_work);
 }
 EXPORT_SYMBOL(ieee80211_restart_hw);
@@ -455,7 +462,9 @@ static const struct ieee80211_txrx_stypes
 ieee80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = {
         [NL80211_IFTYPE_ADHOC] = {
                 .tx = 0xffff,
-                .rx = BIT(IEEE80211_STYPE_ACTION >> 4),
+                .rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
+                        BIT(IEEE80211_STYPE_AUTH >> 4) |
+                        BIT(IEEE80211_STYPE_DEAUTH >> 4),
         },
         [NL80211_IFTYPE_STATION] = {
                 .tx = 0xffff,
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c
index 7cf19509fb68..764593d65fc3 100644
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
@@ -443,7 +443,7 @@ static void ieee80211_mesh_path_root_timer(unsigned long data)
 
 void ieee80211_mesh_root_setup(struct ieee80211_if_mesh *ifmsh)
 {
-        if (ifmsh->mshcfg.dot11MeshHWMPRootMode)
+        if (ifmsh->mshcfg.dot11MeshHWMPRootMode > IEEE80211_ROOTMODE_ROOT)
                 set_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags);
         else {
                 clear_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags);
@@ -523,10 +523,6 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata,
 {
         bool free_plinks;
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        pr_debug("%s: running mesh housekeeping\n", sdata->name);
-#endif
-
         ieee80211_sta_expire(sdata, IEEE80211_MESH_PEER_INACTIVITY_LIMIT);
         mesh_path_expire(sdata);
 
@@ -541,11 +537,17 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata,
 static void ieee80211_mesh_rootpath(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
+        u32 interval;
 
         mesh_path_tx_root_frame(sdata);
+
+        if (ifmsh->mshcfg.dot11MeshHWMPRootMode == IEEE80211_PROACTIVE_RANN)
+                interval = ifmsh->mshcfg.dot11MeshHWMPRannInterval;
+        else
+                interval = ifmsh->mshcfg.dot11MeshHWMProotInterval;
+
         mod_timer(&ifmsh->mesh_path_root_timer,
-                  round_jiffies(TU_TO_EXP_TIME(
-                                  ifmsh->mshcfg.dot11MeshHWMPRannInterval)));
+                  round_jiffies(TU_TO_EXP_TIME(interval)));
 }
 
 #ifdef CONFIG_PM
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index e3642756f8f4..faaa39bcfd10 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -104,6 +104,7 @@ enum mesh_deferred_task_flags {
  * an mpath to a hash bucket on a path table.
  * @rann_snd_addr: the RANN sender address
  * @rann_metric: the aggregated path metric towards the root node
+ * @last_preq_to_root: Timestamp of last PREQ sent to root
  * @is_root: the destination station of this path is a root node
  * @is_gate: the destination station of this path is a mesh gate
  *
@@ -131,6 +132,7 @@ struct mesh_path {
         spinlock_t state_lock;
         u8 rann_snd_addr[ETH_ALEN];
         u32 rann_metric;
+        unsigned long last_preq_to_root;
         bool is_root;
         bool is_gate;
 };
@@ -245,7 +247,7 @@ void mesh_rmc_free(struct ieee80211_sub_if_data *sdata);
 int mesh_rmc_init(struct ieee80211_sub_if_data *sdata);
 void ieee80211s_init(void);
 void ieee80211s_update_metric(struct ieee80211_local *local,
-                struct sta_info *stainfo, struct sk_buff *skb);
+                struct sta_info *sta, struct sk_buff *skb);
 void ieee80211s_stop(void);
 void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata);
 void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata);
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index fa7c58035246..fb7b6a11d0ba 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -13,13 +13,6 @@
 #include "wme.h"
 #include "mesh.h"
 
-#ifdef CONFIG_MAC80211_VERBOSE_MHWMP_DEBUG
-#define mhwmp_dbg(fmt, args...) \
-        pr_debug("Mesh HWMP (%s): " fmt "\n", sdata->name, ##args)
-#else
-#define mhwmp_dbg(fmt, args...)   do { (void)(0); } while (0)
-#endif
-
 #define TEST_FRAME_LEN  8192
 #define MAX_METRIC      0xffffffff
 #define ARITH_SHIFT     8
@@ -98,6 +91,8 @@ static inline u32 u16_field_get(u8 *preq_elem, int offset, bool ae)
 #define max_preq_retries(s) (s->u.mesh.mshcfg.dot11MeshHWMPmaxPREQretries)
 #define disc_timeout_jiff(s) \
         msecs_to_jiffies(sdata->u.mesh.mshcfg.min_discovery_timeout)
+#define root_path_confirmation_jiffies(s) \
+        msecs_to_jiffies(sdata->u.mesh.mshcfg.dot11MeshHWMPconfirmationInterval)
 
 enum mpath_frame_type {
         MPATH_PREQ = 0,
@@ -142,19 +137,19 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags,
 
         switch (action) {
         case MPATH_PREQ:
-                mhwmp_dbg("sending PREQ to %pM", target);
+                mhwmp_dbg(sdata, "sending PREQ to %pM\n", target);
                 ie_len = 37;
                 pos = skb_put(skb, 2 + ie_len);
                 *pos++ = WLAN_EID_PREQ;
                 break;
         case MPATH_PREP:
-                mhwmp_dbg("sending PREP to %pM", target);
+                mhwmp_dbg(sdata, "sending PREP to %pM\n", target);
                 ie_len = 31;
                 pos = skb_put(skb, 2 + ie_len);
                 *pos++ = WLAN_EID_PREP;
                 break;
         case MPATH_RANN:
-                mhwmp_dbg("sending RANN from %pM", orig_addr);
+                mhwmp_dbg(sdata, "sending RANN from %pM\n", orig_addr);
                 ie_len = sizeof(struct ieee80211_rann_ie);
                 pos = skb_put(skb, 2 + ie_len);
                 *pos++ = WLAN_EID_RANN;
@@ -303,7 +298,7 @@ int mesh_path_error_tx(u8 ttl, u8 *target, __le32 target_sn,
 }
 
 void ieee80211s_update_metric(struct ieee80211_local *local,
-                struct sta_info *stainfo, struct sk_buff *skb)
+                struct sta_info *sta, struct sk_buff *skb)
 {
         struct ieee80211_tx_info *txinfo = IEEE80211_SKB_CB(skb);
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
@@ -315,15 +310,14 @@ void ieee80211s_update_metric(struct ieee80211_local *local,
         failed = !(txinfo->flags & IEEE80211_TX_STAT_ACK);
 
         /* moving average, scaled to 100 */
-        stainfo->fail_avg = ((80 * stainfo->fail_avg + 5) / 100 + 20 * failed);
-        if (stainfo->fail_avg > 95)
-                mesh_plink_broken(stainfo);
+        sta->fail_avg = ((80 * sta->fail_avg + 5) / 100 + 20 * failed);
+        if (sta->fail_avg > 95)
+                mesh_plink_broken(sta);
 }
 
 static u32 airtime_link_metric_get(struct ieee80211_local *local,
                                    struct sta_info *sta)
 {
-        struct ieee80211_supported_band *sband;
         struct rate_info rinfo;
         /* This should be adjusted for each device */
         int device_constant = 1 << ARITH_SHIFT;
@@ -333,8 +327,6 @@ static u32 airtime_link_metric_get(struct ieee80211_local *local,
         u32 tx_time, estimated_retx;
         u64 result;
 
-        sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
-
         if (sta->fail_avg >= 100)
                 return MAX_METRIC;
 
@@ -519,10 +511,11 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
         struct mesh_path *mpath = NULL;
         u8 *target_addr, *orig_addr;
         const u8 *da;
-        u8 target_flags, ttl;
-        u32 orig_sn, target_sn, lifetime;
+        u8 target_flags, ttl, flags;
+        u32 orig_sn, target_sn, lifetime, orig_metric;
         bool reply = false;
         bool forward = true;
+        bool root_is_gate;
 
         /* Update target SN, if present */
         target_addr = PREQ_IE_TARGET_ADDR(preq_elem);
@@ -530,11 +523,15 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
         target_sn = PREQ_IE_TARGET_SN(preq_elem);
         orig_sn = PREQ_IE_ORIG_SN(preq_elem);
         target_flags = PREQ_IE_TARGET_F(preq_elem);
+        orig_metric = metric;
+        /* Proactive PREQ gate announcements */
+        flags = PREQ_IE_FLAGS(preq_elem);
+        root_is_gate = !!(flags & RANN_FLAG_IS_GATE);
 
-        mhwmp_dbg("received PREQ from %pM", orig_addr);
+        mhwmp_dbg(sdata, "received PREQ from %pM\n", orig_addr);
 
         if (ether_addr_equal(target_addr, sdata->vif.addr)) {
-                mhwmp_dbg("PREQ is for us");
+                mhwmp_dbg(sdata, "PREQ is for us\n");
                 forward = false;
                 reply = true;
                 metric = 0;
@@ -544,6 +541,22 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                         target_sn = ++ifmsh->sn;
                         ifmsh->last_sn_update = jiffies;
                 }
+        } else if (is_broadcast_ether_addr(target_addr) &&
+                   (target_flags & IEEE80211_PREQ_TO_FLAG)) {
+                rcu_read_lock();
+                mpath = mesh_path_lookup(orig_addr, sdata);
+                if (mpath) {
+                        if (flags & IEEE80211_PREQ_PROACTIVE_PREP_FLAG) {
+                                reply = true;
+                                target_addr = sdata->vif.addr;
+                                target_sn = ++ifmsh->sn;
+                                metric = 0;
+                                ifmsh->last_sn_update = jiffies;
+                        }
+                        if (root_is_gate)
+                                mesh_path_add_gate(mpath);
+                }
+                rcu_read_unlock();
         } else {
                 rcu_read_lock();
                 mpath = mesh_path_lookup(target_addr, sdata);
@@ -570,19 +583,20 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                 lifetime = PREQ_IE_LIFETIME(preq_elem);
                 ttl = ifmsh->mshcfg.element_ttl;
                 if (ttl != 0) {
-                        mhwmp_dbg("replying to the PREQ");
+                        mhwmp_dbg(sdata, "replying to the PREQ\n");
                         mesh_path_sel_frame_tx(MPATH_PREP, 0, orig_addr,
                                 cpu_to_le32(orig_sn), 0, target_addr,
                                 cpu_to_le32(target_sn), mgmt->sa, 0, ttl,
                                 cpu_to_le32(lifetime), cpu_to_le32(metric),
                                 0, sdata);
-                } else
+                } else {
                         ifmsh->mshstats.dropped_frames_ttl++;
+                }
         }
 
         if (forward && ifmsh->mshcfg.dot11MeshForwarding) {
                 u32 preq_id;
-                u8 hopcount, flags;
+                u8 hopcount;
 
                 ttl = PREQ_IE_TTL(preq_elem);
                 lifetime = PREQ_IE_LIFETIME(preq_elem);
@@ -590,13 +604,19 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata,
                         ifmsh->mshstats.dropped_frames_ttl++;
                         return;
                 }
-                mhwmp_dbg("forwarding the PREQ from %pM", orig_addr);
+                mhwmp_dbg(sdata, "forwarding the PREQ from %pM\n", orig_addr);
                 --ttl;
-                flags = PREQ_IE_FLAGS(preq_elem);
                 preq_id = PREQ_IE_PREQ_ID(preq_elem);
                 hopcount = PREQ_IE_HOPCOUNT(preq_elem) + 1;
                 da = (mpath && mpath->is_root) ?
                         mpath->rann_snd_addr : broadcast_addr;
+
+                if (flags & IEEE80211_PREQ_PROACTIVE_PREP_FLAG) {
+                        target_addr = PREQ_IE_TARGET_ADDR(preq_elem);
+                        target_sn = PREQ_IE_TARGET_SN(preq_elem);
+                        metric = orig_metric;
+                }
+
                 mesh_path_sel_frame_tx(MPATH_PREQ, flags, orig_addr,
                                 cpu_to_le32(orig_sn), target_flags, target_addr,
                                 cpu_to_le32(target_sn), da,
@@ -631,7 +651,8 @@ static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata,
         u8 next_hop[ETH_ALEN];
         u32 target_sn, orig_sn, lifetime;
 
-        mhwmp_dbg("received PREP from %pM", PREP_IE_ORIG_ADDR(prep_elem));
+        mhwmp_dbg(sdata, "received PREP from %pM\n",
+                  PREP_IE_ORIG_ADDR(prep_elem));
 
         orig_addr = PREP_IE_ORIG_ADDR(prep_elem);
         if (ether_addr_equal(orig_addr, sdata->vif.addr))
@@ -744,11 +765,6 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
         bool root_is_gate;
 
         ttl = rann->rann_ttl;
-        if (ttl <= 1) {
-                ifmsh->mshstats.dropped_frames_ttl++;
-                return;
-        }
-        ttl--;
         flags = rann->rann_flags;
         root_is_gate = !!(flags & RANN_FLAG_IS_GATE);
         orig_addr = rann->rann_addr;
@@ -762,8 +778,9 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
         if (ether_addr_equal(orig_addr, sdata->vif.addr))
                 return;
 
-        mhwmp_dbg("received RANN from %pM via neighbour %pM (is_gate=%d)",
-                        orig_addr, mgmt->sa, root_is_gate);
+        mhwmp_dbg(sdata,
+                  "received RANN from %pM via neighbour %pM (is_gate=%d)\n",
+                  orig_addr, mgmt->sa, root_is_gate);
 
         rcu_read_lock();
         sta = sta_info_get(sdata, mgmt->sa);
@@ -785,34 +802,50 @@ static void hwmp_rann_frame_process(struct ieee80211_sub_if_data *sdata,
                 }
         }
 
+        if (!(SN_LT(mpath->sn, orig_sn)) &&
+            !(mpath->sn == orig_sn && metric < mpath->rann_metric)) {
+                rcu_read_unlock();
+                return;
+        }
+
         if ((!(mpath->flags & (MESH_PATH_ACTIVE | MESH_PATH_RESOLVING)) ||
-             time_after(jiffies, mpath->exp_time - 1*HZ)) &&
-             !(mpath->flags & MESH_PATH_FIXED)) {
-                mhwmp_dbg("%s time to refresh root mpath %pM", sdata->name,
-                                                               orig_addr);
+             (time_after(jiffies, mpath->last_preq_to_root +
+                                  root_path_confirmation_jiffies(sdata)) ||
+             time_before(jiffies, mpath->last_preq_to_root))) &&
+             !(mpath->flags & MESH_PATH_FIXED) && (ttl != 0)) {
+                mhwmp_dbg(sdata,
+                          "time to refresh root mpath %pM\n",
+                          orig_addr);
                 mesh_queue_preq(mpath, PREQ_Q_F_START | PREQ_Q_F_REFRESH);
+                mpath->last_preq_to_root = jiffies;
+        }
+
+        mpath->sn = orig_sn;
+        mpath->rann_metric = metric + metric_txsta;
+        mpath->is_root = true;
+        /* Recording RANNs sender address to send individually
+         * addressed PREQs destined for root mesh STA */
+        memcpy(mpath->rann_snd_addr, mgmt->sa, ETH_ALEN);
+
+        if (root_is_gate)
+                mesh_path_add_gate(mpath);
+
+        if (ttl <= 1) {
+                ifmsh->mshstats.dropped_frames_ttl++;
+                rcu_read_unlock();
+                return;
         }
+        ttl--;
 
-        if ((SN_LT(mpath->sn, orig_sn) || (mpath->sn == orig_sn &&
-           metric < mpath->rann_metric)) && ifmsh->mshcfg.dot11MeshForwarding) {
+        if (ifmsh->mshcfg.dot11MeshForwarding) {
                 mesh_path_sel_frame_tx(MPATH_RANN, flags, orig_addr,
                                        cpu_to_le32(orig_sn),
                                        0, NULL, 0, broadcast_addr,
                                        hopcount, ttl, cpu_to_le32(interval),
                                        cpu_to_le32(metric + metric_txsta),
                                        0, sdata);
-                mpath->sn = orig_sn;
-                mpath->rann_metric = metric + metric_txsta;
-                /* Recording RANNs sender address to send individually
-                 * addressed PREQs destined for root mesh STA */
-                memcpy(mpath->rann_snd_addr, mgmt->sa, ETH_ALEN);
         }
 
-        mpath->is_root = true;
-
-        if (root_is_gate)
-                mesh_path_add_gate(mpath);
-
         rcu_read_unlock();
 }
 
@@ -889,7 +922,7 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags)
 
         preq_node = kmalloc(sizeof(struct mesh_preq_queue), GFP_ATOMIC);
         if (!preq_node) {
-                mhwmp_dbg("could not allocate PREQ node");
+                mhwmp_dbg(sdata, "could not allocate PREQ node\n");
                 return;
         }
 
@@ -898,7 +931,7 @@ static void mesh_queue_preq(struct mesh_path *mpath, u8 flags)
                 spin_unlock_bh(&ifmsh->mesh_preq_queue_lock);
                 kfree(preq_node);
                 if (printk_ratelimit())
-                        mhwmp_dbg("PREQ node queue full");
+                        mhwmp_dbg(sdata, "PREQ node queue full\n");
                 return;
         }
 
@@ -1146,7 +1179,7 @@ void mesh_path_timer(unsigned long data)
                 if (!mpath->is_gate && mesh_gate_num(sdata) > 0) {
                         ret = mesh_path_send_to_gates(mpath);
                         if (ret)
-                                mhwmp_dbg("no gate was reachable");
+                                mhwmp_dbg(sdata, "no gate was reachable\n");
                 } else
                         mesh_path_flush_pending(mpath);
         }
@@ -1157,13 +1190,34 @@ mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
         u32 interval = ifmsh->mshcfg.dot11MeshHWMPRannInterval;
-        u8 flags;
+        u8 flags, target_flags = 0;
 
         flags = (ifmsh->mshcfg.dot11MeshGateAnnouncementProtocol)
                         ? RANN_FLAG_IS_GATE : 0;
-        mesh_path_sel_frame_tx(MPATH_RANN, flags, sdata->vif.addr,
+
+        switch (ifmsh->mshcfg.dot11MeshHWMPRootMode) {
+        case IEEE80211_PROACTIVE_RANN:
+                mesh_path_sel_frame_tx(MPATH_RANN, flags, sdata->vif.addr,
                                cpu_to_le32(++ifmsh->sn),
                                0, NULL, 0, broadcast_addr,
-                               0, sdata->u.mesh.mshcfg.element_ttl,
+                               0, ifmsh->mshcfg.element_ttl,
                                cpu_to_le32(interval), 0, 0, sdata);
+                break;
+        case IEEE80211_PROACTIVE_PREQ_WITH_PREP:
+                flags |= IEEE80211_PREQ_PROACTIVE_PREP_FLAG;
+        case IEEE80211_PROACTIVE_PREQ_NO_PREP:
+                interval = ifmsh->mshcfg.dot11MeshHWMPactivePathToRootTimeout;
+                target_flags |= IEEE80211_PREQ_TO_FLAG |
+                                IEEE80211_PREQ_USN_FLAG;
+                mesh_path_sel_frame_tx(MPATH_PREQ, flags, sdata->vif.addr,
+                                cpu_to_le32(++ifmsh->sn), target_flags,
+                                (u8 *) broadcast_addr, 0, broadcast_addr,
+                                0, ifmsh->mshcfg.element_ttl,
+                                cpu_to_le32(interval),
+                                0, cpu_to_le32(ifmsh->preq_id++), sdata);
+                break;
+        default:
+                mhwmp_dbg(sdata, "Proactive mechanism not supported\n");
+                return;
+        }
 }
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c
index 572f706fd65b..c9ae931dd693 100644
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
@@ -18,12 +18,6 @@
 #include "ieee80211_i.h"
 #include "mesh.h"
 
-#ifdef CONFIG_MAC80211_VERBOSE_MPATH_DEBUG
-#define mpath_dbg(fmt, args...) pr_debug(fmt, ##args)
-#else
-#define mpath_dbg(fmt, args...) do { (void)(0); } while (0)
-#endif
-
 /* There will be initially 2^INIT_PATHS_SIZE_ORDER buckets */
 #define INIT_PATHS_SIZE_ORDER   2
 
@@ -322,9 +316,8 @@ static void mesh_path_move_to_queue(struct mesh_path *gate_mpath,
 
         spin_lock_irqsave(&gate_mpath->frame_queue.lock, flags);
         skb_queue_splice(&gateq, &gate_mpath->frame_queue);
-        mpath_dbg("Mpath queue for gate %pM has %d frames\n",
-                        gate_mpath->dst,
-                        skb_queue_len(&gate_mpath->frame_queue));
+        mpath_dbg(gate_mpath->sdata, "Mpath queue for gate %pM has %d frames\n",
+                  gate_mpath->dst, skb_queue_len(&gate_mpath->frame_queue));
         spin_unlock_irqrestore(&gate_mpath->frame_queue.lock, flags);
 
         if (!copy)
@@ -446,9 +439,9 @@ int mesh_path_add_gate(struct mesh_path *mpath)
         hlist_add_head_rcu(&new_gate->list, tbl->known_gates);
         spin_unlock_bh(&tbl->gates_lock);
         rcu_read_unlock();
-        mpath_dbg("Mesh path (%s): Recorded new gate: %pM. %d known gates\n",
-                  mpath->sdata->name, mpath->dst,
-                  mpath->sdata->u.mesh.num_gates);
+        mpath_dbg(mpath->sdata,
+                  "Mesh path: Recorded new gate: %pM. %d known gates\n",
+                  mpath->dst, mpath->sdata->u.mesh.num_gates);
         return 0;
 err_rcu:
         rcu_read_unlock();
@@ -477,8 +470,8 @@ static int mesh_gate_del(struct mesh_table *tbl, struct mesh_path *mpath)
                         spin_unlock_bh(&tbl->gates_lock);
                         mpath->sdata->u.mesh.num_gates--;
                         mpath->is_gate = false;
-                        mpath_dbg("Mesh path (%s): Deleted gate: %pM. "
-                                  "%d known gates\n", mpath->sdata->name,
+                        mpath_dbg(mpath->sdata,
+                                  "Mesh path: Deleted gate: %pM. %d known gates\n",
                                   mpath->dst, mpath->sdata->u.mesh.num_gates);
                         break;
                 }
@@ -946,19 +939,20 @@ int mesh_path_send_to_gates(struct mesh_path *mpath)
                         continue;
 
                 if (gate->mpath->flags & MESH_PATH_ACTIVE) {
-                        mpath_dbg("Forwarding to %pM\n", gate->mpath->dst);
+                        mpath_dbg(sdata, "Forwarding to %pM\n", gate->mpath->dst);
                         mesh_path_move_to_queue(gate->mpath, from_mpath, copy);
                         from_mpath = gate->mpath;
                         copy = true;
                 } else {
-                        mpath_dbg("Not forwarding %p\n", gate->mpath);
-                        mpath_dbg("flags %x\n", gate->mpath->flags);
+                        mpath_dbg(sdata,
+                                  "Not forwarding %p (flags %#x)\n",
+                                  gate->mpath, gate->mpath->flags);
                 }
         }
 
         hlist_for_each_entry_rcu(gate, n, known_gates, list)
                 if (gate->mpath->sdata == sdata) {
-                        mpath_dbg("Sending to %pM\n", gate->mpath->dst);
+                        mpath_dbg(sdata, "Sending to %pM\n", gate->mpath->dst);
                         mesh_path_tx_pending(gate->mpath);
                 }
 
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index be4fad128c34..a1dbd1540276 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -13,12 +13,6 @@
 #include "rate.h"
 #include "mesh.h"
 
-#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
-#define mpl_dbg(fmt, args...)   pr_debug(fmt, ##args)
-#else
-#define mpl_dbg(fmt, args...)   do { (void)(0); } while (0)
-#endif
-
 #define PLINK_GET_LLID(p) (p + 2)
 #define PLINK_GET_PLID(p) (p + 4)
 
@@ -134,12 +128,14 @@ static u32 mesh_set_ht_prot_mode(struct ieee80211_sub_if_data *sdata)
 
                 switch (sta->ch_type) {
                 case NL80211_CHAN_NO_HT:
-                        mpl_dbg("mesh_plink %pM: nonHT sta (%pM) is present",
+                        mpl_dbg(sdata,
+                                "mesh_plink %pM: nonHT sta (%pM) is present\n",
                                 sdata->vif.addr, sta->sta.addr);
                         non_ht_sta = true;
                         goto out;
                 case NL80211_CHAN_HT20:
-                        mpl_dbg("mesh_plink %pM: HT20 sta (%pM) is present",
+                        mpl_dbg(sdata,
+                                "mesh_plink %pM: HT20 sta (%pM) is present\n",
                                 sdata->vif.addr, sta->sta.addr);
                         ht20_sta = true;
                 default:
@@ -160,7 +156,8 @@ out:
                 sdata->vif.bss_conf.ht_operation_mode = ht_opmode;
                 sdata->u.mesh.mshcfg.ht_opmode = ht_opmode;
                 changed = BSS_CHANGED_HT;
-                mpl_dbg("mesh_plink %pM: protection mode changed to %d",
+                mpl_dbg(sdata,
+                        "mesh_plink %pM: protection mode changed to %d\n",
                         sdata->vif.addr, ht_opmode);
         }
 
@@ -437,7 +434,8 @@ static void mesh_plink_timer(unsigned long data)
                 spin_unlock_bh(&sta->lock);
                 return;
         }
-        mpl_dbg("Mesh plink timer for %pM fired on state %d\n",
+        mpl_dbg(sta->sdata,
+                "Mesh plink timer for %pM fired on state %d\n",
                 sta->sta.addr, sta->plink_state);
         reason = 0;
         llid = sta->llid;
@@ -450,7 +448,8 @@ static void mesh_plink_timer(unsigned long data)
                 /* retry timer */
                 if (sta->plink_retries < dot11MeshMaxRetries(sdata)) {
                         u32 rand;
-                        mpl_dbg("Mesh plink for %pM (retry, timeout): %d %d\n",
+                        mpl_dbg(sta->sdata,
+                                "Mesh plink for %pM (retry, timeout): %d %d\n",
                                 sta->sta.addr, sta->plink_retries,
                                 sta->plink_timeout);
                         get_random_bytes(&rand, sizeof(u32));
@@ -530,7 +529,8 @@ int mesh_plink_open(struct sta_info *sta)
         sta->plink_state = NL80211_PLINK_OPN_SNT;
         mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata));
         spin_unlock_bh(&sta->lock);
-        mpl_dbg("Mesh plink: starting establishment with %pM\n",
+        mpl_dbg(sdata,
+                "Mesh plink: starting establishment with %pM\n",
                 sta->sta.addr);
 
         return mesh_plink_frame_tx(sdata, WLAN_SP_MESH_PEERING_OPEN,
@@ -565,7 +565,6 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
         u8 *baseaddr;
         u32 changed = 0;
         __le16 plid, llid, reason;
-#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
         static const char *mplstates[] = {
                 [NL80211_PLINK_LISTEN] = "LISTEN",
                 [NL80211_PLINK_OPN_SNT] = "OPN-SNT",
@@ -575,14 +574,14 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                 [NL80211_PLINK_HOLDING] = "HOLDING",
                 [NL80211_PLINK_BLOCKED] = "BLOCKED"
         };
-#endif
 
         /* need action_code, aux */
         if (len < IEEE80211_MIN_ACTION_SIZE + 3)
                 return;
 
         if (is_multicast_ether_addr(mgmt->da)) {
-                mpl_dbg("Mesh plink: ignore frame from multicast address");
+                mpl_dbg(sdata,
+                        "Mesh plink: ignore frame from multicast address\n");
                 return;
         }
 
@@ -595,12 +594,14 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
         }
         ieee802_11_parse_elems(baseaddr, len - baselen, &elems);
         if (!elems.peering) {
-                mpl_dbg("Mesh plink: missing necessary peer link ie\n");
+                mpl_dbg(sdata,
+                        "Mesh plink: missing necessary peer link ie\n");
                 return;
         }
         if (elems.rsn_len &&
                         sdata->u.mesh.security == IEEE80211_MESH_SEC_NONE) {
-                mpl_dbg("Mesh plink: can't establish link with secure peer\n");
+                mpl_dbg(sdata,
+                        "Mesh plink: can't establish link with secure peer\n");
                 return;
         }
 
@@ -610,14 +611,15 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
             (ftype == WLAN_SP_MESH_PEERING_CONFIRM && ie_len != 6) ||
             (ftype == WLAN_SP_MESH_PEERING_CLOSE && ie_len != 6
                                                         && ie_len != 8)) {
-                mpl_dbg("Mesh plink: incorrect plink ie length %d %d\n",
-                    ftype, ie_len);
+                mpl_dbg(sdata,
+                        "Mesh plink: incorrect plink ie length %d %d\n",
+                        ftype, ie_len);
                 return;
         }
 
         if (ftype != WLAN_SP_MESH_PEERING_CLOSE &&
                                 (!elems.mesh_id || !elems.mesh_config)) {
-                mpl_dbg("Mesh plink: missing necessary ie\n");
+                mpl_dbg(sdata, "Mesh plink: missing necessary ie\n");
                 return;
         }
         /* Note the lines below are correct, the llid in the frame is the plid
@@ -632,21 +634,21 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
 
         sta = sta_info_get(sdata, mgmt->sa);
         if (!sta && ftype != WLAN_SP_MESH_PEERING_OPEN) {
-                mpl_dbg("Mesh plink: cls or cnf from unknown peer\n");
+                mpl_dbg(sdata, "Mesh plink: cls or cnf from unknown peer\n");
                 rcu_read_unlock();
                 return;
         }
 
         if (ftype == WLAN_SP_MESH_PEERING_OPEN &&
             !rssi_threshold_check(sta, sdata)) {
-                mpl_dbg("Mesh plink: %pM does not meet rssi threshold\n",
+                mpl_dbg(sdata, "Mesh plink: %pM does not meet rssi threshold\n",
                         mgmt->sa);
                 rcu_read_unlock();
                 return;
         }
 
         if (sta && !test_sta_flag(sta, WLAN_STA_AUTH)) {
-                mpl_dbg("Mesh plink: Action frame from non-authed peer\n");
+                mpl_dbg(sdata, "Mesh plink: Action frame from non-authed peer\n");
                 rcu_read_unlock();
                 return;
         }
@@ -683,7 +685,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
         } else if (!sta) {
                 /* ftype == WLAN_SP_MESH_PEERING_OPEN */
                 if (!mesh_plink_free_count(sdata)) {
-                        mpl_dbg("Mesh plink error: no more free plinks\n");
+                        mpl_dbg(sdata, "Mesh plink error: no more free plinks\n");
                         rcu_read_unlock();
                         return;
                 }
@@ -724,7 +726,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                                 event = CLS_ACPT;
                         break;
                 default:
-                        mpl_dbg("Mesh plink: unknown frame subtype\n");
+                        mpl_dbg(sdata, "Mesh plink: unknown frame subtype\n");
                         rcu_read_unlock();
                         return;
                 }
@@ -734,13 +736,14 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                 /* allocate sta entry if necessary and update info */
                 sta = mesh_peer_init(sdata, mgmt->sa, &elems);
                 if (!sta) {
-                        mpl_dbg("Mesh plink: failed to init peer!\n");
+                        mpl_dbg(sdata, "Mesh plink: failed to init peer!\n");
                         rcu_read_unlock();
                         return;
                 }
         }
 
-        mpl_dbg("Mesh plink (peer, state, llid, plid, event): %pM %s %d %d %d\n",
+        mpl_dbg(sdata,
+                "Mesh plink (peer, state, llid, plid, event): %pM %s %d %d %d\n",
                 mgmt->sa, mplstates[sta->plink_state],
                 le16_to_cpu(sta->llid), le16_to_cpu(sta->plid),
                 event);
@@ -851,7 +854,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                         mesh_plink_inc_estab_count(sdata);
                         changed |= mesh_set_ht_prot_mode(sdata);
                         changed |= BSS_CHANGED_BEACON;
-                        mpl_dbg("Mesh plink with %pM ESTABLISHED\n",
+                        mpl_dbg(sdata, "Mesh plink with %pM ESTABLISHED\n",
                                 sta->sta.addr);
                         break;
                 default:
@@ -887,7 +890,7 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
                         mesh_plink_inc_estab_count(sdata);
                         changed |= mesh_set_ht_prot_mode(sdata);
                         changed |= BSS_CHANGED_BEACON;
-                        mpl_dbg("Mesh plink with %pM ESTABLISHED\n",
+                        mpl_dbg(sdata, "Mesh plink with %pM ESTABLISHED\n",
                                 sta->sta.addr);
                         mesh_plink_frame_tx(sdata,
                                             WLAN_SP_MESH_PEERING_CONFIRM,
diff --git a/net/mac80211/mesh_sync.c b/net/mac80211/mesh_sync.c
index 0ccdad49f987..accfa00ffcdf 100644
--- a/net/mac80211/mesh_sync.c
+++ b/net/mac80211/mesh_sync.c
@@ -12,13 +12,6 @@
 #include "mesh.h"
 #include "driver-ops.h"
 
-#ifdef CONFIG_MAC80211_VERBOSE_MESH_SYNC_DEBUG
-#define msync_dbg(fmt, args...) \
-        pr_debug("Mesh sync (%s): " fmt "\n", sdata->name, ##args)
-#else
-#define msync_dbg(fmt, args...)   do { (void)(0); } while (0)
-#endif
-
 /* This is not in the standard.  It represents a tolerable tbtt drift below
  * which we do no TSF adjustment.
  */
@@ -65,14 +58,14 @@ void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata)
         spin_lock_bh(&ifmsh->sync_offset_lock);
 
         if (ifmsh->sync_offset_clockdrift_max < beacon_int_fraction) {
-                msync_dbg("TBTT : max clockdrift=%lld; adjusting",
-                        (long long) ifmsh->sync_offset_clockdrift_max);
+                msync_dbg(sdata, "TBTT : max clockdrift=%lld; adjusting\n",
+                          (long long) ifmsh->sync_offset_clockdrift_max);
                 tsfdelta = -ifmsh->sync_offset_clockdrift_max;
                 ifmsh->sync_offset_clockdrift_max = 0;
         } else {
-                msync_dbg("TBTT : max clockdrift=%lld; adjusting by %llu",
-                        (long long) ifmsh->sync_offset_clockdrift_max,
-                        (unsigned long long) beacon_int_fraction);
+                msync_dbg(sdata, "TBTT : max clockdrift=%lld; adjusting by %llu\n",
+                          (long long) ifmsh->sync_offset_clockdrift_max,
+                          (unsigned long long) beacon_int_fraction);
                 tsfdelta = -beacon_int_fraction;
                 ifmsh->sync_offset_clockdrift_max -= beacon_int_fraction;
         }
@@ -120,7 +113,7 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
 
         if (elems->mesh_config && mesh_peer_tbtt_adjusting(elems)) {
                 clear_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN);
-                msync_dbg("STA %pM : is adjusting TBTT", sta->sta.addr);
+                msync_dbg(sdata, "STA %pM : is adjusting TBTT\n", sta->sta.addr);
                 goto no_sync;
         }
 
@@ -169,7 +162,8 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
         if (test_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN)) {
                 s64 t_clockdrift = sta->t_offset_setpoint
                                    - sta->t_offset;
-                msync_dbg("STA %pM : sta->t_offset=%lld, sta->t_offset_setpoint=%lld, t_clockdrift=%lld",
+                msync_dbg(sdata,
+                          "STA %pM : sta->t_offset=%lld, sta->t_offset_setpoint=%lld, t_clockdrift=%lld\n",
                           sta->sta.addr,
                           (long long) sta->t_offset,
                           (long long)
@@ -178,7 +172,8 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
 
                 if (t_clockdrift > TOFFSET_MAXIMUM_ADJUSTMENT ||
                         t_clockdrift < -TOFFSET_MAXIMUM_ADJUSTMENT) {
-                        msync_dbg("STA %pM : t_clockdrift=%lld too large, setpoint reset",
+                        msync_dbg(sdata,
+                                  "STA %pM : t_clockdrift=%lld too large, setpoint reset\n",
                                   sta->sta.addr,
                                   (long long) t_clockdrift);
                         clear_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN);
@@ -197,8 +192,8 @@ static void mesh_sync_offset_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
         } else {
                 sta->t_offset_setpoint = sta->t_offset - TOFFSET_SET_MARGIN;
                 set_sta_flag(sta, WLAN_STA_TOFFSET_KNOWN);
-                msync_dbg("STA %pM : offset was invalid, "
-                          " sta->t_offset=%lld",
+                msync_dbg(sdata,
+                          "STA %pM : offset was invalid, sta->t_offset=%lld\n",
                           sta->sta.addr,
                           (long long) sta->t_offset);
                 rcu_read_unlock();
@@ -226,17 +221,15 @@ static void mesh_sync_offset_adjust_tbtt(struct ieee80211_sub_if_data *sdata)
                  * to the driver tsf setter, we punt
                  * the tsf adjustment to the mesh tasklet
                  */
-                msync_dbg("TBTT : kicking off TBTT "
-                          "adjustment with "
-                          "clockdrift_max=%lld",
-                  ifmsh->sync_offset_clockdrift_max);
+                msync_dbg(sdata,
+                          "TBTT : kicking off TBTT adjustment with clockdrift_max=%lld\n",
+                          ifmsh->sync_offset_clockdrift_max);
                 set_bit(MESH_WORK_DRIFT_ADJUST,
                         &ifmsh->wrkq_flags);
         } else {
-                msync_dbg("TBTT : max clockdrift=%lld; "
-                          "too small to adjust",
-                          (long long)
-                       ifmsh->sync_offset_clockdrift_max);
+                msync_dbg(sdata,
+                          "TBTT : max clockdrift=%lld; too small to adjust\n",
+                          (long long)ifmsh->sync_offset_clockdrift_max);
                 ifmsh->sync_offset_clockdrift_max = 0;
         }
         spin_unlock_bh(&ifmsh->sync_offset_lock);
@@ -268,7 +261,7 @@ static void mesh_sync_vendor_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,
         const u8 *oui;
 
         WARN_ON(sdata->u.mesh.mesh_sp_id != IEEE80211_SYNC_METHOD_VENDOR);
-        msync_dbg("called mesh_sync_vendor_rx_bcn_presp");
+        msync_dbg(sdata, "called mesh_sync_vendor_rx_bcn_presp\n");
         oui = mesh_get_vendor_oui(sdata);
         /*  here you would implement the vendor offset tracking for this oui */
 }
@@ -278,7 +271,7 @@ static void mesh_sync_vendor_adjust_tbtt(struct ieee80211_sub_if_data *sdata)
         const u8 *oui;
 
         WARN_ON(sdata->u.mesh.mesh_sp_id != IEEE80211_SYNC_METHOD_VENDOR);
-        msync_dbg("called mesh_sync_vendor_adjust_tbtt");
+        msync_dbg(sdata, "called mesh_sync_vendor_adjust_tbtt\n");
         oui = mesh_get_vendor_oui(sdata);
         /*  here you would implement the vendor tsf adjustment for this oui */
 }
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 321ea9bba02e..e6fe84a08443 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1141,7 +1141,7 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
 
         memset(&params, 0, sizeof(params));
 
-        local->wmm_acm = 0;
+        sdata->wmm_acm = 0;
         for (; left >= 4; left -= 4, pos += 4) {
                 int aci = (pos[0] >> 5) & 0x03;
                 int acm = (pos[0] >> 4) & 0x01;
@@ -1152,21 +1152,21 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
                 case 1: /* AC_BK */
                         queue = 3;
                         if (acm)
-                                local->wmm_acm |= BIT(1) | BIT(2); /* BK/- */
+                                sdata->wmm_acm |= BIT(1) | BIT(2); /* BK/- */
                         if (uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_BK)
                                 uapsd = true;
                         break;
                 case 2: /* AC_VI */
                         queue = 1;
                         if (acm)
-                                local->wmm_acm |= BIT(4) | BIT(5); /* CL/VI */
+                                sdata->wmm_acm |= BIT(4) | BIT(5); /* CL/VI */
                         if (uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VI)
                                 uapsd = true;
                         break;
                 case 3: /* AC_VO */
                         queue = 0;
                         if (acm)
-                                local->wmm_acm |= BIT(6) | BIT(7); /* VO/NC */
+                                sdata->wmm_acm |= BIT(6) | BIT(7); /* VO/NC */
                         if (uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_VO)
                                 uapsd = true;
                         break;
@@ -1174,7 +1174,7 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
                 default:
                         queue = 2;
                         if (acm)
-                                local->wmm_acm |= BIT(0) | BIT(3); /* BE/EE */
+                                sdata->wmm_acm |= BIT(0) | BIT(3); /* BE/EE */
                         if (uapsd_queues & IEEE80211_WMM_IE_STA_QOSINFO_AC_BE)
                                 uapsd = true;
                         break;
@@ -1186,19 +1186,16 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
                 params.txop = get_unaligned_le16(pos + 2);
                 params.uapsd = uapsd;
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                wiphy_debug(local->hw.wiphy,
-                            "WMM queue=%d aci=%d acm=%d aifs=%d "
-                            "cWmin=%d cWmax=%d txop=%d uapsd=%d\n",
-                            queue, aci, acm,
-                            params.aifs, params.cw_min, params.cw_max,
-                            params.txop, params.uapsd);
-#endif
+                mlme_dbg(sdata,
+                         "WMM queue=%d aci=%d acm=%d aifs=%d cWmin=%d cWmax=%d txop=%d uapsd=%d\n",
+                         queue, aci, acm,
+                         params.aifs, params.cw_min, params.cw_max,
+                         params.txop, params.uapsd);
                 sdata->tx_conf[queue] = params;
                 if (drv_conf_tx(local, sdata, queue, &params))
-                        wiphy_debug(local->hw.wiphy,
-                                    "failed to set TX queue parameters for queue %d\n",
-                                    queue);
+                        sdata_err(sdata,
+                                  "failed to set TX queue parameters for queue %d\n",
+                                  queue);
         }
 
         /* enable WMM or activate new settings */
@@ -1275,7 +1272,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 
         bss_info_changed |= BSS_CHANGED_BEACON_INT;
         bss_info_changed |= ieee80211_handle_bss_capability(sdata,
-                cbss->capability, bss->has_erp_value, bss->erp_value);
+                bss_conf->assoc_capability, bss->has_erp_value, bss->erp_value);
 
         sdata->u.mgd.beacon_timeout = usecs_to_jiffies(ieee80211_tu_to_usec(
                 IEEE80211_BEACON_LOSS_COUNT * bss_conf->beacon_int));
@@ -1566,11 +1563,10 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
                 goto out;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
         if (beacon)
-                net_dbg_ratelimited("%s: detected beacon loss from AP - sending probe request\n",
-                                    sdata->name);
-#endif
+                mlme_dbg_ratelimited(sdata,
+                                     "detected beacon loss from AP - sending probe request\n");
+
         ieee80211_cqm_rssi_notify(&sdata->vif,
                 NL80211_CQM_RSSI_BEACON_LOSS_EVENT, GFP_KERNEL);
 
@@ -1655,7 +1651,7 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata)
 
         memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);
 
-        pr_debug("%s: Connection to AP %pM lost\n", sdata->name, bssid);
+        sdata_info(sdata, "Connection to AP %pM lost\n", bssid);
 
         ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
                                WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,
@@ -1789,8 +1785,8 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                 return RX_MGMT_NONE;
 
         if (status_code != WLAN_STATUS_SUCCESS) {
-                pr_debug("%s: %pM denied authentication (status %d)\n",
-                         sdata->name, mgmt->sa, status_code);
+                sdata_info(sdata, "%pM denied authentication (status %d)\n",
+                           mgmt->sa, status_code);
                 ieee80211_destroy_auth_data(sdata, false);
                 return RX_MGMT_CFG80211_RX_AUTH;
         }
@@ -1813,7 +1809,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                 return RX_MGMT_NONE;
         }
 
-        pr_debug("%s: authenticated\n", sdata->name);
+        sdata_info(sdata, "authenticated\n");
         ifmgd->auth_data->done = true;
         ifmgd->auth_data->timeout = jiffies + IEEE80211_AUTH_WAIT_ASSOC;
         run_again(ifmgd, ifmgd->auth_data->timeout);
@@ -1826,7 +1822,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                 goto out_err;
         }
         if (sta_info_move_state(sta, IEEE80211_STA_AUTH)) {
-                pr_debug("%s: failed moving %pM to auth\n", sdata->name, bssid);
+                sdata_info(sdata, "failed moving %pM to auth\n", bssid);
                 goto out_err;
         }
         mutex_unlock(&sdata->local->sta_mtx);
@@ -1860,8 +1856,8 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
 
         reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
 
-        pr_debug("%s: deauthenticated from %pM (Reason: %u)\n",
-                 sdata->name, bssid, reason_code);
+        sdata_info(sdata, "deauthenticated from %pM (Reason: %u)\n",
+                   bssid, reason_code);
 
         ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
 
@@ -1891,8 +1887,8 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
 
         reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
 
-        pr_debug("%s: disassociated from %pM (Reason: %u)\n",
-                 sdata->name, mgmt->sa, reason_code);
+        sdata_info(sdata, "disassociated from %pM (Reason: %u)\n",
+                   mgmt->sa, reason_code);
 
         ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
 
@@ -1984,15 +1980,15 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
         capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);
 
         if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14)))
-                pr_debug("%s: invalid AID value 0x%x; bits 15:14 not set\n",
-                         sdata->name, aid);
+                sdata_info(sdata, "invalid AID value 0x%x; bits 15:14 not set\n",
+                           aid);
         aid &= ~(BIT(15) | BIT(14));
 
         ifmgd->broken_ap = false;
 
         if (aid == 0 || aid > IEEE80211_MAX_AID) {
-                pr_debug("%s: invalid AID value %d (out of range), turn off PS\n",
-                         sdata->name, aid);
+                sdata_info(sdata, "invalid AID value %d (out of range), turn off PS\n",
+                           aid);
                 aid = 0;
                 ifmgd->broken_ap = true;
         }
@@ -2001,8 +1997,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
         ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
 
         if (!elems.supp_rates) {
-                pr_debug("%s: no SuppRates element in AssocResp\n",
-                         sdata->name);
+                sdata_info(sdata, "no SuppRates element in AssocResp\n");
                 return false;
         }
 
@@ -2042,8 +2037,9 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
         if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT))
                 err = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
         if (err) {
-                pr_debug("%s: failed to move station %pM to desired state\n",
-                         sdata->name, sta->sta.addr);
+                sdata_info(sdata,
+                           "failed to move station %pM to desired state\n",
+                           sta->sta.addr);
                 WARN_ON(__sta_info_destroy(sta));
                 mutex_unlock(&sdata->local->sta_mtx);
                 return false;
@@ -2126,9 +2122,10 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code);
         aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
 
-        pr_debug("%s: RX %sssocResp from %pM (capab=0x%x status=%d aid=%d)\n",
-                 sdata->name, reassoc ? "Rea" : "A", mgmt->sa,
-                 capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
+        sdata_info(sdata,
+                   "RX %sssocResp from %pM (capab=0x%x status=%d aid=%d)\n",
+                   reassoc ? "Rea" : "A", mgmt->sa,
+                   capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
 
         pos = mgmt->u.assoc_resp.variable;
         ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
@@ -2139,8 +2136,9 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                 u32 tu, ms;
                 tu = get_unaligned_le32(elems.timeout_int + 1);
                 ms = tu * 1024 / 1000;
-                pr_debug("%s: %pM rejected association temporarily; comeback duration %u TU (%u ms)\n",
-                         sdata->name, mgmt->sa, tu, ms);
+                sdata_info(sdata,
+                           "%pM rejected association temporarily; comeback duration %u TU (%u ms)\n",
+                           mgmt->sa, tu, ms);
                 assoc_data->timeout = jiffies + msecs_to_jiffies(ms);
                 if (ms > IEEE80211_ASSOC_TIMEOUT)
                         run_again(ifmgd, assoc_data->timeout);
@@ -2150,11 +2148,11 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
         *bss = assoc_data->bss;
 
         if (status_code != WLAN_STATUS_SUCCESS) {
-                pr_debug("%s: %pM denied association (code=%d)\n",
-                         sdata->name, mgmt->sa, status_code);
+                sdata_info(sdata, "%pM denied association (code=%d)\n",
+                           mgmt->sa, status_code);
                 ieee80211_destroy_assoc_data(sdata, false);
         } else {
-                pr_debug("%s: associated\n", sdata->name);
+                sdata_info(sdata, "associated\n");
 
                 if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
                         /* oops -- internal error -- send timeout for now */
@@ -2262,7 +2260,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
         if (ifmgd->auth_data && !ifmgd->auth_data->bss->proberesp_ies &&
             ether_addr_equal(mgmt->bssid, ifmgd->auth_data->bss->bssid)) {
                 /* got probe response, continue with auth */
-                pr_debug("%s: direct probe responded\n", sdata->name);
+                sdata_info(sdata, "direct probe responded\n");
                 ifmgd->auth_data->tries = 0;
                 ifmgd->auth_data->timeout = jiffies;
                 run_again(ifmgd, ifmgd->auth_data->timeout);
@@ -2398,10 +2396,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
         }
 
         if (ifmgd->flags & IEEE80211_STA_BEACON_POLL) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                net_dbg_ratelimited("%s: cancelling probereq poll due to a received beacon\n",
-                                    sdata->name);
-#endif
+                mlme_dbg_ratelimited(sdata,
+                                     "cancelling probereq poll due to a received beacon\n");
                 mutex_lock(&local->mtx);
                 ifmgd->flags &= ~IEEE80211_STA_BEACON_POLL;
                 ieee80211_run_deferred_scan(local);
@@ -2624,8 +2620,8 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
         auth_data->tries++;
 
         if (auth_data->tries > IEEE80211_AUTH_MAX_TRIES) {
-                pr_debug("%s: authentication with %pM timed out\n",
-                         sdata->name, auth_data->bss->bssid);
+                sdata_info(sdata, "authentication with %pM timed out\n",
+                           auth_data->bss->bssid);
 
                 /*
                  * Most likely AP is not in the range so remove the
@@ -2637,9 +2633,9 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
         }
 
         if (auth_data->bss->proberesp_ies) {
-                pr_debug("%s: send auth to %pM (try %d/%d)\n",
-                         sdata->name, auth_data->bss->bssid, auth_data->tries,
-                         IEEE80211_AUTH_MAX_TRIES);
+                sdata_info(sdata, "send auth to %pM (try %d/%d)\n",
+                           auth_data->bss->bssid, auth_data->tries,
+                           IEEE80211_AUTH_MAX_TRIES);
 
                 auth_data->expected_transaction = 2;
                 ieee80211_send_auth(sdata, 1, auth_data->algorithm,
@@ -2649,9 +2645,9 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
         } else {
                 const u8 *ssidie;
 
-                pr_debug("%s: direct probe to %pM (try %d/%i)\n",
-                         sdata->name, auth_data->bss->bssid, auth_data->tries,
-                         IEEE80211_AUTH_MAX_TRIES);
+                sdata_info(sdata, "direct probe to %pM (try %d/%i)\n",
+                           auth_data->bss->bssid, auth_data->tries,
+                           IEEE80211_AUTH_MAX_TRIES);
 
                 ssidie = ieee80211_bss_get_ie(auth_data->bss, WLAN_EID_SSID);
                 if (!ssidie)
@@ -2679,8 +2675,8 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
 
         assoc_data->tries++;
         if (assoc_data->tries > IEEE80211_ASSOC_MAX_TRIES) {
-                pr_debug("%s: association with %pM timed out\n",
-                         sdata->name, assoc_data->bss->bssid);
+                sdata_info(sdata, "association with %pM timed out\n",
+                           assoc_data->bss->bssid);
 
                 /*
                  * Most likely AP is not in the range so remove the
@@ -2691,9 +2687,9 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
                 return -ETIMEDOUT;
         }
 
-        pr_debug("%s: associate with %pM (try %d/%d)\n",
-                 sdata->name, assoc_data->bss->bssid, assoc_data->tries,
-                 IEEE80211_ASSOC_MAX_TRIES);
+        sdata_info(sdata, "associate with %pM (try %d/%d)\n",
+                   assoc_data->bss->bssid, assoc_data->tries,
+                   IEEE80211_ASSOC_MAX_TRIES);
         ieee80211_send_assoc(sdata);
 
         assoc_data->timeout = jiffies + IEEE80211_ASSOC_TIMEOUT;
@@ -2766,45 +2762,31 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
                         ieee80211_reset_ap_probe(sdata);
                 else if (ifmgd->nullfunc_failed) {
                         if (ifmgd->probe_send_count < max_tries) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                                wiphy_debug(local->hw.wiphy,
-                                            "%s: No ack for nullfunc frame to"
-                                            " AP %pM, try %d/%i\n",
-                                            sdata->name, bssid,
-                                            ifmgd->probe_send_count, max_tries);
-#endif
+                                mlme_dbg(sdata,
+                                         "No ack for nullfunc frame to AP %pM, try %d/%i\n",
+                                         bssid, ifmgd->probe_send_count,
+                                         max_tries);
                                 ieee80211_mgd_probe_ap_send(sdata);
                         } else {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                                wiphy_debug(local->hw.wiphy,
-                                            "%s: No ack for nullfunc frame to"
-                                            " AP %pM, disconnecting.\n",
-                                            sdata->name, bssid);
-#endif
+                                mlme_dbg(sdata,
+                                         "No ack for nullfunc frame to AP %pM, disconnecting.\n",
+                                         bssid);
                                 ieee80211_sta_connection_lost(sdata, bssid,
                                         WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
                         }
                 } else if (time_is_after_jiffies(ifmgd->probe_timeout))
                         run_again(ifmgd, ifmgd->probe_timeout);
                 else if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                        wiphy_debug(local->hw.wiphy,
-                                    "%s: Failed to send nullfunc to AP %pM"
-                                    " after %dms, disconnecting.\n",
-                                    sdata->name,
-                                    bssid, probe_wait_ms);
-#endif
+                        mlme_dbg(sdata,
+                                 "Failed to send nullfunc to AP %pM after %dms, disconnecting\n",
+                                 bssid, probe_wait_ms);
                         ieee80211_sta_connection_lost(sdata, bssid,
                                 WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
                 } else if (ifmgd->probe_send_count < max_tries) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                        wiphy_debug(local->hw.wiphy,
-                                    "%s: No probe response from AP %pM"
-                                    " after %dms, try %d/%i\n",
-                                    sdata->name,
-                                    bssid, probe_wait_ms,
-                                    ifmgd->probe_send_count, max_tries);
-#endif
+                        mlme_dbg(sdata,
+                                 "No probe response from AP %pM after %dms, try %d/%i\n",
+                                 bssid, probe_wait_ms,
+                                 ifmgd->probe_send_count, max_tries);
                         ieee80211_mgd_probe_ap_send(sdata);
                 } else {
                         /*
@@ -2919,11 +2901,8 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
                 sdata->flags &= ~IEEE80211_SDATA_DISCONNECT_RESUME;
                 mutex_lock(&ifmgd->mtx);
                 if (ifmgd->associated) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                        wiphy_debug(sdata->local->hw.wiphy,
-                                    "%s: driver requested disconnect after resume.\n",
-                                    sdata->name);
-#endif
+                        mlme_dbg(sdata,
+                                 "driver requested disconnect after resume\n");
                         ieee80211_sta_connection_lost(sdata,
                                 ifmgd->associated->bssid,
                                 WLAN_REASON_UNSPECIFIED);
@@ -3011,7 +2990,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
         struct ieee80211_bss *bss = (void *)cbss->priv;
-        struct sta_info *sta;
+        struct sta_info *sta = NULL;
         bool have_sta = false;
         int err;
         int ht_cfreq;
@@ -3064,10 +3043,11 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
                          * since we look at probe response/beacon data here
                          * it should be OK.
                          */
-                        pr_debug("%s: Wrong control channel: center-freq: %d ht-cfreq: %d ht->primary_chan: %d band: %d - Disabling HT\n",
-                                 sdata->name, cbss->channel->center_freq,
-                                 ht_cfreq, ht_oper->primary_chan,
-                                 cbss->channel->band);
+                        sdata_info(sdata,
+                                   "Wrong control channel: center-freq: %d ht-cfreq: %d ht->primary_chan: %d band: %d - Disabling HT\n",
+                                   cbss->channel->center_freq,
+                                   ht_cfreq, ht_oper->primary_chan,
+                                   cbss->channel->band);
                         ht_oper = NULL;
                 }
         }
@@ -3091,8 +3071,8 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
         if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
                 /* can only fail due to HT40+/- mismatch */
                 channel_type = NL80211_CHAN_HT20;
-                pr_debug("%s: disabling 40 MHz due to multi-vif mismatch\n",
-                         sdata->name);
+                sdata_info(sdata,
+                           "disabling 40 MHz due to multi-vif mismatch\n");
                 ifmgd->flags |= IEEE80211_STA_DISABLE_40MHZ;
                 WARN_ON(!ieee80211_set_channel_type(local, sdata,
                                                     channel_type));
@@ -3101,7 +3081,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
         local->oper_channel = cbss->channel;
         ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
 
-        if (!have_sta) {
+        if (sta) {
                 u32 rates = 0, basic_rates = 0;
                 bool have_higher_than_11mbit;
                 int min_rate = INT_MAX, min_rate_index = -1;
@@ -3121,8 +3101,8 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
                  * we can connect -- with a warning.
                  */
                 if (!basic_rates && min_rate_index >= 0) {
-                        pr_debug("%s: No basic rates, using min rate instead\n",
-                                 sdata->name);
+                        sdata_info(sdata,
+                                   "No basic rates, using min rate instead\n");
                         basic_rates = BIT(min_rate_index);
                 }
 
@@ -3148,8 +3128,9 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
                 err = sta_info_insert(sta);
                 sta = NULL;
                 if (err) {
-                        pr_debug("%s: failed to insert STA entry for the AP (error %d)\n",
-                                 sdata->name, err);
+                        sdata_info(sdata,
+                                   "failed to insert STA entry for the AP (error %d)\n",
+                                   err);
                         return err;
                 }
         } else
@@ -3227,7 +3208,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
         if (ifmgd->associated)
                 ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
 
-        pr_debug("%s: authenticate with %pM\n", sdata->name, req->bss->bssid);
+        sdata_info(sdata, "authenticate with %pM\n", req->bss->bssid);
 
         err = ieee80211_prep_connection(sdata, req->bss, false);
         if (err)
@@ -3409,8 +3390,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                  * Wait up to one beacon interval ...
                  * should this be more if we miss one?
                  */
-                pr_debug("%s: waiting for beacon from %pM\n",
-                         sdata->name, ifmgd->bssid);
+                sdata_info(sdata, "waiting for beacon from %pM\n",
+                           ifmgd->bssid);
                 assoc_data->timeout = TU_TO_EXP_TIME(req->bss->beacon_interval);
         } else {
                 assoc_data->have_beacon = true;
@@ -3429,8 +3410,8 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
                                 corrupt_type = "beacon";
                 } else if (bss->corrupt_data & IEEE80211_BSS_CORRUPT_PROBE_RESP)
                         corrupt_type = "probe response";
-                pr_debug("%s: associating with AP with corrupt %s\n",
-                         sdata->name, corrupt_type);
+                sdata_info(sdata, "associating with AP with corrupt %s\n",
+                           corrupt_type);
         }
 
         err = 0;
@@ -3459,8 +3440,9 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
                 return 0;
         }
 
-        pr_debug("%s: deauthenticating from %pM by local choice (reason=%d)\n",
-                 sdata->name, req->bssid, req->reason_code);
+        sdata_info(sdata,
+                   "deauthenticating from %pM by local choice (reason=%d)\n",
+                   req->bssid, req->reason_code);
 
         if (ifmgd->associated &&
             ether_addr_equal(ifmgd->associated->bssid, req->bssid))
@@ -3502,8 +3484,9 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
                 return -ENOLINK;
         }
 
-        pr_debug("%s: disassociating from %pM by local choice (reason=%d)\n",
-                 sdata->name, req->bss->bssid, req->reason_code);
+        sdata_info(sdata,
+                   "disassociating from %pM by local choice (reason=%d)\n",
+                   req->bss->bssid, req->reason_code);
 
         memcpy(bssid, req->bss->bssid, ETH_ALEN);
         ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DISASSOC,
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index abb226dc4753..b0fb6a2b89ad 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -15,7 +15,6 @@
 #include <linux/export.h>
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
-#include "driver-trace.h"
 #include "driver-ops.h"
 
 /*
@@ -25,8 +24,7 @@
  * because we *may* be doing work on-operating channel, and want our
  * hardware unconditionally awake, but still let the AP send us normal frames.
  */
-static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata,
-                                           bool tell_ap)
+static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_local *local = sdata->local;
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
@@ -47,8 +45,8 @@ static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata,
                 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS);
         }
 
-        if (tell_ap && (!local->offchannel_ps_enabled ||
-                        !(local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)))
+        if (!local->offchannel_ps_enabled ||
+            !(local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK))
                 /*
                  * If power save was enabled, no need to send a nullfunc
                  * frame because AP knows that we are sleeping. But if the
@@ -133,7 +131,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local,
                         if (offchannel_ps_enable &&
                             (sdata->vif.type == NL80211_IFTYPE_STATION) &&
                             sdata->u.mgd.associated)
-                                ieee80211_offchannel_ps_enable(sdata, true);
+                                ieee80211_offchannel_ps_enable(sdata);
                 }
         }
         mutex_unlock(&local->iflist_mtx);
@@ -263,6 +261,9 @@ void ieee80211_start_next_roc(struct ieee80211_local *local)
         roc = list_first_entry(&local->roc_list, struct ieee80211_roc_work,
                                list);
 
+        if (WARN_ON_ONCE(roc->started))
+                return;
+
         if (local->ops->remain_on_channel) {
                 int ret, duration = roc->duration;
 
@@ -378,8 +379,8 @@ void ieee80211_sw_roc_work(struct work_struct *work)
 
                 ieee80211_recalc_idle(local);
 
-                ieee80211_start_next_roc(local);
-                ieee80211_run_deferred_scan(local);
+                if (roc->started)
+                        ieee80211_start_next_roc(local);
         }
 
  out_unlock:
@@ -410,9 +411,6 @@ static void ieee80211_hw_roc_done(struct work_struct *work)
         /* if there's another roc, start it now */
         ieee80211_start_next_roc(local);
 
-        /* or scan maybe */
-        ieee80211_run_deferred_scan(local);
-
  out_unlock:
         mutex_unlock(&local->mtx);
 }
@@ -455,7 +453,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata)
         }
 
         ieee80211_start_next_roc(local);
-        ieee80211_run_deferred_scan(local);
         mutex_unlock(&local->mtx);
 
         list_for_each_entry_safe(roc, tmp, &tmp_list, list) {
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 98c128be3827..5c572e7a1a71 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -78,6 +78,16 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
                 if (err < 0) {
                         local->quiescing = false;
                         local->wowlan = false;
+                        if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
+                                mutex_lock(&local->sta_mtx);
+                                list_for_each_entry(sta,
+                                                    &local->sta_list, list) {
+                                        clear_sta_flag(sta, WLAN_STA_BLOCK_BA);
+                                }
+                                mutex_unlock(&local->sta_mtx);
+                        }
+                        ieee80211_wake_queues_by_reason(hw,
+                                        IEEE80211_QUEUE_STOP_REASON_SUSPEND);
                         return err;
                 } else if (err > 0) {
                         WARN_ON(err != 1);
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 6993d37dccfb..839cac8fab57 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -554,11 +554,11 @@ static inline u16 seq_sub(u16 sq1, u16 sq2)
 }
 
 
-static void ieee80211_release_reorder_frame(struct ieee80211_hw *hw,
+static void ieee80211_release_reorder_frame(struct ieee80211_sub_if_data *sdata,
                                             struct tid_ampdu_rx *tid_agg_rx,
                                             int index)
 {
-        struct ieee80211_local *local = hw_to_local(hw);
+        struct ieee80211_local *local = sdata->local;
         struct sk_buff *skb = tid_agg_rx->reorder_buf[index];
         struct ieee80211_rx_status *status;
 
@@ -578,7 +578,7 @@ no_frame:
         tid_agg_rx->head_seq_num = seq_inc(tid_agg_rx->head_seq_num);
 }
 
-static void ieee80211_release_reorder_frames(struct ieee80211_hw *hw,
+static void ieee80211_release_reorder_frames(struct ieee80211_sub_if_data *sdata,
                                              struct tid_ampdu_rx *tid_agg_rx,
                                              u16 head_seq_num)
 {
@@ -589,7 +589,7 @@ static void ieee80211_release_reorder_frames(struct ieee80211_hw *hw,
         while (seq_less(tid_agg_rx->head_seq_num, head_seq_num)) {
                 index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) %
                                                         tid_agg_rx->buf_size;
-                ieee80211_release_reorder_frame(hw, tid_agg_rx, index);
+                ieee80211_release_reorder_frame(sdata, tid_agg_rx, index);
         }
 }
 
@@ -604,7 +604,7 @@ static void ieee80211_release_reorder_frames(struct ieee80211_hw *hw,
  */
 #define HT_RX_REORDER_BUF_TIMEOUT (HZ / 10)
 
-static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
+static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata,
                                           struct tid_ampdu_rx *tid_agg_rx)
 {
         int index, j;
@@ -632,12 +632,9 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
                                         HT_RX_REORDER_BUF_TIMEOUT))
                                 goto set_release_timer;
 
-#ifdef CONFIG_MAC80211_HT_DEBUG
-                        if (net_ratelimit())
-                                wiphy_debug(hw->wiphy,
-                                            "release an RX reorder frame due to timeout on earlier frames\n");
-#endif
-                        ieee80211_release_reorder_frame(hw, tid_agg_rx, j);
+                        ht_dbg_ratelimited(sdata,
+                                           "release an RX reorder frame due to timeout on earlier frames\n");
+                        ieee80211_release_reorder_frame(sdata, tid_agg_rx, j);
 
                         /*
                          * Increment the head seq# also for the skipped slots.
@@ -647,7 +644,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
                         skipped = 0;
                 }
         } else while (tid_agg_rx->reorder_buf[index]) {
-                ieee80211_release_reorder_frame(hw, tid_agg_rx, index);
+                ieee80211_release_reorder_frame(sdata, tid_agg_rx, index);
                 index = seq_sub(tid_agg_rx->head_seq_num, tid_agg_rx->ssn) %
                                                         tid_agg_rx->buf_size;
         }
@@ -677,7 +674,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_hw *hw,
  * rcu_read_lock protection. It returns false if the frame
  * can be processed immediately, true if it was consumed.
  */
-static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw,
+static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_sub_if_data *sdata,
                                              struct tid_ampdu_rx *tid_agg_rx,
                                              struct sk_buff *skb)
 {
@@ -706,7 +703,8 @@ static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw,
         if (!seq_less(mpdu_seq_num, head_seq_num + buf_size)) {
                 head_seq_num = seq_inc(seq_sub(mpdu_seq_num, buf_size));
                 /* release stored frames up to new head to stack */
-                ieee80211_release_reorder_frames(hw, tid_agg_rx, head_seq_num);
+                ieee80211_release_reorder_frames(sdata, tid_agg_rx,
+                                                 head_seq_num);
         }
 
         /* Now the new frame is always in the range of the reordering buffer */
@@ -736,7 +734,7 @@ static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_hw *hw,
         tid_agg_rx->reorder_buf[index] = skb;
         tid_agg_rx->reorder_time[index] = jiffies;
         tid_agg_rx->stored_mpdu_num++;
-        ieee80211_sta_reorder_release(hw, tid_agg_rx);
+        ieee80211_sta_reorder_release(sdata, tid_agg_rx);
 
  out:
         spin_unlock(&tid_agg_rx->reorder_lock);
@@ -751,7 +749,6 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx)
 {
         struct sk_buff *skb = rx->skb;
         struct ieee80211_local *local = rx->local;
-        struct ieee80211_hw *hw = &local->hw;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
         struct sta_info *sta = rx->sta;
@@ -813,7 +810,7 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx)
          * sure that we cannot get to it any more before doing
          * anything with it.
          */
-        if (ieee80211_sta_manage_reorder_buf(hw, tid_agg_rx, skb))
+        if (ieee80211_sta_manage_reorder_buf(rx->sdata, tid_agg_rx, skb))
                 return;
 
  dont_reorder:
@@ -1136,24 +1133,18 @@ static void ap_sta_ps_start(struct sta_info *sta)
         set_sta_flag(sta, WLAN_STA_PS_STA);
         if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS))
                 drv_sta_notify(local, sdata, STA_NOTIFY_SLEEP, &sta->sta);
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        pr_debug("%s: STA %pM aid %d enters power save mode\n",
-                 sdata->name, sta->sta.addr, sta->sta.aid);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+        ps_dbg(sdata, "STA %pM aid %d enters power save mode\n",
+               sta->sta.addr, sta->sta.aid);
 }
 
 static void ap_sta_ps_end(struct sta_info *sta)
 {
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        pr_debug("%s: STA %pM aid %d exits power save mode\n",
-                 sta->sdata->name, sta->sta.addr, sta->sta.aid);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+        ps_dbg(sta->sdata, "STA %pM aid %d exits power save mode\n",
+               sta->sta.addr, sta->sta.aid);
 
         if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                pr_debug("%s: STA %pM aid %d driver-ps-blocked\n",
-                         sta->sdata->name, sta->sta.addr, sta->sta.aid);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+                ps_dbg(sta->sdata, "STA %pM aid %d driver-ps-blocked\n",
+                       sta->sta.addr, sta->sta.aid);
                 return;
         }
 
@@ -1383,17 +1374,8 @@ ieee80211_reassemble_add(struct ieee80211_sub_if_data *sdata,
         if (sdata->fragment_next >= IEEE80211_FRAGMENT_MAX)
                 sdata->fragment_next = 0;
 
-        if (!skb_queue_empty(&entry->skb_list)) {
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                struct ieee80211_hdr *hdr =
-                        (struct ieee80211_hdr *) entry->skb_list.next->data;
-                pr_debug("%s: RX reassembly removed oldest fragment entry (idx=%d age=%lu seq=%d last_frag=%d addr1=%pM addr2=%pM\n",
-                         sdata->name, idx,
-                         jiffies - entry->first_frag_time, entry->seq,
-                         entry->last_frag, hdr->addr1, hdr->addr2);
-#endif
+        if (!skb_queue_empty(&entry->skb_list))
                 __skb_queue_purge(&entry->skb_list);
-        }
 
         __skb_queue_tail(&entry->skb_list, *skb); /* no need for locking */
         *skb = NULL;
@@ -1751,7 +1733,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
                          */
                         xmit_skb = skb_copy(skb, GFP_ATOMIC);
                         if (!xmit_skb)
-                                net_dbg_ratelimited("%s: failed to clone multicast frame\n",
+                                net_info_ratelimited("%s: failed to clone multicast frame\n",
                                                     dev->name);
                 } else {
                         dsta = sta_info_get(sdata, skb->data);
@@ -1935,7 +1917,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
             ether_addr_equal(sdata->vif.addr, hdr->addr3))
                 return RX_CONTINUE;
 
-        q = ieee80211_select_queue_80211(local, skb, hdr);
+        q = ieee80211_select_queue_80211(sdata, skb, hdr);
         if (ieee80211_queue_stopped(&local->hw, q)) {
                 IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_congestion);
                 return RX_DROP_MONITOR;
@@ -1955,7 +1937,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 
         fwd_skb = skb_copy(skb, GFP_ATOMIC);
         if (!fwd_skb) {
-                net_dbg_ratelimited("%s: failed to clone mesh frame\n",
+                net_info_ratelimited("%s: failed to clone mesh frame\n",
                                     sdata->name);
                 goto out;
         }
@@ -2058,8 +2040,6 @@ ieee80211_rx_h_data(struct ieee80211_rx_data *rx)
 static ieee80211_rx_result debug_noinline
 ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx)
 {
-        struct ieee80211_local *local = rx->local;
-        struct ieee80211_hw *hw = &local->hw;
         struct sk_buff *skb = rx->skb;
         struct ieee80211_bar *bar = (struct ieee80211_bar *)skb->data;
         struct tid_ampdu_rx *tid_agg_rx;
@@ -2096,7 +2076,8 @@ ieee80211_rx_h_ctrl(struct ieee80211_rx_data *rx)
 
                 spin_lock(&tid_agg_rx->reorder_lock);
                 /* release stored frames up to start of BAR */
-                ieee80211_release_reorder_frames(hw, tid_agg_rx, start_seq_num);
+                ieee80211_release_reorder_frames(rx->sdata, tid_agg_rx,
+                                                 start_seq_num);
                 spin_unlock(&tid_agg_rx->reorder_lock);
 
                 kfree_skb(skb);
@@ -2750,7 +2731,7 @@ void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid)
                 return;
 
         spin_lock(&tid_agg_rx->reorder_lock);
-        ieee80211_sta_reorder_release(&sta->local->hw, tid_agg_rx);
+        ieee80211_sta_reorder_release(sta->sdata, tid_agg_rx);
         spin_unlock(&tid_agg_rx->reorder_lock);
 
         ieee80211_rx_handlers(&rx);
@@ -3030,6 +3011,10 @@ void ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb)
         if (unlikely(local->quiescing || local->suspended))
                 goto drop;
 
+        /* We might be during a HW reconfig, prevent Rx for the same reason */
+        if (unlikely(local->in_reconfig))
+                goto drop;
+
         /*
          * The same happens when we're not even started,
          * but that's worth a warning.
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 77dcf2f89d42..06fa75ceb025 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -169,9 +169,7 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta)
         if (sta->rate_ctrl)
                 rate_control_free_sta(sta);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Destroyed STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr);
 
         kfree(sta);
 }
@@ -278,9 +276,7 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
         for (i = 0; i < NUM_RX_DATA_QUEUES; i++)
                 sta->last_seq_ctrl[i] = cpu_to_le16(USHRT_MAX);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Allocated STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sdata, "Allocated STA %pM\n", sta->sta.addr);
 
 #ifdef CONFIG_MAC80211_MESH
         sta->plink_state = NL80211_PLINK_LISTEN;
@@ -333,8 +329,9 @@ static int sta_info_insert_drv_state(struct ieee80211_local *local,
         }
 
         if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
-                pr_debug("%s: failed to move IBSS STA %pM to state %d (%d) - keeping it anyway\n",
-                         sdata->name, sta->sta.addr, state + 1, err);
+                sdata_info(sdata,
+                           "failed to move IBSS STA %pM to state %d (%d) - keeping it anyway\n",
+                           sta->sta.addr, state + 1, err);
                 err = 0;
         }
 
@@ -389,9 +386,7 @@ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU)
         sinfo.generation = local->sta_generation;
         cfg80211_new_sta(sdata->dev, sta->sta.addr, &sinfo, GFP_KERNEL);
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Inserted STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sdata, "Inserted STA %pM\n", sta->sta.addr);
 
         /* move reference to rcu-protected */
         rcu_read_lock();
@@ -617,9 +612,8 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local,
                         break;
 
                 local->total_ps_buffered--;
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                pr_debug("Buffered frame expired (STA %pM)\n", sta->sta.addr);
-#endif
+                ps_dbg(sta->sdata, "Buffered frame expired (STA %pM)\n",
+                       sta->sta.addr);
                 dev_kfree_skb(skb);
         }
 
@@ -745,9 +739,8 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
                 mesh_accept_plinks_update(sdata);
 #endif
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        wiphy_debug(local->hw.wiphy, "Removed STA %pM\n", sta->sta.addr);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+        sta_dbg(sdata, "Removed STA %pM\n", sta->sta.addr);
+
         cancel_work_sync(&sta->drv_unblock_wk);
 
         cfg80211_del_sta(sdata->dev, sta->sta.addr, GFP_KERNEL);
@@ -887,8 +880,8 @@ void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
                         continue;
 
                 if (time_after(jiffies, sta->last_rx + exp_time)) {
-                        ibss_vdbg("%s: expiring inactive STA %pM\n",
-                                  sdata->name, sta->sta.addr);
+                        ibss_dbg(sdata, "expiring inactive STA %pM\n",
+                                 sta->sta.addr);
                         WARN_ON(__sta_info_destroy(sta));
                 }
         }
@@ -986,10 +979,9 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
 
         sta_info_recalc_tim(sta);
 
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        pr_debug("%s: STA %pM aid %d sending %d filtered/%d PS frames since STA not sleeping anymore\n",
-                 sdata->name, sta->sta.addr, sta->sta.aid, filtered, buffered);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+        ps_dbg(sdata,
+               "STA %pM aid %d sending %d filtered/%d PS frames since STA not sleeping anymore\n",
+               sta->sta.addr, sta->sta.aid, filtered, buffered);
 }
 
 static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata,
@@ -1379,10 +1371,8 @@ int sta_info_move_state(struct sta_info *sta,
                 return -EINVAL;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        pr_debug("%s: moving STA %pM to state %d\n",
-                 sta->sdata->name, sta->sta.addr, new_state);
-#endif
+        sta_dbg(sta->sdata, "moving STA %pM to state %d\n",
+                sta->sta.addr, new_state);
 
         /*
          * notify the driver before the actual changes so it can
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 6b4f42527887..2ed2f27fe8a7 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -155,13 +155,10 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local,
                 return;
         }
 
-#ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-        if (net_ratelimit())
-                wiphy_debug(local->hw.wiphy,
-                            "dropped TX filtered frame, queue_len=%d PS=%d @%lu\n",
-                            skb_queue_len(&sta->tx_filtered[ac]),
-                            !!test_sta_flag(sta, WLAN_STA_PS_STA), jiffies);
-#endif
+        ps_dbg_ratelimited(sta->sdata,
+                           "dropped TX filtered frame, queue_len=%d PS=%d @%lu\n",
+                           skb_queue_len(&sta->tx_filtered[ac]),
+                           !!test_sta_flag(sta, WLAN_STA_PS_STA), jiffies);
         dev_kfree_skb(skb);
 }
 
diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index 68be47ca208f..57e14d59e12f 100644
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -260,16 +260,6 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
         keyid = pos[3];
         iv32 = get_unaligned_le32(pos + 4);
         pos += 8;
-#ifdef CONFIG_MAC80211_TKIP_DEBUG
-        {
-                int i;
-                pr_debug("TKIP decrypt: data(len=%zd)", payload_len);
-                for (i = 0; i < payload_len; i++)
-                        printk(" %02x", payload[i]);
-                printk("\n");
-                pr_debug("TKIP decrypt: iv16=%04x iv32=%08x\n", iv16, iv32);
-        }
-#endif
 
         if (!(keyid & (1 << 5)))
                 return TKIP_DECRYPT_NO_EXT_IV;
@@ -280,15 +270,8 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
         if (key->u.tkip.rx[queue].state != TKIP_STATE_NOT_INIT &&
             (iv32 < key->u.tkip.rx[queue].iv32 ||
              (iv32 == key->u.tkip.rx[queue].iv32 &&
-              iv16 <= key->u.tkip.rx[queue].iv16))) {
-#ifdef CONFIG_MAC80211_TKIP_DEBUG
-                pr_debug("TKIP replay detected for RX frame from %pM (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
-                         ta, iv32, iv16,
-                         key->u.tkip.rx[queue].iv32,
-                         key->u.tkip.rx[queue].iv16);
-#endif
+              iv16 <= key->u.tkip.rx[queue].iv16)))
                 return TKIP_DECRYPT_REPLAY;
-        }
 
         if (only_iv) {
                 res = TKIP_DECRYPT_OK;
@@ -300,21 +283,6 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
             key->u.tkip.rx[queue].iv32 != iv32) {
                 /* IV16 wrapped around - perform TKIP phase 1 */
                 tkip_mixing_phase1(tk, &key->u.tkip.rx[queue], ta, iv32);
-#ifdef CONFIG_MAC80211_TKIP_DEBUG
-                {
-                        int i;
-                        u8 key_offset = NL80211_TKIP_DATA_OFFSET_ENCR_KEY;
-                        pr_debug("TKIP decrypt: Phase1 TA=%pM TK=", ta);
-                        for (i = 0; i < 16; i++)
-                                printk("%02x ",
-                                       key->conf.key[key_offset + i]);
-                        printk("\n");
-                        pr_debug("TKIP decrypt: P1K=");
-                        for (i = 0; i < 5; i++)
-                                printk("%04x ", key->u.tkip.rx[queue].p1k[i]);
-                        printk("\n");
-                }
-#endif
         }
         if (key->local->ops->update_tkip_key &&
             key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE &&
@@ -330,15 +298,6 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
         }
 
         tkip_mixing_phase2(tk, &key->u.tkip.rx[queue], iv16, rc4key);
-#ifdef CONFIG_MAC80211_TKIP_DEBUG
-        {
-                int i;
-                pr_debug("TKIP decrypt: Phase2 rc4key=");
-                for (i = 0; i < 16; i++)
-                        printk("%02x ", rc4key[i]);
-                printk("\n");
-        }
-#endif
 
         res = ieee80211_wep_decrypt_data(tfm, rc4key, 16, pos, payload_len - 12);
  done:
diff --git a/net/mac80211/trace.c b/net/mac80211/trace.c
new file mode 100644
index 000000000000..386e45d8a958
--- /dev/null
+++ b/net/mac80211/trace.c
@@ -0,0 +1,75 @@
+/* bug in tracepoint.h, it should include this */
+#include <linux/module.h>
+
+/* sparse isn't too happy with all macros... */
+#ifndef __CHECKER__
+#include <net/cfg80211.h>
+#include "driver-ops.h"
+#include "debug.h"
+#define CREATE_TRACE_POINTS
+#include "trace.h"
+
+#ifdef CONFIG_MAC80211_MESSAGE_TRACING
+void __sdata_info(const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+
+        pr_info("%pV", &vaf);
+        trace_mac80211_info(&vaf);
+        va_end(args);
+}
+
+void __sdata_dbg(bool print, const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+
+        if (print)
+                pr_debug("%pV", &vaf);
+        trace_mac80211_dbg(&vaf);
+        va_end(args);
+}
+
+void __sdata_err(const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+
+        pr_err("%pV", &vaf);
+        trace_mac80211_err(&vaf);
+        va_end(args);
+}
+
+void __wiphy_dbg(struct wiphy *wiphy, bool print, const char *fmt, ...)
+{
+        struct va_format vaf = {
+                .fmt = fmt,
+        };
+        va_list args;
+
+        va_start(args, fmt);
+        vaf.va = &args;
+
+        if (print)
+                wiphy_dbg(wiphy, "%pV", &vaf);
+        trace_mac80211_dbg(&vaf);
+        va_end(args);
+}
+#endif
+#endif
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/trace.h
index 6de00b2c268c..2e60f4acd027 100644
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/trace.h
@@ -1218,6 +1218,32 @@ DEFINE_EVENT(release_evt, drv_allow_buffered_frames,
         TP_ARGS(local, sta, tids, num_frames, reason, more_data)
 );
 
+TRACE_EVENT(drv_get_rssi,
+        TP_PROTO(struct ieee80211_local *local, struct ieee80211_sta *sta,
+                 s8 rssi, int ret),
+
+        TP_ARGS(local, sta, rssi, ret),
+
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+                STA_ENTRY
+                __field(s8, rssi)
+                __field(int, ret)
+        ),
+
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+                STA_ASSIGN;
+                __entry->rssi = rssi;
+                __entry->ret = ret;
+        ),
+
+        TP_printk(
+                LOCAL_PR_FMT STA_PR_FMT " rssi:%d ret:%d",
+                LOCAL_PR_ARG, STA_PR_ARG, __entry->rssi, __entry->ret
+        )
+);
+
 /*
  * Tracing for API calls that drivers call.
  */
@@ -1606,10 +1632,49 @@ TRACE_EVENT(stop_queue,
                 LOCAL_PR_ARG, __entry->queue, __entry->reason
         )
 );
+
+#ifdef CONFIG_MAC80211_MESSAGE_TRACING
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM mac80211_msg
+
+#define MAX_MSG_LEN     100
+
+DECLARE_EVENT_CLASS(mac80211_msg_event,
+        TP_PROTO(struct va_format *vaf),
+
+        TP_ARGS(vaf),
+
+        TP_STRUCT__entry(
+                __dynamic_array(char, msg, MAX_MSG_LEN)
+        ),
+
+        TP_fast_assign(
+                WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
+                                       MAX_MSG_LEN, vaf->fmt,
+                                       *vaf->va) >= MAX_MSG_LEN);
+        ),
+
+        TP_printk("%s", __get_str(msg))
+);
+
+DEFINE_EVENT(mac80211_msg_event, mac80211_info,
+        TP_PROTO(struct va_format *vaf),
+        TP_ARGS(vaf)
+);
+DEFINE_EVENT(mac80211_msg_event, mac80211_dbg,
+        TP_PROTO(struct va_format *vaf),
+        TP_ARGS(vaf)
+);
+DEFINE_EVENT(mac80211_msg_event, mac80211_err,
+        TP_PROTO(struct va_format *vaf),
+        TP_ARGS(vaf)
+);
+#endif
+
 #endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */
 
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH .
 #undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_FILE driver-trace
+#define TRACE_INCLUDE_FILE trace
 #include <trace/define_trace.h>
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index af25c4e7ec5c..ec8f53467374 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -175,12 +175,6 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
         return cpu_to_le16(dur);
 }
 
-static inline int is_ieee80211_device(struct ieee80211_local *local,
-                                      struct net_device *dev)
-{
-        return local == wdev_priv(dev->ieee80211_ptr);
-}
-
 /* tx handlers */
 static ieee80211_tx_result debug_noinline
 ieee80211_tx_h_dynamic_ps(struct ieee80211_tx_data *tx)
@@ -297,9 +291,10 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
                 if (unlikely(!assoc &&
                              ieee80211_is_data(hdr->frame_control))) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                        pr_debug("%s: dropped data frame to not associated station %pM\n",
-                                 tx->sdata->name, hdr->addr1);
-#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
+                        sdata_info(tx->sdata,
+                                   "dropped data frame to not associated station %pM\n",
+                                   hdr->addr1);
+#endif
                         I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc);
                         return TX_DROP;
                 }
@@ -366,10 +361,7 @@ static void purge_old_ps_buffers(struct ieee80211_local *local)
         rcu_read_unlock();
 
         local->total_ps_buffered = total;
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        wiphy_debug(local->hw.wiphy, "PS buffers full - purged %d frames\n",
-                    purged);
-#endif
+        ps_dbg_hw(&local->hw, "PS buffers full - purged %d frames\n", purged);
 }
 
 static ieee80211_tx_result
@@ -411,10 +403,8 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx)
                 purge_old_ps_buffers(tx->local);
 
         if (skb_queue_len(&tx->sdata->bss->ps_bc_buf) >= AP_MAX_BC_BUFFER) {
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                net_dbg_ratelimited("%s: BC TX buffer full - dropping the oldest frame\n",
-                                    tx->sdata->name);
-#endif
+                ps_dbg(tx->sdata,
+                       "BC TX buffer full - dropping the oldest frame\n");
                 dev_kfree_skb(skb_dequeue(&tx->sdata->bss->ps_bc_buf));
         } else
                 tx->local->total_ps_buffered++;
@@ -465,18 +455,15 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
                         return TX_CONTINUE;
                 }
 
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                pr_debug("STA %pM aid %d: PS buffer for AC %d\n",
-                         sta->sta.addr, sta->sta.aid, ac);
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
+                ps_dbg(sta->sdata, "STA %pM aid %d: PS buffer for AC %d\n",
+                       sta->sta.addr, sta->sta.aid, ac);
                 if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
                         purge_old_ps_buffers(tx->local);
                 if (skb_queue_len(&sta->ps_tx_buf[ac]) >= STA_MAX_TX_BUFFER) {
                         struct sk_buff *old = skb_dequeue(&sta->ps_tx_buf[ac]);
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-                        net_dbg_ratelimited("%s: STA %pM TX buffer for AC %d full - dropping oldest frame\n",
-                                            tx->sdata->name, sta->sta.addr, ac);
-#endif
+                        ps_dbg(tx->sdata,
+                               "STA %pM TX buffer for AC %d full - dropping oldest frame\n",
+                               sta->sta.addr, ac);
                         dev_kfree_skb(old);
                 } else
                         tx->local->total_ps_buffered++;
@@ -498,13 +485,11 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
                 sta_info_recalc_tim(sta);
 
                 return TX_QUEUED;
+        } else if (unlikely(test_sta_flag(sta, WLAN_STA_PS_STA))) {
+                ps_dbg(tx->sdata,
+                       "STA %pM in PS mode, but polling/in SP -> send frame\n",
+                       sta->sta.addr);
         }
-#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
-        else if (unlikely(test_sta_flag(sta, WLAN_STA_PS_STA))) {
-                pr_debug("%s: STA %pM in PS mode, but polling/in SP -> send frame\n",
-                         tx->sdata->name, sta->sta.addr);
-        }
-#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
 
         return TX_CONTINUE;
 }
@@ -1963,7 +1948,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
                      (cpu_to_be16(ethertype) != sdata->control_port_protocol ||
                       !ether_addr_equal(sdata->vif.addr, skb->data + ETH_ALEN)))) {
 #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
-                net_dbg_ratelimited("%s: dropped frame to %pM (unauthorized port)\n",
+                net_info_ratelimited("%s: dropped frame to %pM (unauthorized port)\n",
                                     dev->name, hdr.addr1);
 #endif
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 1df4019f294b..242ecde381f6 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1411,6 +1411,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 if (ieee80211_sdata_running(sdata))
                         ieee80211_enable_keys(sdata);
 
+        local->in_reconfig = false;
+        barrier();
+
  wake_up:
         /*
          * Clear the WLAN_STA_BLOCK_BA flag so new aggregation
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index c3d643a6536c..cea06e9f26f4 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -52,11 +52,11 @@ static int wme_downgrade_ac(struct sk_buff *skb)
         }
 }
 
-static u16 ieee80211_downgrade_queue(struct ieee80211_local *local,
+static u16 ieee80211_downgrade_queue(struct ieee80211_sub_if_data *sdata,
                                      struct sk_buff *skb)
 {
         /* in case we are a client verify acm is not set for this ac */
-        while (unlikely(local->wmm_acm & BIT(skb->priority))) {
+        while (unlikely(sdata->wmm_acm & BIT(skb->priority))) {
                 if (wme_downgrade_ac(skb)) {
                         /*
                          * This should not really happen. The AP has marked all
@@ -73,10 +73,11 @@ static u16 ieee80211_downgrade_queue(struct ieee80211_local *local,
 }
 
 /* Indicate which queue to use for this fully formed 802.11 frame */
-u16 ieee80211_select_queue_80211(struct ieee80211_local *local,
+u16 ieee80211_select_queue_80211(struct ieee80211_sub_if_data *sdata,
                                  struct sk_buff *skb,
                                  struct ieee80211_hdr *hdr)
 {
+        struct ieee80211_local *local = sdata->local;
         u8 *p;
 
         if (local->hw.queues < IEEE80211_NUM_ACS)
@@ -94,7 +95,7 @@ u16 ieee80211_select_queue_80211(struct ieee80211_local *local,
         p = ieee80211_get_qos_ctl(hdr);
         skb->priority = *p & IEEE80211_QOS_CTL_TAG1D_MASK;
 
-        return ieee80211_downgrade_queue(local, skb);
+        return ieee80211_downgrade_queue(sdata, skb);
 }
 
 /* Indicate which queue to use. */
@@ -156,7 +157,7 @@ u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
          * data frame has */
         skb->priority = cfg80211_classify8021d(skb);
 
-        return ieee80211_downgrade_queue(local, skb);
+        return ieee80211_downgrade_queue(sdata, skb);
 }
 
 void ieee80211_set_qos_hdr(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/wme.h b/net/mac80211/wme.h
index ca80818b7b66..7fea4bb8acbc 100644
--- a/net/mac80211/wme.h
+++ b/net/mac80211/wme.h
@@ -15,7 +15,7 @@
 
 extern const int ieee802_1d_to_ac[8];
 
-u16 ieee80211_select_queue_80211(struct ieee80211_local *local,
+u16 ieee80211_select_queue_80211(struct ieee80211_sub_if_data *sdata,
                                  struct sk_buff *skb,
                                  struct ieee80211_hdr *hdr);
 u16 ieee80211_select_queue(struct ieee80211_sub_if_data *sdata,
diff --git a/net/wireless/core.c b/net/wireless/core.c
index a87d43552974..907f62c80e28 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -96,69 +96,6 @@ struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx)
         return &rdev->wiphy;
 }
 
-/* requires cfg80211_mutex to be held! */
-struct cfg80211_registered_device *
-__cfg80211_rdev_from_info(struct genl_info *info)
-{
-        int ifindex;
-        struct cfg80211_registered_device *bywiphyidx = NULL, *byifidx = NULL;
-        struct net_device *dev;
-        int err = -EINVAL;
-
-        assert_cfg80211_lock();
-
-        if (info->attrs[NL80211_ATTR_WIPHY]) {
-                bywiphyidx = cfg80211_rdev_by_wiphy_idx(
-                                nla_get_u32(info->attrs[NL80211_ATTR_WIPHY]));
-                err = -ENODEV;
-        }
-
-        if (info->attrs[NL80211_ATTR_IFINDEX]) {
-                ifindex = nla_get_u32(info->attrs[NL80211_ATTR_IFINDEX]);
-                dev = dev_get_by_index(genl_info_net(info), ifindex);
-                if (dev) {
-                        if (dev->ieee80211_ptr)
-                                byifidx =
-                                        wiphy_to_dev(dev->ieee80211_ptr->wiphy);
-                        dev_put(dev);
-                }
-                err = -ENODEV;
-        }
-
-        if (bywiphyidx && byifidx) {
-                if (bywiphyidx != byifidx)
-                        return ERR_PTR(-EINVAL);
-                else
-                        return bywiphyidx; /* == byifidx */
-        }
-        if (bywiphyidx)
-                return bywiphyidx;
-
-        if (byifidx)
-                return byifidx;
-
-        return ERR_PTR(err);
-}
-
-struct cfg80211_registered_device *
-cfg80211_get_dev_from_info(struct genl_info *info)
-{
-        struct cfg80211_registered_device *rdev;
-
-        mutex_lock(&cfg80211_mutex);
-        rdev = __cfg80211_rdev_from_info(info);
-
-        /* if it is not an error we grab the lock on
-         * it to assure it won't be going away while
-         * we operate on it */
-        if (!IS_ERR(rdev))
-                mutex_lock(&rdev->mtx);
-
-        mutex_unlock(&cfg80211_mutex);
-
-        return rdev;
-}
-
 struct cfg80211_registered_device *
 cfg80211_get_dev_from_ifindex(struct net *net, int ifindex)
 {
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 9348a47562a4..609a579255ac 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -159,32 +159,6 @@ static inline void cfg80211_unhold_bss(struct cfg80211_internal_bss *bss)
 struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx);
 int get_wiphy_idx(struct wiphy *wiphy);
 
-struct cfg80211_registered_device *
-__cfg80211_rdev_from_info(struct genl_info *info);
-
-/*
- * This function returns a pointer to the driver
- * that the genl_info item that is passed refers to.
- * If successful, it returns non-NULL and also locks
- * the driver's mutex!
- *
- * This means that you need to call cfg80211_unlock_rdev()
- * before being allowed to acquire &cfg80211_mutex!
- *
- * This is necessary because we need to lock the global
- * mutex to get an item off the list safely, and then
- * we lock the rdev mutex so it doesn't go away under us.
- *
- * We don't want to keep cfg80211_mutex locked
- * for all the time in order to allow requests on
- * other interfaces to go through at the same time.
- *
- * The result of this can be a PTR_ERR and hence must
- * be checked with IS_ERR() for errors.
- */
-extern struct cfg80211_registered_device *
-cfg80211_get_dev_from_info(struct genl_info *info);
-
 /* requires cfg80211_rdev_mutex to be held! */
 struct wiphy *wiphy_idx_to_wiphy(int wiphy_idx);
 
diff --git a/net/wireless/mesh.c b/net/wireless/mesh.c
index b44c736bf9cf..3b73b07486cf 100644
--- a/net/wireless/mesh.c
+++ b/net/wireless/mesh.c
@@ -14,6 +14,9 @@
 
 #define MESH_PATH_TIMEOUT       5000
 #define MESH_RANN_INTERVAL      5000
+#define MESH_PATH_TO_ROOT_TIMEOUT      6000
+#define MESH_ROOT_INTERVAL     5000
+#define MESH_ROOT_CONFIRMATION_INTERVAL 2000
 
 /*
  * Minimum interval between two consecutive PREQs originated by the same
@@ -62,6 +65,9 @@ const struct mesh_config default_mesh_config = {
         .dot11MeshForwarding = true,
         .rssi_threshold = MESH_RSSI_THRESHOLD,
         .ht_opmode = IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED,
+        .dot11MeshHWMPactivePathToRootTimeout = MESH_PATH_TO_ROOT_TIMEOUT,
+        .dot11MeshHWMProotInterval = MESH_ROOT_INTERVAL,
+        .dot11MeshHWMPconfirmationInterval = MESH_ROOT_CONFIRMATION_INTERVAL,
 };
 
 const struct mesh_setup default_mesh_setup = {
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index cbdc0fd67a14..3b508eaf2d07 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -70,6 +70,94 @@ static int get_rdev_dev_by_ifindex(struct net *netns, struct nlattr **attrs,
         return 0;
 }
 
+static struct cfg80211_registered_device *
+__cfg80211_rdev_from_attrs(struct net *netns, struct nlattr **attrs)
+{
+        struct cfg80211_registered_device *rdev = NULL, *tmp;
+        struct net_device *netdev;
+
+        assert_cfg80211_lock();
+
+        if (!attrs[NL80211_ATTR_WIPHY] &&
+            !attrs[NL80211_ATTR_IFINDEX])
+                return ERR_PTR(-EINVAL);
+
+        if (attrs[NL80211_ATTR_WIPHY])
+                rdev = cfg80211_rdev_by_wiphy_idx(
+                                nla_get_u32(attrs[NL80211_ATTR_WIPHY]));
+
+        if (attrs[NL80211_ATTR_IFINDEX]) {
+                int ifindex = nla_get_u32(attrs[NL80211_ATTR_IFINDEX]);
+                netdev = dev_get_by_index(netns, ifindex);
+                if (netdev) {
+                        if (netdev->ieee80211_ptr)
+                                tmp = wiphy_to_dev(
+                                                netdev->ieee80211_ptr->wiphy);
+                        else
+                                tmp = NULL;
+
+                        dev_put(netdev);
+
+                        /* not wireless device -- return error */
+                        if (!tmp)
+                                return ERR_PTR(-EINVAL);
+
+                        /* mismatch -- return error */
+                        if (rdev && tmp != rdev)
+                                return ERR_PTR(-EINVAL);
+
+                        rdev = tmp;
+                }
+        }
+
+        if (!rdev)
+                return ERR_PTR(-ENODEV);
+
+        if (netns != wiphy_net(&rdev->wiphy))
+                return ERR_PTR(-ENODEV);
+
+        return rdev;
+}
+
+/*
+ * This function returns a pointer to the driver
+ * that the genl_info item that is passed refers to.
+ * If successful, it returns non-NULL and also locks
+ * the driver's mutex!
+ *
+ * This means that you need to call cfg80211_unlock_rdev()
+ * before being allowed to acquire &cfg80211_mutex!
+ *
+ * This is necessary because we need to lock the global
+ * mutex to get an item off the list safely, and then
+ * we lock the rdev mutex so it doesn't go away under us.
+ *
+ * We don't want to keep cfg80211_mutex locked
+ * for all the time in order to allow requests on
+ * other interfaces to go through at the same time.
+ *
+ * The result of this can be a PTR_ERR and hence must
+ * be checked with IS_ERR() for errors.
+ */
+static struct cfg80211_registered_device *
+cfg80211_get_dev_from_info(struct net *netns, struct genl_info *info)
+{
+        struct cfg80211_registered_device *rdev;
+
+        mutex_lock(&cfg80211_mutex);
+        rdev = __cfg80211_rdev_from_attrs(netns, info->attrs);
+
+        /* if it is not an error we grab the lock on
+         * it to assure it won't be going away while
+         * we operate on it */
+        if (!IS_ERR(rdev))
+                mutex_lock(&rdev->mtx);
+
+        mutex_unlock(&cfg80211_mutex);
+
+        return rdev;
+}
+
 /* policy for the attributes */
 static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_WIPHY] = { .type = NLA_U32 },
@@ -115,7 +203,7 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
         [NL80211_ATTR_STA_VLAN] = { .type = NLA_U32 },
         [NL80211_ATTR_MNTR_FLAGS] = { /* NLA_NESTED can't be empty */ },
         [NL80211_ATTR_MESH_ID] = { .type = NLA_BINARY,
-                                .len = IEEE80211_MAX_MESH_ID_LEN },
+                                   .len = IEEE80211_MAX_MESH_ID_LEN },
         [NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_U32 },
 
         [NL80211_ATTR_REG_ALPHA2] = { .type = NLA_STRING, .len = 2 },
@@ -250,8 +338,9 @@ nl80211_rekey_policy[NUM_NL80211_REKEY_DATA] = {
 
 static const struct nla_policy
 nl80211_match_policy[NL80211_SCHED_SCAN_MATCH_ATTR_MAX + 1] = {
-        [NL80211_ATTR_SCHED_SCAN_MATCH_SSID] = { .type = NLA_BINARY,
+        [NL80211_SCHED_SCAN_MATCH_ATTR_SSID] = { .type = NLA_BINARY,
                                                  .len = IEEE80211_MAX_SSID_LEN },
+        [NL80211_SCHED_SCAN_MATCH_ATTR_RSSI] = { .type = NLA_U32 },
 };
 
 /* ifidx get helper */
@@ -1334,7 +1423,8 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
         }
 
         if (!netdev) {
-                rdev = __cfg80211_rdev_from_info(info);
+                rdev = __cfg80211_rdev_from_attrs(genl_info_net(info),
+                                                  info->attrs);
                 if (IS_ERR(rdev)) {
                         mutex_unlock(&cfg80211_mutex);
                         return PTR_ERR(rdev);
@@ -2246,6 +2336,33 @@ static int nl80211_parse_beacon(struct genl_info *info,
         return 0;
 }
 
+static bool nl80211_get_ap_channel(struct cfg80211_registered_device *rdev,
+                                   struct cfg80211_ap_settings *params)
+{
+        struct wireless_dev *wdev;
+        bool ret = false;
+
+        mutex_lock(&rdev->devlist_mtx);
+
+        list_for_each_entry(wdev, &rdev->netdev_list, list) {
+                if (wdev->iftype != NL80211_IFTYPE_AP &&
+                    wdev->iftype != NL80211_IFTYPE_P2P_GO)
+                        continue;
+
+                if (!wdev->preset_chan)
+                        continue;
+
+                params->channel = wdev->preset_chan;
+                params->channel_type = wdev->preset_chantype;
+                ret = true;
+                break;
+        }
+
+        mutex_unlock(&rdev->devlist_mtx);
+
+        return ret;
+}
+
 static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg80211_registered_device *rdev = info->user_ptr[0];
@@ -2348,7 +2465,7 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
         } else if (wdev->preset_chan) {
                 params.channel = wdev->preset_chan;
                 params.channel_type = wdev->preset_chantype;
-        } else
+        } else if (!nl80211_get_ap_channel(rdev, &params))
                 return -EINVAL;
 
         if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, params.channel,
@@ -2356,8 +2473,11 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
                 return -EINVAL;
 
         err = rdev->ops->start_ap(&rdev->wiphy, dev, &params);
-        if (!err)
+        if (!err) {
+                wdev->preset_chan = params.channel;
+                wdev->preset_chantype = params.channel_type;
                 wdev->beacon_interval = params.beacon_interval;
+        }
         return err;
 }
 
@@ -3469,7 +3589,13 @@ static int nl80211_get_mesh_config(struct sk_buff *skb,
             nla_put_u32(msg, NL80211_MESHCONF_RSSI_THRESHOLD,
                         cur_params.rssi_threshold) ||
             nla_put_u32(msg, NL80211_MESHCONF_HT_OPMODE,
-                        cur_params.ht_opmode))
+                        cur_params.ht_opmode) ||
+            nla_put_u32(msg, NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
+                        cur_params.dot11MeshHWMPactivePathToRootTimeout) ||
+            nla_put_u16(msg, NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
+                        cur_params.dot11MeshHWMProotInterval) ||
+            nla_put_u16(msg, NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
+                        cur_params.dot11MeshHWMPconfirmationInterval))
                 goto nla_put_failure;
         nla_nest_end(msg, pinfoattr);
         genlmsg_end(msg, hdr);
@@ -3492,7 +3618,6 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A
         [NL80211_MESHCONF_ELEMENT_TTL] = { .type = NLA_U8 },
         [NL80211_MESHCONF_AUTO_OPEN_PLINKS] = { .type = NLA_U8 },
         [NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR] = { .type = NLA_U32 },
-
         [NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES] = { .type = NLA_U8 },
         [NL80211_MESHCONF_PATH_REFRESH_TIME] = { .type = NLA_U32 },
         [NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT] = { .type = NLA_U16 },
@@ -3504,8 +3629,11 @@ static const struct nla_policy nl80211_meshconf_params_policy[NL80211_MESHCONF_A
         [NL80211_MESHCONF_HWMP_RANN_INTERVAL] = { .type = NLA_U16 },
         [NL80211_MESHCONF_GATE_ANNOUNCEMENTS] = { .type = NLA_U8 },
         [NL80211_MESHCONF_FORWARDING] = { .type = NLA_U8 },
-        [NL80211_MESHCONF_RSSI_THRESHOLD] = { .type = NLA_U32},
-        [NL80211_MESHCONF_HT_OPMODE] = { .type = NLA_U16},
+        [NL80211_MESHCONF_RSSI_THRESHOLD] = { .type = NLA_U32 },
+        [NL80211_MESHCONF_HT_OPMODE] = { .type = NLA_U16 },
+        [NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT] = { .type = NLA_U32 },
+        [NL80211_MESHCONF_HWMP_ROOT_INTERVAL] = { .type = NLA_U16 },
+        [NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL] = { .type = NLA_U16 },
 };
 
 static const struct nla_policy
@@ -3515,7 +3643,7 @@ static const struct nla_policy
         [NL80211_MESH_SETUP_ENABLE_VENDOR_METRIC] = { .type = NLA_U8 },
         [NL80211_MESH_SETUP_USERSPACE_AUTH] = { .type = NLA_FLAG },
         [NL80211_MESH_SETUP_IE] = { .type = NLA_BINARY,
-                .len = IEEE80211_MAX_DATA_LEN },
+                                    .len = IEEE80211_MAX_DATA_LEN },
         [NL80211_MESH_SETUP_USERSPACE_AMPE] = { .type = NLA_FLAG },
 };
 
@@ -3548,63 +3676,82 @@ do {\
 
         /* Fill in the params struct */
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshRetryTimeout,
-                        mask, NL80211_MESHCONF_RETRY_TIMEOUT, nla_get_u16);
+                                  mask, NL80211_MESHCONF_RETRY_TIMEOUT,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshConfirmTimeout,
-                        mask, NL80211_MESHCONF_CONFIRM_TIMEOUT, nla_get_u16);
+                                  mask, NL80211_MESHCONF_CONFIRM_TIMEOUT,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHoldingTimeout,
-                        mask, NL80211_MESHCONF_HOLDING_TIMEOUT, nla_get_u16);
+                                  mask, NL80211_MESHCONF_HOLDING_TIMEOUT,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxPeerLinks,
-                        mask, NL80211_MESHCONF_MAX_PEER_LINKS, nla_get_u16);
+                                  mask, NL80211_MESHCONF_MAX_PEER_LINKS,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshMaxRetries,
-                        mask, NL80211_MESHCONF_MAX_RETRIES, nla_get_u8);
+                                  mask, NL80211_MESHCONF_MAX_RETRIES,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshTTL,
-                        mask, NL80211_MESHCONF_TTL, nla_get_u8);
+                                  mask, NL80211_MESHCONF_TTL, nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, element_ttl,
-                        mask, NL80211_MESHCONF_ELEMENT_TTL, nla_get_u8);
+                                  mask, NL80211_MESHCONF_ELEMENT_TTL,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, auto_open_plinks,
-                        mask, NL80211_MESHCONF_AUTO_OPEN_PLINKS, nla_get_u8);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshNbrOffsetMaxNeighbor,
-                        mask, NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
-                        nla_get_u32);
+                                  mask, NL80211_MESHCONF_AUTO_OPEN_PLINKS,
+                                  nla_get_u8);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshNbrOffsetMaxNeighbor, mask,
+                                  NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR,
+                                  nla_get_u32);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPmaxPREQretries,
-                        mask, NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
-                        nla_get_u8);
+                                  mask, NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, path_refresh_time,
-                        mask, NL80211_MESHCONF_PATH_REFRESH_TIME, nla_get_u32);
+                                  mask, NL80211_MESHCONF_PATH_REFRESH_TIME,
+                                  nla_get_u32);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, min_discovery_timeout,
-                        mask, NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
-                        nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathTimeout,
-                        mask, NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
-                        nla_get_u32);
+                                  mask, NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT,
+                                  nla_get_u16);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathTimeout, mask,
+                                  NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT,
+                                  nla_get_u32);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPpreqMinInterval,
-                        mask, NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
-                        nla_get_u16);
+                                  mask, NL80211_MESHCONF_HWMP_PREQ_MIN_INTERVAL,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPperrMinInterval,
-                        mask, NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
-                        nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                        dot11MeshHWMPnetDiameterTraversalTime,
-                        mask, NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
-                        nla_get_u16);
+                                  mask, NL80211_MESHCONF_HWMP_PERR_MIN_INTERVAL,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                        dot11MeshHWMPRootMode, mask,
-                        NL80211_MESHCONF_HWMP_ROOTMODE,
-                        nla_get_u8);
+                                  dot11MeshHWMPnetDiameterTraversalTime, mask,
+                                  NL80211_MESHCONF_HWMP_NET_DIAM_TRVS_TIME,
+                                  nla_get_u16);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRootMode, mask,
+                                  NL80211_MESHCONF_HWMP_ROOTMODE, nla_get_u8);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPRannInterval, mask,
+                                  NL80211_MESHCONF_HWMP_RANN_INTERVAL,
+                                  nla_get_u16);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                        dot11MeshHWMPRannInterval, mask,
-                        NL80211_MESHCONF_HWMP_RANN_INTERVAL,
-                        nla_get_u16);
-        FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
-                        dot11MeshGateAnnouncementProtocol, mask,
-                        NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
-                        nla_get_u8);
+                                  dot11MeshGateAnnouncementProtocol, mask,
+                                  NL80211_MESHCONF_GATE_ANNOUNCEMENTS,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshForwarding,
-                        mask, NL80211_MESHCONF_FORWARDING, nla_get_u8);
+                                  mask, NL80211_MESHCONF_FORWARDING,
+                                  nla_get_u8);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, rssi_threshold,
-                        mask, NL80211_MESHCONF_RSSI_THRESHOLD, nla_get_u32);
+                                  mask, NL80211_MESHCONF_RSSI_THRESHOLD,
+                                  nla_get_u32);
         FILL_IN_MESH_PARAM_IF_SET(tb, cfg, ht_opmode,
-                        mask, NL80211_MESHCONF_HT_OPMODE, nla_get_u16);
+                                  mask, NL80211_MESHCONF_HT_OPMODE,
+                                  nla_get_u16);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathToRootTimeout,
+                                  mask,
+                                  NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT,
+                                  nla_get_u32);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMProotInterval,
+                                  mask, NL80211_MESHCONF_HWMP_ROOT_INTERVAL,
+                                  nla_get_u16);
+        FILL_IN_MESH_PARAM_IF_SET(tb, cfg,
+                                  dot11MeshHWMPconfirmationInterval, mask,
+                                  NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL,
+                                  nla_get_u16);
         if (mask_out)
                 *mask_out = mask;
 
@@ -4241,12 +4388,12 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
                 nla_for_each_nested(attr,
                                     info->attrs[NL80211_ATTR_SCHED_SCAN_MATCH],
                                     tmp) {
-                        struct nlattr *ssid;
+                        struct nlattr *ssid, *rssi;
 
                         nla_parse(tb, NL80211_SCHED_SCAN_MATCH_ATTR_MAX,
                                   nla_data(attr), nla_len(attr),
                                   nl80211_match_policy);
-                        ssid = tb[NL80211_ATTR_SCHED_SCAN_MATCH_SSID];
+                        ssid = tb[NL80211_SCHED_SCAN_MATCH_ATTR_SSID];
                         if (ssid) {
                                 if (nla_len(ssid) > IEEE80211_MAX_SSID_LEN) {
                                         err = -EINVAL;
@@ -4257,6 +4404,12 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
                                 request->match_sets[i].ssid.ssid_len =
                                         nla_len(ssid);
                         }
+                        rssi = tb[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI];
+                        if (rssi)
+                                request->rssi_thold = nla_get_u32(rssi);
+                        else
+                                request->rssi_thold =
+                                                   NL80211_SCAN_RSSI_THOLD_OFF;
                         i++;
                 }
         }
@@ -5114,21 +5267,18 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
                                   nl80211_policy);
                 if (err)
                         return err;
-                if (nl80211_fam.attrbuf[NL80211_ATTR_WIPHY]) {
-                        phy_idx = nla_get_u32(
-                                nl80211_fam.attrbuf[NL80211_ATTR_WIPHY]);
-                } else {
-                        struct net_device *netdev;
 
-                        err = get_rdev_dev_by_ifindex(sock_net(skb->sk),
-                                                      nl80211_fam.attrbuf,
-                                                      &rdev, &netdev);
-                        if (err)
-                                return err;
-                        dev_put(netdev);
-                        phy_idx = rdev->wiphy_idx;
-                        cfg80211_unlock_rdev(rdev);
+                mutex_lock(&cfg80211_mutex);
+                rdev = __cfg80211_rdev_from_attrs(sock_net(skb->sk),
+                                                  nl80211_fam.attrbuf);
+                if (IS_ERR(rdev)) {
+                        mutex_unlock(&cfg80211_mutex);
+                        return PTR_ERR(rdev);
                 }
+                phy_idx = rdev->wiphy_idx;
+                rdev = NULL;
+                mutex_unlock(&cfg80211_mutex);
+
                 if (nl80211_fam.attrbuf[NL80211_ATTR_TESTDATA])
                         cb->args[1] =
                                 (long)nl80211_fam.attrbuf[NL80211_ATTR_TESTDATA];
@@ -6511,7 +6661,7 @@ static int nl80211_pre_doit(struct genl_ops *ops, struct sk_buff *skb,
                 rtnl_lock();
 
         if (ops->internal_flags & NL80211_FLAG_NEED_WIPHY) {
-                rdev = cfg80211_get_dev_from_info(info);
+                rdev = cfg80211_get_dev_from_info(genl_info_net(info), info);
                 if (IS_ERR(rdev)) {
                         if (rtnl)
                                 rtnl_unlock();