Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

170 files changed, 12074 insertions, 1974 deletions

diff --git a/drivers/net/wireless/ath/ar9170/cmd.c b/drivers/net/wireless/ath/ar9170/cmd.c
index 4604de09a8b..6452c5055a6 100644
--- a/drivers/net/wireless/ath/ar9170/cmd.c
+++ b/drivers/net/wireless/ath/ar9170/cmd.c
@@ -54,7 +54,7 @@ int ar9170_write_mem(struct ar9170 *ar, const __le32 *data, size_t len)
 
 int ar9170_write_reg(struct ar9170 *ar, const u32 reg, const u32 val)
 {
-        __le32 buf[2] = {
+        const __le32 buf[2] = {
                 cpu_to_le32(reg),
                 cpu_to_le32(val),
         };
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index 501050c0296..20ea68c59f7 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -104,6 +104,11 @@ enum ath_cipher {
         ATH_CIPHER_MIC = 127
 };
 
+enum ath_drv_info {
+        AR7010_DEVICE           = BIT(0),
+        AR9287_DEVICE           = BIT(1),
+};
+
 /**
  * struct ath_ops - Register read/write operations
  *
@@ -147,6 +152,7 @@ struct ath_common {
         u8 rx_chainmask;
 
         u32 rx_bufsize;
+        u32 driver_info;
 
         u32 keymax;
         DECLARE_BITMAP(keymap, ATH_KEYMAX);
diff --git a/drivers/net/wireless/ath/ath5k/Kconfig b/drivers/net/wireless/ath/ath5k/Kconfig
index eb83b7b4d0e..47844575caa 100644
--- a/drivers/net/wireless/ath/ath5k/Kconfig
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
@@ -4,6 +4,7 @@ config ATH5K
         select MAC80211_LEDS
         select LEDS_CLASS
         select NEW_LEDS
+        select AVERAGE
         ---help---
           This module adds support for wireless adapters based on
           Atheros 5xxx chipset.
diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c
index f1419198a47..6b75b22a929 100644
--- a/drivers/net/wireless/ath/ath5k/ani.c
+++ b/drivers/net/wireless/ath/ath5k/ani.c
@@ -63,15 +63,15 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level)
          * so i stick with the HAL version for now...
          */
 #if 0
-        const s8 hi[] = { -18, -18, -16, -14, -12 };
-        const s8 lo[] = { -52, -56, -60, -64, -70 };
-        const s8 sz[] = { -34, -41, -48, -55, -62 };
-        const s8 fr[] = { -70, -72, -75, -78, -80 };
+        static const s8 hi[] = { -18, -18, -16, -14, -12 };
+        static const s8 lo[] = { -52, -56, -60, -64, -70 };
+        static const s8 sz[] = { -34, -41, -48, -55, -62 };
+        static const s8 fr[] = { -70, -72, -75, -78, -80 };
 #else
-        const s8 sz[] = { -55, -62 };
-        const s8 lo[] = { -64, -70 };
-        const s8 hi[] = { -14, -12 };
-        const s8 fr[] = { -78, -80 };
+        static const s8 sz[] = { -55, -62 };
+        static const s8 lo[] = { -64, -70 };
+        static const s8 hi[] = { -14, -12 };
+        static const s8 fr[] = { -78, -80 };
 #endif
         if (level < 0 || level >= ARRAY_SIZE(sz)) {
                 ATH5K_ERR(ah->ah_sc, "noise immuniy level %d out of range",
@@ -102,7 +102,7 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level)
 void
 ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level)
 {
-        const int val[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
+        static const int val[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
 
         if (level < 0 || level >= ARRAY_SIZE(val) ||
             level > ah->ah_sc->ani_state.max_spur_level) {
@@ -127,7 +127,7 @@ ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level)
 void
 ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level)
 {
-        const int val[] = { 0, 4, 8 };
+        static const int val[] = { 0, 4, 8 };
 
         if (level < 0 || level >= ARRAY_SIZE(val)) {
                 ATH5K_ERR(ah->ah_sc, "firstep level %d out of range", level);
@@ -151,12 +151,12 @@ ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level)
 void
 ath5k_ani_set_ofdm_weak_signal_detection(struct ath5k_hw *ah, bool on)
 {
-        const int m1l[] = { 127, 50 };
-        const int m2l[] = { 127, 40 };
-        const int m1[] = { 127, 0x4d };
-        const int m2[] = { 127, 0x40 };
-        const int m2cnt[] = { 31, 16 };
-        const int m2lcnt[] = { 63, 48 };
+        static const int m1l[] = { 127, 50 };
+        static const int m2l[] = { 127, 40 };
+        static const int m1[] = { 127, 0x4d };
+        static const int m2[] = { 127, 0x40 };
+        static const int m2cnt[] = { 31, 16 };
+        static const int m2lcnt[] = { 63, 48 };
 
         AR5K_REG_WRITE_BITS(ah, AR5K_PHY_WEAK_OFDM_LOW_THR,
                                 AR5K_PHY_WEAK_OFDM_LOW_THR_M1, m1l[on]);
@@ -192,7 +192,7 @@ ath5k_ani_set_ofdm_weak_signal_detection(struct ath5k_hw *ah, bool on)
 void
 ath5k_ani_set_cck_weak_signal_detection(struct ath5k_hw *ah, bool on)
 {
-        const int val[] = { 8, 6 };
+        static const int val[] = { 8, 6 };
         AR5K_REG_WRITE_BITS(ah, AR5K_PHY_CCK_CROSSCORR,
                                 AR5K_PHY_CCK_CROSSCORR_WEAK_SIG_THR, val[on]);
         ah->ah_sc->ani_state.cck_weak_sig = on;
@@ -216,7 +216,7 @@ static void
 ath5k_ani_raise_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as,
                          bool ofdm_trigger)
 {
-        int rssi = ah->ah_beacon_rssi_avg.avg;
+        int rssi = ewma_read(&ah->ah_beacon_rssi_avg);
 
         ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI, "raise immunity (%s)",
                 ofdm_trigger ? "ODFM" : "CCK");
@@ -301,7 +301,7 @@ ath5k_ani_raise_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as,
 static void
 ath5k_ani_lower_immunity(struct ath5k_hw *ah, struct ath5k_ani_state *as)
 {
-        int rssi = ah->ah_beacon_rssi_avg.avg;
+        int rssi = ewma_read(&ah->ah_beacon_rssi_avg);
 
         ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI, "lower immunity");
 
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index 308b79e1ff0..2718136e488 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -25,6 +25,7 @@
 
 #include <linux/io.h>
 #include <linux/types.h>
+#include <linux/average.h>
 #include <net/mac80211.h>
 
 /* RX/TX descriptor hw structs
@@ -1102,7 +1103,7 @@ struct ath5k_hw {
         struct ath5k_nfcal_hist ah_nfcal_hist;
 
         /* average beacon RSSI in our BSS (used by ANI) */
-        struct ath5k_avg_val    ah_beacon_rssi_avg;
+        struct ewma             ah_beacon_rssi_avg;
 
         /* noise floor from last periodic calibration */
         s32                     ah_noise_floor;
@@ -1315,27 +1316,4 @@ static inline u32 ath5k_hw_bitswap(u32 val, unsigned int bits)
         return retval;
 }
 
-#define AVG_SAMPLES     8
-#define AVG_FACTOR      1000
-
-/**
- * ath5k_moving_average -  Exponentially weighted moving average
- * @avg: average structure
- * @val: current value
- *
- * This implementation make use of a struct ath5k_avg_val to prevent rounding
- * errors.
- */
-static inline struct ath5k_avg_val
-ath5k_moving_average(const struct ath5k_avg_val avg, const int val)
-{
-        struct ath5k_avg_val new;
-        new.avg_weight = avg.avg_weight  ?
-                (((avg.avg_weight * ((AVG_SAMPLES) - 1)) +
-                        (val * (AVG_FACTOR))) / (AVG_SAMPLES)) :
-                (val * (AVG_FACTOR));
-        new.avg = new.avg_weight / (AVG_FACTOR);
-        return new;
-}
-
 #endif
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index b9f93fbd972..7f783d9462a 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -549,7 +549,7 @@ static void ath_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
         /* Calculate combined mode - when APs are active, operate in AP mode.
          * Otherwise use the mode of the new interface. This can currently
          * only deal with combinations of APs and STAs. Only one ad-hoc
-         * interfaces is allowed above.
+         * interfaces is allowed.
          */
         if (avf->opmode == NL80211_IFTYPE_AP)
                 iter_data->opmode = NL80211_IFTYPE_AP;
@@ -558,14 +558,6 @@ static void ath_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
                         iter_data->opmode = avf->opmode;
 }
 
-static void ath_do_set_opmode(struct ath5k_softc *sc)
-{
-        struct ath5k_hw *ah = sc->ah;
-        ath5k_hw_set_opmode(ah, sc->opmode);
-        ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "mode setup opmode %d (%s)\n",
-                  sc->opmode, ath_opmode_to_string(sc->opmode));
-}
-
 static void ath5k_update_bssid_mask_and_opmode(struct ath5k_softc *sc,
                                                struct ieee80211_vif *vif)
 {
@@ -595,7 +587,9 @@ static void ath5k_update_bssid_mask_and_opmode(struct ath5k_softc *sc,
                 /* Nothing active, default to station mode */
                 sc->opmode = NL80211_IFTYPE_STATION;
 
-        ath_do_set_opmode(sc);
+        ath5k_hw_set_opmode(sc->ah, sc->opmode);
+        ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "mode setup opmode %d (%s)\n",
+                  sc->opmode, ath_opmode_to_string(sc->opmode));
 
         if (iter_data.need_set_hw_addr && iter_data.found_active)
                 ath5k_hw_set_lladdr(sc->ah, iter_data.active_mac);
@@ -1307,8 +1301,7 @@ ath5k_update_beacon_rssi(struct ath5k_softc *sc, struct sk_buff *skb, int rssi)
             memcmp(mgmt->bssid, common->curbssid, ETH_ALEN) != 0)
                 return;
 
-        ah->ah_beacon_rssi_avg = ath5k_moving_average(ah->ah_beacon_rssi_avg,
-                                                      rssi);
+        ewma_add(&ah->ah_beacon_rssi_avg, rssi);
 
         /* in IBSS mode we should keep RSSI statistics per neighbour */
         /* le16_to_cpu(mgmt->u.beacon.capab_info) & WLAN_CAPABILITY_IBSS */
@@ -2562,6 +2555,7 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan)
         ah->ah_cal_next_full = jiffies;
         ah->ah_cal_next_ani = jiffies;
         ah->ah_cal_next_nf = jiffies;
+        ewma_init(&ah->ah_beacon_rssi_avg, 1000, 8);
 
         /*
          * Change channels and update the h/w rate map if we're switching;
@@ -3413,6 +3407,36 @@ static int ath5k_conf_tx(struct ieee80211_hw *hw, u16 queue,
         return ret;
 }
 
+static int ath5k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
+{
+        struct ath5k_softc *sc = hw->priv;
+
+        if (tx_ant == 1 && rx_ant == 1)
+                ath5k_hw_set_antenna_mode(sc->ah, AR5K_ANTMODE_FIXED_A);
+        else if (tx_ant == 2 && rx_ant == 2)
+                ath5k_hw_set_antenna_mode(sc->ah, AR5K_ANTMODE_FIXED_B);
+        else if ((tx_ant & 3) == 3 && (rx_ant & 3) == 3)
+                ath5k_hw_set_antenna_mode(sc->ah, AR5K_ANTMODE_DEFAULT);
+        else
+                return -EINVAL;
+        return 0;
+}
+
+static int ath5k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)
+{
+        struct ath5k_softc *sc = hw->priv;
+
+        switch (sc->ah->ah_ant_mode) {
+        case AR5K_ANTMODE_FIXED_A:
+                *tx_ant = 1; *rx_ant = 1; break;
+        case AR5K_ANTMODE_FIXED_B:
+                *tx_ant = 2; *rx_ant = 2; break;
+        case AR5K_ANTMODE_DEFAULT:
+                *tx_ant = 3; *rx_ant = 3; break;
+        }
+        return 0;
+}
+
 static const struct ieee80211_ops ath5k_hw_ops = {
         .tx             = ath5k_tx,
         .start          = ath5k_start,
@@ -3433,6 +3457,8 @@ static const struct ieee80211_ops ath5k_hw_ops = {
         .sw_scan_start  = ath5k_sw_scan_start,
         .sw_scan_complete = ath5k_sw_scan_complete,
         .set_coverage_class = ath5k_set_coverage_class,
+        .set_antenna    = ath5k_set_antenna,
+        .get_antenna    = ath5k_get_antenna,
 };
 
 /********************\
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
index 54dcf77e964..7d785cb60ce 100644
--- a/drivers/net/wireless/ath/ath5k/debug.c
+++ b/drivers/net/wireless/ath/ath5k/debug.c
@@ -719,7 +719,7 @@ static ssize_t read_file_ani(struct file *file, char __user *user_buf,
                         st->mib_intr);
         len += snprintf(buf+len, sizeof(buf)-len,
                         "beacon RSSI average:\t%d\n",
-                        sc->ah->ah_beacon_rssi_avg.avg);
+                        (int)ewma_read(&sc->ah->ah_beacon_rssi_avg));
 
 #define CC_PRINT(_struct, _field) \
         _struct._field, \
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 63ccb39cdcd..29a045da184 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -834,10 +834,10 @@ void ath9k_hw_ani_setup(struct ath_hw *ah)
 {
         int i;
 
-        const int totalSizeDesired[] = { -55, -55, -55, -55, -62 };
-        const int coarseHigh[] = { -14, -14, -14, -14, -12 };
-        const int coarseLow[] = { -64, -64, -64, -64, -70 };
-        const int firpwr[] = { -78, -78, -78, -78, -80 };
+        static const int totalSizeDesired[] = { -55, -55, -55, -55, -62 };
+        static const int coarseHigh[] = { -14, -14, -14, -14, -12 };
+        static const int coarseLow[] = { -64, -64, -64, -64, -70 };
+        static const int firpwr[] = { -78, -78, -78, -78, -80 };
 
         for (i = 0; i < 5; i++) {
                 ah->totalSizeDesired[i] = totalSizeDesired[i];
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index c83a22cfbe1..06e34d293dc 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -244,13 +244,15 @@ static void ar5008_hw_spur_mitigate(struct ath_hw *ah,
         int upper, lower, cur_vit_mask;
         int tmp, new;
         int i;
-        int pilot_mask_reg[4] = { AR_PHY_TIMING7, AR_PHY_TIMING8,
-                          AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
+        static int pilot_mask_reg[4] = {
+                AR_PHY_TIMING7, AR_PHY_TIMING8,
+                AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
         };
-        int chan_mask_reg[4] = { AR_PHY_TIMING9, AR_PHY_TIMING10,
-                         AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
+        static int chan_mask_reg[4] = {
+                AR_PHY_TIMING9, AR_PHY_TIMING10,
+                AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
         };
-        int inc[4] = { 0, 100, 0, 0 };
+        static int inc[4] = { 0, 100, 0, 0 };
 
         int8_t mask_m[123];
         int8_t mask_p[123];
@@ -1084,12 +1086,12 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
                 break;
         }
         case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
-                const int m1ThreshLow[] = { 127, 50 };
-                const int m2ThreshLow[] = { 127, 40 };
-                const int m1Thresh[] = { 127, 0x4d };
-                const int m2Thresh[] = { 127, 0x40 };
-                const int m2CountThr[] = { 31, 16 };
-                const int m2CountThrLow[] = { 63, 48 };
+                static const int m1ThreshLow[] = { 127, 50 };
+                static const int m2ThreshLow[] = { 127, 40 };
+                static const int m1Thresh[] = { 127, 0x4d };
+                static const int m2Thresh[] = { 127, 0x40 };
+                static const int m2CountThr[] = { 31, 16 };
+                static const int m2CountThrLow[] = { 63, 48 };
                 u32 on = param ? 1 : 0;
 
                 REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
@@ -1141,7 +1143,7 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
                 break;
         }
         case ATH9K_ANI_CCK_WEAK_SIGNAL_THR:{
-                const int weakSigThrCck[] = { 8, 6 };
+                static const int weakSigThrCck[] = { 8, 6 };
                 u32 high = param ? 1 : 0;
 
                 REG_RMW_FIELD(ah, AR_PHY_CCK_DETECT,
@@ -1157,7 +1159,7 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
                 break;
         }
         case ATH9K_ANI_FIRSTEP_LEVEL:{
-                const int firstep[] = { 0, 4, 8 };
+                static const int firstep[] = { 0, 4, 8 };
                 u32 level = param;
 
                 if (level >= ARRAY_SIZE(firstep)) {
@@ -1178,7 +1180,7 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
                 break;
         }
         case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{
-                const int cycpwrThr1[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
+                static const int cycpwrThr1[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
                 u32 level = param;
 
                 if (level >= ARRAY_SIZE(cycpwrThr1)) {
@@ -1579,10 +1581,55 @@ static void ar5008_hw_set_nf_limits(struct ath_hw *ah)
         ah->nf_5g.nominal = AR_PHY_CCA_NOM_VAL_5416_5GHZ;
 }
 
+static void ar5008_hw_set_radar_params(struct ath_hw *ah,
+                                       struct ath_hw_radar_conf *conf)
+{
+        u32 radar_0 = 0, radar_1 = 0;
+
+        if (!conf) {
+                REG_CLR_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_ENA);
+                return;
+        }
+
+        radar_0 |= AR_PHY_RADAR_0_ENA | AR_PHY_RADAR_0_FFT_ENA;
+        radar_0 |= SM(conf->fir_power, AR_PHY_RADAR_0_FIRPWR);
+        radar_0 |= SM(conf->radar_rssi, AR_PHY_RADAR_0_RRSSI);
+        radar_0 |= SM(conf->pulse_height, AR_PHY_RADAR_0_HEIGHT);
+        radar_0 |= SM(conf->pulse_rssi, AR_PHY_RADAR_0_PRSSI);
+        radar_0 |= SM(conf->pulse_inband, AR_PHY_RADAR_0_INBAND);
+
+        radar_1 |= AR_PHY_RADAR_1_MAX_RRSSI;
+        radar_1 |= AR_PHY_RADAR_1_BLOCK_CHECK;
+        radar_1 |= SM(conf->pulse_maxlen, AR_PHY_RADAR_1_MAXLEN);
+        radar_1 |= SM(conf->pulse_inband_step, AR_PHY_RADAR_1_RELSTEP_THRESH);
+        radar_1 |= SM(conf->radar_inband, AR_PHY_RADAR_1_RELPWR_THRESH);
+
+        REG_WRITE(ah, AR_PHY_RADAR_0, radar_0);
+        REG_WRITE(ah, AR_PHY_RADAR_1, radar_1);
+        if (conf->ext_channel)
+                REG_SET_BIT(ah, AR_PHY_RADAR_EXT, AR_PHY_RADAR_EXT_ENA);
+        else
+                REG_CLR_BIT(ah, AR_PHY_RADAR_EXT, AR_PHY_RADAR_EXT_ENA);
+}
+
+static void ar5008_hw_set_radar_conf(struct ath_hw *ah)
+{
+        struct ath_hw_radar_conf *conf = &ah->radar_conf;
+
+        conf->fir_power = -33;
+        conf->radar_rssi = 20;
+        conf->pulse_height = 10;
+        conf->pulse_rssi = 24;
+        conf->pulse_inband = 15;
+        conf->pulse_maxlen = 255;
+        conf->pulse_inband_step = 12;
+        conf->radar_inband = 8;
+}
+
 void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
 {
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
-        const u32 ar5416_cca_regs[6] = {
+        static const u32 ar5416_cca_regs[6] = {
                 AR_PHY_CCA,
                 AR_PHY_CH1_CCA,
                 AR_PHY_CH2_CCA,
@@ -1609,6 +1656,7 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
         priv_ops->restore_chainmask = ar5008_restore_chainmask;
         priv_ops->set_diversity = ar5008_set_diversity;
         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;
@@ -1624,5 +1672,6 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
                 priv_ops->compute_pll_control = ar5008_hw_compute_pll_control;
 
         ar5008_hw_set_nf_limits(ah);
+        ar5008_hw_set_radar_conf(ah);
         memcpy(ah->nf_regs, ar5416_cca_regs, sizeof(ah->nf_regs));
 }
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.c b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
index 3fb97fdc124..7ae66a889f5 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
@@ -175,13 +175,15 @@ static void ar9002_hw_spur_mitigate(struct ath_hw *ah,
         int upper, lower, cur_vit_mask;
         int tmp, newVal;
         int i;
-        int pilot_mask_reg[4] = { AR_PHY_TIMING7, AR_PHY_TIMING8,
-                          AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
+        static const int pilot_mask_reg[4] = {
+                AR_PHY_TIMING7, AR_PHY_TIMING8,
+                AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
         };
-        int chan_mask_reg[4] = { AR_PHY_TIMING9, AR_PHY_TIMING10,
-                         AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
+        static const int chan_mask_reg[4] = {
+                AR_PHY_TIMING9, AR_PHY_TIMING10,
+                AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
         };
-        int inc[4] = { 0, 100, 0, 0 };
+        static const int inc[4] = { 0, 100, 0, 0 };
         struct chan_centers centers;
 
         int8_t mask_m[123];
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 9e6edffe0bd..4c94c9ed5f8 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -196,7 +196,7 @@ static void ar9003_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)
         u32 qCoffDenom, iCoffDenom;
         int32_t qCoff, iCoff;
         int iqCorrNeg, i;
-        const u_int32_t offset_array[3] = {
+        static const u_int32_t offset_array[3] = {
                 AR_PHY_RX_IQCAL_CORR_B0,
                 AR_PHY_RX_IQCAL_CORR_B1,
                 AR_PHY_RX_IQCAL_CORR_B2,
@@ -603,22 +603,22 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,
 static void ar9003_hw_tx_iq_cal(struct ath_hw *ah)
 {
         struct ath_common *common = ath9k_hw_common(ah);
-        const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
+        static const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
                 AR_PHY_TX_IQCAL_STATUS_B0,
                 AR_PHY_TX_IQCAL_STATUS_B1,
                 AR_PHY_TX_IQCAL_STATUS_B2,
         };
-        const u32 tx_corr_coeff[AR9300_MAX_CHAINS] = {
+        static const u32 tx_corr_coeff[AR9300_MAX_CHAINS] = {
                 AR_PHY_TX_IQCAL_CORR_COEFF_01_B0,
                 AR_PHY_TX_IQCAL_CORR_COEFF_01_B1,
                 AR_PHY_TX_IQCAL_CORR_COEFF_01_B2,
         };
-        const u32 rx_corr[AR9300_MAX_CHAINS] = {
+        static const u32 rx_corr[AR9300_MAX_CHAINS] = {
                 AR_PHY_RX_IQCAL_CORR_B0,
                 AR_PHY_RX_IQCAL_CORR_B1,
                 AR_PHY_RX_IQCAL_CORR_B2,
         };
-        const u_int32_t chan_info_tab[] = {
+        static const u_int32_t chan_info_tab[] = {
                 AR_PHY_CHAN_INFO_TAB_0,
                 AR_PHY_CHAN_INFO_TAB_1,
                 AR_PHY_CHAN_INFO_TAB_2,
@@ -718,12 +718,19 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
                                struct ath9k_channel *chan)
 {
         struct ath_common *common = ath9k_hw_common(ah);
+        int val;
 
-        /*
-         * 0x7 = 0b111 , AR9003 needs to be configured for 3-chain mode before
-         * running AGC/TxIQ cals
-         */
-        ar9003_hw_set_chain_masks(ah, 0x7, 0x7);
+        val = REG_READ(ah, AR_ENT_OTP);
+        ath_print(common, ATH_DBG_CALIBRATE, "ath9k: AR_ENT_OTP 0x%x\n", val);
+
+        if (val & AR_ENT_OTP_CHAIN2_DISABLE)
+                ar9003_hw_set_chain_masks(ah, 0x3, 0x3);
+        else
+                /*
+                 * 0x7 = 0b111 , AR9003 needs to be configured for 3-chain
+                 * mode before running AGC/TxIQ cals
+                 */
+                ar9003_hw_set_chain_masks(ah, 0x7, 0x7);
 
         /* Do Tx IQ Calibration */
         ar9003_hw_tx_iq_cal(ah);
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index a88fe0d6142..3161a5901a7 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -22,12 +22,14 @@
 #define COMP_CKSUM_LEN 2
 
 #define AR_CH0_TOP (0x00016288)
-#define AR_CH0_TOP_XPABIASLVL (0x3)
+#define AR_CH0_TOP_XPABIASLVL (0x300)
 #define AR_CH0_TOP_XPABIASLVL_S (8)
 
 #define AR_CH0_THERM (0x00016290)
-#define AR_CH0_THERM_SPARE (0x3f)
-#define AR_CH0_THERM_SPARE_S (0)
+#define AR_CH0_THERM_XPABIASLVL_MSB 0x3
+#define AR_CH0_THERM_XPABIASLVL_MSB_S 0
+#define AR_CH0_THERM_XPASHORT2GND 0x4
+#define AR_CH0_THERM_XPASHORT2GND_S 2
 
 #define AR_SWITCH_TABLE_COM_ALL (0xffff)
 #define AR_SWITCH_TABLE_COM_ALL_S (0)
@@ -55,6 +57,8 @@
 #define SUB_NUM_CTL_MODES_AT_5G_40 2    /* excluding HT40, EXT-OFDM */
 #define SUB_NUM_CTL_MODES_AT_2G_40 3    /* excluding HT40, EXT-OFDM, EXT-CCK */
 
+static int ar9003_hw_power_interpolate(int32_t x,
+                                       int32_t *px, int32_t *py, u_int16_t np);
 static const struct ar9300_eeprom ar9300_default = {
         .eepromVersion = 2,
         .templateVersion = 2,
@@ -144,13 +148,16 @@ static const struct ar9300_eeprom ar9300_default = {
                 .txEndToRxOn = 0x2,
                 .txFrameToXpaOn = 0xe,
                 .thresh62 = 28,
-                .papdRateMaskHt20 = LE32(0x80c080),
-                .papdRateMaskHt40 = LE32(0x80c080),
+                .papdRateMaskHt20 = LE32(0x0cf0e0e0),
+                .papdRateMaskHt40 = LE32(0x6cf0e0e0),
                 .futureModal = {
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 },
          },
+        .base_ext1 = {
+                .ant_div_control = 0,
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+        },
         .calFreqPier2G = {
                 FREQ2FBIN(2412, 1),
                 FREQ2FBIN(2437, 1),
@@ -285,8 +292,7 @@ static const struct ar9300_eeprom ar9300_default = {
                         /* Data[11].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
                         /* Data[11].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
                         /* Data[11].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
-                        /* Data[11].ctlEdges[3].bChannel */
-                        FREQ2FBIN(2462, 1),
+                        /* Data[11].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
                 }
          },
         .ctlPowerData_2G = {
@@ -304,6 +310,7 @@ static const struct ar9300_eeprom ar9300_default = {
 
                  { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
                  { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+                 { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
          },
         .modalHeader5G = {
                 /* 4 idle,t1,t2,b (4 bits per setting) */
@@ -343,13 +350,20 @@ static const struct ar9300_eeprom ar9300_default = {
                 .txEndToRxOn = 0x2,
                 .txFrameToXpaOn = 0xe,
                 .thresh62 = 28,
-                .papdRateMaskHt20 = LE32(0xf0e0e0),
-                .papdRateMaskHt40 = LE32(0xf0e0e0),
+                .papdRateMaskHt20 = LE32(0x0c80c080),
+                .papdRateMaskHt40 = LE32(0x0080c080),
                 .futureModal = {
-                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                        0, 0, 0, 0, 0, 0, 0, 0
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 },
          },
+        .base_ext2 = {
+                .tempSlopeLow = 0,
+                .tempSlopeHigh = 0,
+                .xatten1DBLow = {0, 0, 0},
+                .xatten1MarginLow = {0, 0, 0},
+                .xatten1DBHigh = {0, 0, 0},
+                .xatten1MarginHigh = {0, 0, 0}
+        },
         .calFreqPier5G = {
                 FREQ2FBIN(5180, 0),
                 FREQ2FBIN(5220, 0),
@@ -623,6 +637,2338 @@ static const struct ar9300_eeprom ar9300_default = {
          }
 };
 
+static const struct ar9300_eeprom ar9300_x113 = {
+        .eepromVersion = 2,
+        .templateVersion = 6,
+        .macAddr = {0x00, 0x03, 0x7f, 0x0, 0x0, 0x0},
+        .custData = {"x113-023-f0000"},
+        .baseEepHeader = {
+                .regDmn = { LE16(0), LE16(0x1f) },
+                .txrxMask =  0x77, /* 4 bits tx and 4 bits rx */
+                .opCapFlags = {
+                        .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A,
+                        .eepMisc = 0,
+                },
+                .rfSilent = 0,
+                .blueToothOptions = 0,
+                .deviceCap = 0,
+                .deviceType = 5, /* takes lower byte in eeprom location */
+                .pwrTableOffset = AR9300_PWR_TABLE_OFFSET,
+                .params_for_tuning_caps = {0, 0},
+                .featureEnable = 0x0d,
+                 /*
+                  * bit0 - enable tx temp comp - disabled
+                  * bit1 - enable tx volt comp - disabled
+                  * bit2 - enable fastClock - enabled
+                  * bit3 - enable doubling - enabled
+                  * bit4 - enable internal regulator - disabled
+                  * bit5 - enable pa predistortion - disabled
+                  */
+                .miscConfiguration = 0, /* bit0 - turn down drivestrength */
+                .eepromWriteEnableGpio = 6,
+                .wlanDisableGpio = 0,
+                .wlanLedGpio = 8,
+                .rxBandSelectGpio = 0xff,
+                .txrxgain = 0x21,
+                .swreg = 0,
+         },
+        .modalHeader2G = {
+        /* ar9300_modal_eep_header  2g */
+                /* 4 idle,t1,t2,b(4 bits per setting) */
+                .antCtrlCommon = LE32(0x110),
+                /* 4 ra1l1, ra2l1, ra1l2, ra2l2, ra12 */
+                .antCtrlCommon2 = LE32(0x44444),
+
+                /*
+                 * antCtrlChain[AR9300_MAX_CHAINS]; 6 idle, t, r,
+                 * rx1, rx12, b (2 bits each)
+                 */
+                .antCtrlChain = { LE16(0x150), LE16(0x150), LE16(0x150) },
+
+                /*
+                 * xatten1DB[AR9300_MAX_CHAINS];  3 xatten1_db
+                 * for ar9280 (0xa20c/b20c 5:0)
+                 */
+                .xatten1DB = {0, 0, 0},
+
+                /*
+                 * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
+                 * for ar9280 (0xa20c/b20c 16:12
+                 */
+                .xatten1Margin = {0, 0, 0},
+                .tempSlope = 25,
+                .voltSlope = 0,
+
+                /*
+                 * spurChans[OSPREY_EEPROM_MODAL_SPURS]; spur
+                 * channels in usual fbin coding format
+                 */
+                .spurChans = {FREQ2FBIN(2464, 1), 0, 0, 0, 0},
+
+                /*
+                 * noiseFloorThreshCh[AR9300_MAX_CHAINS]; 3 Check
+                 * if the register is per chain
+                 */
+                .noiseFloorThreshCh = {-1, 0, 0},
+                .ob = {1, 1, 1},/* 3 chain */
+                .db_stage2 = {1, 1, 1}, /* 3 chain  */
+                .db_stage3 = {0, 0, 0},
+                .db_stage4 = {0, 0, 0},
+                .xpaBiasLvl = 0,
+                .txFrameToDataStart = 0x0e,
+                .txFrameToPaOn = 0x0e,
+                .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
+                .antennaGain = 0,
+                .switchSettling = 0x2c,
+                .adcDesiredSize = -30,
+                .txEndToXpaOff = 0,
+                .txEndToRxOn = 0x2,
+                .txFrameToXpaOn = 0xe,
+                .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0x0c80c080),
+                .papdRateMaskHt40 = LE32(0x0080c080),
+                .futureModal = {
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                },
+         },
+         .base_ext1 = {
+                .ant_div_control = 0,
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+         },
+        .calFreqPier2G = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1),
+         },
+        /* ar9300_cal_data_per_freq_op_loop 2g */
+        .calPierData2G = {
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+         },
+        .calTarget_freqbin_Cck = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2472, 1),
+         },
+        .calTarget_freqbin_2G = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+         },
+        .calTarget_freqbin_2GHT20 = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+         },
+        .calTarget_freqbin_2GHT40 = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+         },
+        .calTargetPowerCck = {
+                 /* 1L-5L,5S,11L,11S */
+                 { {34, 34, 34, 34} },
+                 { {34, 34, 34, 34} },
+        },
+        .calTargetPower2G = {
+                 /* 6-24,36,48,54 */
+                 { {34, 34, 32, 32} },
+                 { {34, 34, 32, 32} },
+                 { {34, 34, 32, 32} },
+        },
+        .calTargetPower2GHT20 = {
+                { {32, 32, 32, 32, 32, 28, 32, 32, 30, 28, 0, 0, 0, 0} },
+                { {32, 32, 32, 32, 32, 28, 32, 32, 30, 28, 0, 0, 0, 0} },
+                { {32, 32, 32, 32, 32, 28, 32, 32, 30, 28, 0, 0, 0, 0} },
+        },
+        .calTargetPower2GHT40 = {
+                { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 0, 0, 0, 0} },
+                { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 0, 0, 0, 0} },
+                { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 0, 0, 0, 0} },
+        },
+        .ctlIndex_2G =  {
+                0x11, 0x12, 0x15, 0x17, 0x41, 0x42,
+                0x45, 0x47, 0x31, 0x32, 0x35, 0x37,
+        },
+        .ctl_freqbin_2G = {
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2457, 1),
+                        FREQ2FBIN(2462, 1)
+                },
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2462, 1),
+                        0xFF,
+                },
+
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2462, 1),
+                        0xFF,
+                },
+                {
+                        FREQ2FBIN(2422, 1),
+                        FREQ2FBIN(2427, 1),
+                        FREQ2FBIN(2447, 1),
+                        FREQ2FBIN(2452, 1)
+                },
+
+                {
+                        /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(2484, 1),
+                },
+
+                {
+                        /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        0,
+                },
+
+                {
+                        /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2472, 1),
+                        0,
+                },
+
+                {
+                        /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
+                        /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
+                        /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
+                        /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
+                },
+
+                {
+                        /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                },
+
+                {
+                        /* Data[9].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[9].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[9].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        0
+                },
+
+                {
+                        /* Data[10].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[10].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[10].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        0
+                },
+
+                {
+                        /* Data[11].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
+                        /* Data[11].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
+                        /* Data[11].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
+                        /* Data[11].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
+                }
+         },
+        .ctlPowerData_2G = {
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
+
+                 { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+
+                 { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+                 { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+         },
+        .modalHeader5G = {
+                /* 4 idle,t1,t2,b (4 bits per setting) */
+                .antCtrlCommon = LE32(0x220),
+                /* 4 ra1l1, ra2l1, ra1l2,ra2l2,ra12 */
+                .antCtrlCommon2 = LE32(0x11111),
+                 /* antCtrlChain 6 idle, t,r,rx1,rx12,b (2 bits each) */
+                .antCtrlChain = {
+                        LE16(0x150), LE16(0x150), LE16(0x150),
+                },
+                 /* xatten1DB 3 xatten1_db for AR9280 (0xa20c/b20c 5:0) */
+                .xatten1DB = {0, 0, 0},
+
+                /*
+                 * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
+                 * for merlin (0xa20c/b20c 16:12
+                 */
+                .xatten1Margin = {0, 0, 0},
+                .tempSlope = 68,
+                .voltSlope = 0,
+                /* spurChans spur channels in usual fbin coding format */
+                .spurChans = {FREQ2FBIN(5500, 0), 0, 0, 0, 0},
+                /* noiseFloorThreshCh Check if the register is per chain */
+                .noiseFloorThreshCh = {-1, 0, 0},
+                .ob = {3, 3, 3}, /* 3 chain */
+                .db_stage2 = {3, 3, 3}, /* 3 chain */
+                .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
+                .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
+                .xpaBiasLvl = 0,
+                .txFrameToDataStart = 0x0e,
+                .txFrameToPaOn = 0x0e,
+                .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
+                .antennaGain = 0,
+                .switchSettling = 0x2d,
+                .adcDesiredSize = -30,
+                .txEndToXpaOff = 0,
+                .txEndToRxOn = 0x2,
+                .txFrameToXpaOn = 0xe,
+                .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0x0cf0e0e0),
+                .papdRateMaskHt40 = LE32(0x6cf0e0e0),
+                .futureModal = {
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                },
+         },
+        .base_ext2 = {
+                .tempSlopeLow = 72,
+                .tempSlopeHigh = 105,
+                .xatten1DBLow = {0, 0, 0},
+                .xatten1MarginLow = {0, 0, 0},
+                .xatten1DBHigh = {0, 0, 0},
+                .xatten1MarginHigh = {0, 0, 0}
+         },
+        .calFreqPier5G = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5240, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5745, 0),
+                FREQ2FBIN(5785, 0)
+        },
+        .calPierData5G = {
+                        {
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                        },
+                        {
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                        },
+                        {
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                        },
+
+        },
+        .calTarget_freqbin_5G = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5220, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5745, 0),
+                FREQ2FBIN(5785, 0)
+        },
+        .calTarget_freqbin_5GHT20 = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5240, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5745, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calTarget_freqbin_5GHT40 = {
+                FREQ2FBIN(5190, 0),
+                FREQ2FBIN(5230, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5410, 0),
+                FREQ2FBIN(5510, 0),
+                FREQ2FBIN(5670, 0),
+                FREQ2FBIN(5755, 0),
+                FREQ2FBIN(5825, 0)
+         },
+        .calTargetPower5G = {
+                /* 6-24,36,48,54 */
+                { {42, 40, 40, 34} },
+                { {42, 40, 40, 34} },
+                { {42, 40, 40, 34} },
+                { {42, 40, 40, 34} },
+                { {42, 40, 40, 34} },
+                { {42, 40, 40, 34} },
+                { {42, 40, 40, 34} },
+                { {42, 40, 40, 34} },
+         },
+        .calTargetPower5GHT20 = {
+                /*
+                 * 0_8_16,1-3_9-11_17-19,
+                 * 4,5,6,7,12,13,14,15,20,21,22,23
+                 */
+                { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
+                { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
+                { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
+                { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
+                { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
+                { {40, 40, 40, 40, 32, 28, 40, 40, 32, 28, 40, 40, 32, 20} },
+                { {38, 38, 38, 38, 32, 28, 38, 38, 32, 28, 38, 38, 32, 26} },
+                { {36, 36, 36, 36, 32, 28, 36, 36, 32, 28, 36, 36, 32, 26} },
+         },
+        .calTargetPower5GHT40 =  {
+                /*
+                 * 0_8_16,1-3_9-11_17-19,
+                 * 4,5,6,7,12,13,14,15,20,21,22,23
+                 */
+                { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
+                { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
+                { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
+                { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
+                { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
+                { {40, 40, 40, 38, 30, 26, 40, 40, 30, 26, 40, 40, 30, 24} },
+                { {36, 36, 36, 36, 30, 26, 36, 36, 30, 26, 36, 36, 30, 24} },
+                { {34, 34, 34, 34, 30, 26, 34, 34, 30, 26, 34, 34, 30, 24} },
+         },
+        .ctlIndex_5G =  {
+                0x10, 0x16, 0x18, 0x40, 0x46,
+                0x48, 0x30, 0x36, 0x38
+        },
+        .ctl_freqbin_5G =  {
+                {
+                        /* Data[0].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[0].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[0].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
+                        /* Data[0].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[0].ctlEdges[4].bChannel */ FREQ2FBIN(5600, 0),
+                        /* Data[0].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[0].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
+                        /* Data[0].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
+                },
+                {
+                        /* Data[1].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[1].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[1].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
+                        /* Data[1].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[1].ctlEdges[4].bChannel */ FREQ2FBIN(5520, 0),
+                        /* Data[1].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[1].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
+                        /* Data[1].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
+                },
+
+                {
+                        /* Data[2].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
+                        /* Data[2].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
+                        /* Data[2].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
+                        /* Data[2].ctlEdges[3].bChannel */ FREQ2FBIN(5310, 0),
+                        /* Data[2].ctlEdges[4].bChannel */ FREQ2FBIN(5510, 0),
+                        /* Data[2].ctlEdges[5].bChannel */ FREQ2FBIN(5550, 0),
+                        /* Data[2].ctlEdges[6].bChannel */ FREQ2FBIN(5670, 0),
+                        /* Data[2].ctlEdges[7].bChannel */ FREQ2FBIN(5755, 0)
+                },
+
+                {
+                        /* Data[3].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[3].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
+                        /* Data[3].ctlEdges[2].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[3].ctlEdges[3].bChannel */ FREQ2FBIN(5320, 0),
+                        /* Data[3].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[3].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[3].ctlEdges[6].bChannel */ 0xFF,
+                        /* Data[3].ctlEdges[7].bChannel */ 0xFF,
+                },
+
+                {
+                        /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[4].ctlEdges[4].bChannel */ 0xFF,
+                        /* Data[4].ctlEdges[5].bChannel */ 0xFF,
+                        /* Data[4].ctlEdges[6].bChannel */ 0xFF,
+                        /* Data[4].ctlEdges[7].bChannel */ 0xFF,
+                },
+
+                {
+                        /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
+                        /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(5270, 0),
+                        /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(5310, 0),
+                        /* Data[5].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
+                        /* Data[5].ctlEdges[4].bChannel */ FREQ2FBIN(5590, 0),
+                        /* Data[5].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
+                        /* Data[5].ctlEdges[6].bChannel */ 0xFF,
+                        /* Data[5].ctlEdges[7].bChannel */ 0xFF
+                },
+
+                {
+                        /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
+                        /* Data[6].ctlEdges[2].bChannel */ FREQ2FBIN(5220, 0),
+                        /* Data[6].ctlEdges[3].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[6].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[6].ctlEdges[5].bChannel */ FREQ2FBIN(5600, 0),
+                        /* Data[6].ctlEdges[6].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[6].ctlEdges[7].bChannel */ FREQ2FBIN(5745, 0)
+                },
+
+                {
+                        /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(5320, 0),
+                        /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[7].ctlEdges[4].bChannel */ FREQ2FBIN(5560, 0),
+                        /* Data[7].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[7].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
+                        /* Data[7].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
+                },
+
+                {
+                        /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
+                        /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
+                        /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
+                        /* Data[8].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
+                        /* Data[8].ctlEdges[4].bChannel */ FREQ2FBIN(5550, 0),
+                        /* Data[8].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
+                        /* Data[8].ctlEdges[6].bChannel */ FREQ2FBIN(5755, 0),
+                        /* Data[8].ctlEdges[7].bChannel */ FREQ2FBIN(5795, 0)
+                }
+         },
+        .ctlPowerData_5G = {
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 0}, {60, 1}, {60, 0}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                        }
+                },
+                {
+                        {
+                                {60, 0}, {60, 1}, {60, 1}, {60, 0},
+                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                                {60, 0}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 0}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                        }
+                },
+         }
+};
+
+
+static const struct ar9300_eeprom ar9300_h112 = {
+        .eepromVersion = 2,
+        .templateVersion = 3,
+        .macAddr = {0x00, 0x03, 0x7f, 0x0, 0x0, 0x0},
+        .custData = {"h112-241-f0000"},
+        .baseEepHeader = {
+                .regDmn = { LE16(0), LE16(0x1f) },
+                .txrxMask =  0x77, /* 4 bits tx and 4 bits rx */
+                .opCapFlags = {
+                        .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A,
+                        .eepMisc = 0,
+                },
+                .rfSilent = 0,
+                .blueToothOptions = 0,
+                .deviceCap = 0,
+                .deviceType = 5, /* takes lower byte in eeprom location */
+                .pwrTableOffset = AR9300_PWR_TABLE_OFFSET,
+                .params_for_tuning_caps = {0, 0},
+                .featureEnable = 0x0d,
+                /*
+                 * bit0 - enable tx temp comp - disabled
+                 * bit1 - enable tx volt comp - disabled
+                 * bit2 - enable fastClock - enabled
+                 * bit3 - enable doubling - enabled
+                 * bit4 - enable internal regulator - disabled
+                 * bit5 - enable pa predistortion - disabled
+                 */
+                .miscConfiguration = 0, /* bit0 - turn down drivestrength */
+                .eepromWriteEnableGpio = 6,
+                .wlanDisableGpio = 0,
+                .wlanLedGpio = 8,
+                .rxBandSelectGpio = 0xff,
+                .txrxgain = 0x10,
+                .swreg = 0,
+        },
+        .modalHeader2G = {
+                /* ar9300_modal_eep_header  2g */
+                /* 4 idle,t1,t2,b(4 bits per setting) */
+                .antCtrlCommon = LE32(0x110),
+                /* 4 ra1l1, ra2l1, ra1l2, ra2l2, ra12 */
+                .antCtrlCommon2 = LE32(0x44444),
+
+                /*
+                 * antCtrlChain[AR9300_MAX_CHAINS]; 6 idle, t, r,
+                 * rx1, rx12, b (2 bits each)
+                 */
+                .antCtrlChain = { LE16(0x150), LE16(0x150), LE16(0x150) },
+
+                /*
+                 * xatten1DB[AR9300_MAX_CHAINS];  3 xatten1_db
+                 * for ar9280 (0xa20c/b20c 5:0)
+                 */
+                .xatten1DB = {0, 0, 0},
+
+                /*
+                 * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
+                 * for ar9280 (0xa20c/b20c 16:12
+                 */
+                .xatten1Margin = {0, 0, 0},
+                .tempSlope = 25,
+                .voltSlope = 0,
+
+                /*
+                 * spurChans[OSPREY_EEPROM_MODAL_SPURS]; spur
+                 * channels in usual fbin coding format
+                 */
+                .spurChans = {FREQ2FBIN(2464, 1), 0, 0, 0, 0},
+
+                /*
+                 * noiseFloorThreshCh[AR9300_MAX_CHAINS]; 3 Check
+                 * if the register is per chain
+                 */
+                .noiseFloorThreshCh = {-1, 0, 0},
+                .ob = {1, 1, 1},/* 3 chain */
+                .db_stage2 = {1, 1, 1}, /* 3 chain  */
+                .db_stage3 = {0, 0, 0},
+                .db_stage4 = {0, 0, 0},
+                .xpaBiasLvl = 0,
+                .txFrameToDataStart = 0x0e,
+                .txFrameToPaOn = 0x0e,
+                .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
+                .antennaGain = 0,
+                .switchSettling = 0x2c,
+                .adcDesiredSize = -30,
+                .txEndToXpaOff = 0,
+                .txEndToRxOn = 0x2,
+                .txFrameToXpaOn = 0xe,
+                .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0x80c080),
+                .papdRateMaskHt40 = LE32(0x80c080),
+                .futureModal = {
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                },
+        },
+        .base_ext1 = {
+                .ant_div_control = 0,
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+        },
+        .calFreqPier2G = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1),
+        },
+        /* ar9300_cal_data_per_freq_op_loop 2g */
+        .calPierData2G = {
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+        },
+        .calTarget_freqbin_Cck = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2484, 1),
+        },
+        .calTarget_freqbin_2G = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+        },
+        .calTarget_freqbin_2GHT20 = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+        },
+        .calTarget_freqbin_2GHT40 = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+        },
+        .calTargetPowerCck = {
+                /* 1L-5L,5S,11L,11S */
+                { {34, 34, 34, 34} },
+                { {34, 34, 34, 34} },
+        },
+        .calTargetPower2G = {
+                /* 6-24,36,48,54 */
+                { {34, 34, 32, 32} },
+                { {34, 34, 32, 32} },
+                { {34, 34, 32, 32} },
+        },
+        .calTargetPower2GHT20 = {
+                { {32, 32, 32, 32, 32, 30, 32, 32, 30, 28, 28, 28, 28, 24} },
+                { {32, 32, 32, 32, 32, 30, 32, 32, 30, 28, 28, 28, 28, 24} },
+                { {32, 32, 32, 32, 32, 30, 32, 32, 30, 28, 28, 28, 28, 24} },
+        },
+        .calTargetPower2GHT40 = {
+                { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 26, 26, 26, 22} },
+                { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 26, 26, 26, 22} },
+                { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 26, 26, 26, 22} },
+        },
+        .ctlIndex_2G =  {
+                0x11, 0x12, 0x15, 0x17, 0x41, 0x42,
+                0x45, 0x47, 0x31, 0x32, 0x35, 0x37,
+        },
+        .ctl_freqbin_2G = {
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2457, 1),
+                        FREQ2FBIN(2462, 1)
+                },
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2462, 1),
+                        0xFF,
+                },
+
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2462, 1),
+                        0xFF,
+                },
+                {
+                        FREQ2FBIN(2422, 1),
+                        FREQ2FBIN(2427, 1),
+                        FREQ2FBIN(2447, 1),
+                        FREQ2FBIN(2452, 1)
+                },
+
+                {
+                        /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(2484, 1),
+                },
+
+                {
+                        /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        0,
+                },
+
+                {
+                        /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2472, 1),
+                        0,
+                },
+
+                {
+                        /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
+                        /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
+                        /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
+                        /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
+                },
+
+                {
+                        /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                },
+
+                {
+                        /* Data[9].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[9].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[9].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        0
+                },
+
+                {
+                        /* Data[10].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[10].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[10].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        0
+                },
+
+                {
+                        /* Data[11].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
+                        /* Data[11].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
+                        /* Data[11].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
+                        /* Data[11].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
+                }
+        },
+        .ctlPowerData_2G = {
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
+
+                { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+
+                { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+                { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+        },
+        .modalHeader5G = {
+                /* 4 idle,t1,t2,b (4 bits per setting) */
+                .antCtrlCommon = LE32(0x220),
+                /* 4 ra1l1, ra2l1, ra1l2,ra2l2,ra12 */
+                .antCtrlCommon2 = LE32(0x44444),
+                /* antCtrlChain 6 idle, t,r,rx1,rx12,b (2 bits each) */
+                .antCtrlChain = {
+                        LE16(0x150), LE16(0x150), LE16(0x150),
+                },
+                /* xatten1DB 3 xatten1_db for AR9280 (0xa20c/b20c 5:0) */
+                .xatten1DB = {0, 0, 0},
+
+                /*
+                 * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
+                 * for merlin (0xa20c/b20c 16:12
+                 */
+                .xatten1Margin = {0, 0, 0},
+                .tempSlope = 45,
+                .voltSlope = 0,
+                /* spurChans spur channels in usual fbin coding format */
+                .spurChans = {0, 0, 0, 0, 0},
+                /* noiseFloorThreshCh Check if the register is per chain */
+                .noiseFloorThreshCh = {-1, 0, 0},
+                .ob = {3, 3, 3}, /* 3 chain */
+                .db_stage2 = {3, 3, 3}, /* 3 chain */
+                .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
+                .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
+                .xpaBiasLvl = 0,
+                .txFrameToDataStart = 0x0e,
+                .txFrameToPaOn = 0x0e,
+                .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
+                .antennaGain = 0,
+                .switchSettling = 0x2d,
+                .adcDesiredSize = -30,
+                .txEndToXpaOff = 0,
+                .txEndToRxOn = 0x2,
+                .txFrameToXpaOn = 0xe,
+                .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0x0cf0e0e0),
+                .papdRateMaskHt40 = LE32(0x6cf0e0e0),
+                .futureModal = {
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                },
+        },
+        .base_ext2 = {
+                .tempSlopeLow = 40,
+                .tempSlopeHigh = 50,
+                .xatten1DBLow = {0, 0, 0},
+                .xatten1MarginLow = {0, 0, 0},
+                .xatten1DBHigh = {0, 0, 0},
+                .xatten1MarginHigh = {0, 0, 0}
+        },
+        .calFreqPier5G = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5220, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calPierData5G = {
+                {
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                },
+                {
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                },
+                {
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                },
+
+        },
+        .calTarget_freqbin_5G = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5240, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calTarget_freqbin_5GHT20 = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5240, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5745, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calTarget_freqbin_5GHT40 = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5240, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5745, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calTargetPower5G = {
+                /* 6-24,36,48,54 */
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+        },
+        .calTargetPower5GHT20 = {
+                /*
+                 * 0_8_16,1-3_9-11_17-19,
+                 * 4,5,6,7,12,13,14,15,20,21,22,23
+                 */
+                { {30, 30, 30, 28, 24, 20, 30, 28, 24, 20, 20, 20, 20, 16} },
+                { {30, 30, 30, 28, 24, 20, 30, 28, 24, 20, 20, 20, 20, 16} },
+                { {30, 30, 30, 26, 22, 18, 30, 26, 22, 18, 18, 18, 18, 16} },
+                { {30, 30, 30, 26, 22, 18, 30, 26, 22, 18, 18, 18, 18, 16} },
+                { {30, 30, 30, 24, 20, 16, 30, 24, 20, 16, 16, 16, 16, 14} },
+                { {30, 30, 30, 24, 20, 16, 30, 24, 20, 16, 16, 16, 16, 14} },
+                { {30, 30, 30, 22, 18, 14, 30, 22, 18, 14, 14, 14, 14, 12} },
+                { {30, 30, 30, 22, 18, 14, 30, 22, 18, 14, 14, 14, 14, 12} },
+        },
+        .calTargetPower5GHT40 =  {
+                /*
+                 * 0_8_16,1-3_9-11_17-19,
+                 * 4,5,6,7,12,13,14,15,20,21,22,23
+                 */
+                { {28, 28, 28, 26, 22, 18, 28, 26, 22, 18, 18, 18, 18, 14} },
+                { {28, 28, 28, 26, 22, 18, 28, 26, 22, 18, 18, 18, 18, 14} },
+                { {28, 28, 28, 24, 20, 16, 28, 24, 20, 16, 16, 16, 16, 12} },
+                { {28, 28, 28, 24, 20, 16, 28, 24, 20, 16, 16, 16, 16, 12} },
+                { {28, 28, 28, 22, 18, 14, 28, 22, 18, 14, 14, 14, 14, 10} },
+                { {28, 28, 28, 22, 18, 14, 28, 22, 18, 14, 14, 14, 14, 10} },
+                { {28, 28, 28, 20, 16, 12, 28, 20, 16, 12, 12, 12, 12, 8} },
+                { {28, 28, 28, 20, 16, 12, 28, 20, 16, 12, 12, 12, 12, 8} },
+        },
+        .ctlIndex_5G =  {
+                0x10, 0x16, 0x18, 0x40, 0x46,
+                0x48, 0x30, 0x36, 0x38
+        },
+        .ctl_freqbin_5G =  {
+                {
+                        /* Data[0].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[0].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[0].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
+                        /* Data[0].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[0].ctlEdges[4].bChannel */ FREQ2FBIN(5600, 0),
+                        /* Data[0].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[0].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
+                        /* Data[0].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
+                },
+                {
+                        /* Data[1].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[1].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[1].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
+                        /* Data[1].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[1].ctlEdges[4].bChannel */ FREQ2FBIN(5520, 0),
+                        /* Data[1].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[1].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
+                        /* Data[1].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
+                },
+
+                {
+                        /* Data[2].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
+                        /* Data[2].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
+                        /* Data[2].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
+                        /* Data[2].ctlEdges[3].bChannel */ FREQ2FBIN(5310, 0),
+                        /* Data[2].ctlEdges[4].bChannel */ FREQ2FBIN(5510, 0),
+                        /* Data[2].ctlEdges[5].bChannel */ FREQ2FBIN(5550, 0),
+                        /* Data[2].ctlEdges[6].bChannel */ FREQ2FBIN(5670, 0),
+                        /* Data[2].ctlEdges[7].bChannel */ FREQ2FBIN(5755, 0)
+                },
+
+                {
+                        /* Data[3].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[3].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
+                        /* Data[3].ctlEdges[2].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[3].ctlEdges[3].bChannel */ FREQ2FBIN(5320, 0),
+                        /* Data[3].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[3].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[3].ctlEdges[6].bChannel */ 0xFF,
+                        /* Data[3].ctlEdges[7].bChannel */ 0xFF,
+                },
+
+                {
+                        /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[4].ctlEdges[4].bChannel */ 0xFF,
+                        /* Data[4].ctlEdges[5].bChannel */ 0xFF,
+                        /* Data[4].ctlEdges[6].bChannel */ 0xFF,
+                        /* Data[4].ctlEdges[7].bChannel */ 0xFF,
+                },
+
+                {
+                        /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
+                        /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(5270, 0),
+                        /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(5310, 0),
+                        /* Data[5].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
+                        /* Data[5].ctlEdges[4].bChannel */ FREQ2FBIN(5590, 0),
+                        /* Data[5].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
+                        /* Data[5].ctlEdges[6].bChannel */ 0xFF,
+                        /* Data[5].ctlEdges[7].bChannel */ 0xFF
+                },
+
+                {
+                        /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
+                        /* Data[6].ctlEdges[2].bChannel */ FREQ2FBIN(5220, 0),
+                        /* Data[6].ctlEdges[3].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[6].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[6].ctlEdges[5].bChannel */ FREQ2FBIN(5600, 0),
+                        /* Data[6].ctlEdges[6].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[6].ctlEdges[7].bChannel */ FREQ2FBIN(5745, 0)
+                },
+
+                {
+                        /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(5320, 0),
+                        /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[7].ctlEdges[4].bChannel */ FREQ2FBIN(5560, 0),
+                        /* Data[7].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[7].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
+                        /* Data[7].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
+                },
+
+                {
+                        /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
+                        /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
+                        /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
+                        /* Data[8].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
+                        /* Data[8].ctlEdges[4].bChannel */ FREQ2FBIN(5550, 0),
+                        /* Data[8].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
+                        /* Data[8].ctlEdges[6].bChannel */ FREQ2FBIN(5755, 0),
+                        /* Data[8].ctlEdges[7].bChannel */ FREQ2FBIN(5795, 0)
+                }
+        },
+        .ctlPowerData_5G = {
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 0}, {60, 1}, {60, 0}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                        }
+                },
+                {
+                        {
+                                {60, 0}, {60, 1}, {60, 1}, {60, 0},
+                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                                {60, 0}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 0}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                        }
+                },
+        }
+};
+
+
+static const struct ar9300_eeprom ar9300_x112 = {
+        .eepromVersion = 2,
+        .templateVersion = 5,
+        .macAddr = {0x00, 0x03, 0x7f, 0x0, 0x0, 0x0},
+        .custData = {"x112-041-f0000"},
+        .baseEepHeader = {
+                .regDmn = { LE16(0), LE16(0x1f) },
+                .txrxMask =  0x77, /* 4 bits tx and 4 bits rx */
+                .opCapFlags = {
+                        .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A,
+                        .eepMisc = 0,
+                },
+                .rfSilent = 0,
+                .blueToothOptions = 0,
+                .deviceCap = 0,
+                .deviceType = 5, /* takes lower byte in eeprom location */
+                .pwrTableOffset = AR9300_PWR_TABLE_OFFSET,
+                .params_for_tuning_caps = {0, 0},
+                .featureEnable = 0x0d,
+                /*
+                 * bit0 - enable tx temp comp - disabled
+                 * bit1 - enable tx volt comp - disabled
+                 * bit2 - enable fastclock - enabled
+                 * bit3 - enable doubling - enabled
+                 * bit4 - enable internal regulator - disabled
+                 * bit5 - enable pa predistortion - disabled
+                 */
+                .miscConfiguration = 0, /* bit0 - turn down drivestrength */
+                .eepromWriteEnableGpio = 6,
+                .wlanDisableGpio = 0,
+                .wlanLedGpio = 8,
+                .rxBandSelectGpio = 0xff,
+                .txrxgain = 0x0,
+                .swreg = 0,
+        },
+        .modalHeader2G = {
+                /* ar9300_modal_eep_header  2g */
+                /* 4 idle,t1,t2,b(4 bits per setting) */
+                .antCtrlCommon = LE32(0x110),
+                /* 4 ra1l1, ra2l1, ra1l2, ra2l2, ra12 */
+                .antCtrlCommon2 = LE32(0x22222),
+
+                /*
+                 * antCtrlChain[ar9300_max_chains]; 6 idle, t, r,
+                 * rx1, rx12, b (2 bits each)
+                 */
+                .antCtrlChain = { LE16(0x10), LE16(0x10), LE16(0x10) },
+
+                /*
+                 * xatten1DB[AR9300_max_chains];  3 xatten1_db
+                 * for ar9280 (0xa20c/b20c 5:0)
+                 */
+                .xatten1DB = {0x1b, 0x1b, 0x1b},
+
+                /*
+                 * xatten1Margin[ar9300_max_chains]; 3 xatten1_margin
+                 * for ar9280 (0xa20c/b20c 16:12
+                 */
+                .xatten1Margin = {0x15, 0x15, 0x15},
+                .tempSlope = 50,
+                .voltSlope = 0,
+
+                /*
+                 * spurChans[OSPrey_eeprom_modal_sPURS]; spur
+                 * channels in usual fbin coding format
+                 */
+                .spurChans = {FREQ2FBIN(2464, 1), 0, 0, 0, 0},
+
+                /*
+                 * noiseFloorThreshch[ar9300_max_cHAINS]; 3 Check
+                 * if the register is per chain
+                 */
+                .noiseFloorThreshCh = {-1, 0, 0},
+                .ob = {1, 1, 1},/* 3 chain */
+                .db_stage2 = {1, 1, 1}, /* 3 chain  */
+                .db_stage3 = {0, 0, 0},
+                .db_stage4 = {0, 0, 0},
+                .xpaBiasLvl = 0,
+                .txFrameToDataStart = 0x0e,
+                .txFrameToPaOn = 0x0e,
+                .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
+                .antennaGain = 0,
+                .switchSettling = 0x2c,
+                .adcDesiredSize = -30,
+                .txEndToXpaOff = 0,
+                .txEndToRxOn = 0x2,
+                .txFrameToXpaOn = 0xe,
+                .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0x0c80c080),
+                .papdRateMaskHt40 = LE32(0x0080c080),
+                .futureModal = {
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                },
+        },
+        .base_ext1 = {
+                .ant_div_control = 0,
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+        },
+        .calFreqPier2G = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1),
+        },
+        /* ar9300_cal_data_per_freq_op_loop 2g */
+        .calPierData2G = {
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+        },
+        .calTarget_freqbin_Cck = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2472, 1),
+        },
+        .calTarget_freqbin_2G = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+        },
+        .calTarget_freqbin_2GHT20 = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+        },
+        .calTarget_freqbin_2GHT40 = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+        },
+        .calTargetPowerCck = {
+                /* 1L-5L,5S,11L,11s */
+                { {38, 38, 38, 38} },
+                { {38, 38, 38, 38} },
+        },
+        .calTargetPower2G = {
+                /* 6-24,36,48,54 */
+                { {38, 38, 36, 34} },
+                { {38, 38, 36, 34} },
+                { {38, 38, 34, 32} },
+        },
+        .calTargetPower2GHT20 = {
+                { {36, 36, 36, 36, 36, 34, 34, 32, 30, 28, 28, 28, 28, 26} },
+                { {36, 36, 36, 36, 36, 34, 36, 34, 32, 30, 30, 30, 28, 26} },
+                { {36, 36, 36, 36, 36, 34, 34, 32, 30, 28, 28, 28, 28, 26} },
+        },
+        .calTargetPower2GHT40 = {
+                { {36, 36, 36, 36, 34, 32, 32, 30, 28, 26, 26, 26, 26, 24} },
+                { {36, 36, 36, 36, 34, 32, 34, 32, 30, 28, 28, 28, 28, 24} },
+                { {36, 36, 36, 36, 34, 32, 32, 30, 28, 26, 26, 26, 26, 24} },
+        },
+        .ctlIndex_2G =  {
+                0x11, 0x12, 0x15, 0x17, 0x41, 0x42,
+                0x45, 0x47, 0x31, 0x32, 0x35, 0x37,
+        },
+        .ctl_freqbin_2G = {
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2457, 1),
+                        FREQ2FBIN(2462, 1)
+                },
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2462, 1),
+                        0xFF,
+                },
+
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2462, 1),
+                        0xFF,
+                },
+                {
+                        FREQ2FBIN(2422, 1),
+                        FREQ2FBIN(2427, 1),
+                        FREQ2FBIN(2447, 1),
+                        FREQ2FBIN(2452, 1)
+                },
+
+                {
+                        /* Data[4].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
+                        /* Data[4].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
+                        /* Data[4].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
+                        /* Data[4].ctledges[3].bchannel */ FREQ2FBIN(2484, 1),
+                },
+
+                {
+                        /* Data[5].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
+                        /* Data[5].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
+                        /* Data[5].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
+                        0,
+                },
+
+                {
+                        /* Data[6].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
+                        /* Data[6].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2472, 1),
+                        0,
+                },
+
+                {
+                        /* Data[7].ctledges[0].bchannel */ FREQ2FBIN(2422, 1),
+                        /* Data[7].ctledges[1].bchannel */ FREQ2FBIN(2427, 1),
+                        /* Data[7].ctledges[2].bchannel */ FREQ2FBIN(2447, 1),
+                        /* Data[7].ctledges[3].bchannel */ FREQ2FBIN(2462, 1),
+                },
+
+                {
+                        /* Data[8].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
+                        /* Data[8].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
+                        /* Data[8].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
+                },
+
+                {
+                        /* Data[9].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
+                        /* Data[9].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
+                        /* Data[9].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
+                        0
+                },
+
+                {
+                        /* Data[10].ctledges[0].bchannel */ FREQ2FBIN(2412, 1),
+                        /* Data[10].ctledges[1].bchannel */ FREQ2FBIN(2417, 1),
+                        /* Data[10].ctledges[2].bchannel */ FREQ2FBIN(2472, 1),
+                        0
+                },
+
+                {
+                        /* Data[11].ctledges[0].bchannel */ FREQ2FBIN(2422, 1),
+                        /* Data[11].ctledges[1].bchannel */ FREQ2FBIN(2427, 1),
+                        /* Data[11].ctledges[2].bchannel */ FREQ2FBIN(2447, 1),
+                        /* Data[11].ctledges[3].bchannel */ FREQ2FBIN(2462, 1),
+                }
+        },
+        .ctlPowerData_2G = {
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
+
+                { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+
+                { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+
+                { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+                { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+        },
+        .modalHeader5G = {
+                /* 4 idle,t1,t2,b (4 bits per setting) */
+                .antCtrlCommon = LE32(0x110),
+                /* 4 ra1l1, ra2l1, ra1l2,ra2l2,ra12 */
+                .antCtrlCommon2 = LE32(0x22222),
+                /* antCtrlChain 6 idle, t,r,rx1,rx12,b (2 bits each) */
+                .antCtrlChain = {
+                        LE16(0x0), LE16(0x0), LE16(0x0),
+                },
+                /* xatten1DB 3 xatten1_db for ar9280 (0xa20c/b20c 5:0) */
+                .xatten1DB = {0x13, 0x19, 0x17},
+
+                /*
+                 * xatten1Margin[ar9300_max_chains]; 3 xatten1_margin
+                 * for merlin (0xa20c/b20c 16:12
+                 */
+                .xatten1Margin = {0x19, 0x19, 0x19},
+                .tempSlope = 70,
+                .voltSlope = 15,
+                /* spurChans spur channels in usual fbin coding format */
+                .spurChans = {0, 0, 0, 0, 0},
+                /* noiseFloorThreshch check if the register is per chain */
+                .noiseFloorThreshCh = {-1, 0, 0},
+                .ob = {3, 3, 3}, /* 3 chain */
+                .db_stage2 = {3, 3, 3}, /* 3 chain */
+                .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
+                .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
+                .xpaBiasLvl = 0,
+                .txFrameToDataStart = 0x0e,
+                .txFrameToPaOn = 0x0e,
+                .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
+                .antennaGain = 0,
+                .switchSettling = 0x2d,
+                .adcDesiredSize = -30,
+                .txEndToXpaOff = 0,
+                .txEndToRxOn = 0x2,
+                .txFrameToXpaOn = 0xe,
+                .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0x0cf0e0e0),
+                .papdRateMaskHt40 = LE32(0x6cf0e0e0),
+                .futureModal = {
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                },
+        },
+        .base_ext2 = {
+                .tempSlopeLow = 72,
+                .tempSlopeHigh = 105,
+                .xatten1DBLow = {0x10, 0x14, 0x10},
+                .xatten1MarginLow = {0x19, 0x19 , 0x19},
+                .xatten1DBHigh = {0x1d, 0x20, 0x24},
+                .xatten1MarginHigh = {0x10, 0x10, 0x10}
+        },
+        .calFreqPier5G = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5220, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5785, 0)
+        },
+        .calPierData5G = {
+                {
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                },
+                {
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                },
+                {
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                        {0, 0, 0, 0, 0},
+                },
+
+        },
+        .calTarget_freqbin_5G = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5220, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5725, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calTarget_freqbin_5GHT20 = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5220, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5725, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calTarget_freqbin_5GHT40 = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5220, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5725, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calTargetPower5G = {
+                /* 6-24,36,48,54 */
+                { {32, 32, 28, 26} },
+                { {32, 32, 28, 26} },
+                { {32, 32, 28, 26} },
+                { {32, 32, 26, 24} },
+                { {32, 32, 26, 24} },
+                { {32, 32, 24, 22} },
+                { {30, 30, 24, 22} },
+                { {30, 30, 24, 22} },
+        },
+        .calTargetPower5GHT20 = {
+                /*
+                 * 0_8_16,1-3_9-11_17-19,
+                 * 4,5,6,7,12,13,14,15,20,21,22,23
+                 */
+                { {32, 32, 32, 32, 28, 26, 32, 28, 26, 24, 24, 24, 22, 22} },
+                { {32, 32, 32, 32, 28, 26, 32, 28, 26, 24, 24, 24, 22, 22} },
+                { {32, 32, 32, 32, 28, 26, 32, 28, 26, 24, 24, 24, 22, 22} },
+                { {32, 32, 32, 32, 28, 26, 32, 26, 24, 22, 22, 22, 20, 20} },
+                { {32, 32, 32, 32, 28, 26, 32, 26, 24, 22, 20, 18, 16, 16} },
+                { {32, 32, 32, 32, 28, 26, 32, 24, 20, 16, 18, 16, 14, 14} },
+                { {30, 30, 30, 30, 28, 26, 30, 24, 20, 16, 18, 16, 14, 14} },
+                { {30, 30, 30, 30, 28, 26, 30, 24, 20, 16, 18, 16, 14, 14} },
+        },
+        .calTargetPower5GHT40 =  {
+                /*
+                 * 0_8_16,1-3_9-11_17-19,
+                 * 4,5,6,7,12,13,14,15,20,21,22,23
+                 */
+                { {32, 32, 32, 30, 28, 26, 30, 28, 26, 24, 24, 24, 22, 22} },
+                { {32, 32, 32, 30, 28, 26, 30, 28, 26, 24, 24, 24, 22, 22} },
+                { {32, 32, 32, 30, 28, 26, 30, 28, 26, 24, 24, 24, 22, 22} },
+                { {32, 32, 32, 30, 28, 26, 30, 26, 24, 22, 22, 22, 20, 20} },
+                { {32, 32, 32, 30, 28, 26, 30, 26, 24, 22, 20, 18, 16, 16} },
+                { {32, 32, 32, 30, 28, 26, 30, 22, 20, 16, 18, 16, 14, 14} },
+                { {30, 30, 30, 30, 28, 26, 30, 22, 20, 16, 18, 16, 14, 14} },
+                { {30, 30, 30, 30, 28, 26, 30, 22, 20, 16, 18, 16, 14, 14} },
+        },
+        .ctlIndex_5G =  {
+                0x10, 0x16, 0x18, 0x40, 0x46,
+                0x48, 0x30, 0x36, 0x38
+        },
+        .ctl_freqbin_5G =  {
+                {
+                        /* Data[0].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
+                        /* Data[0].ctledges[1].bchannel */ FREQ2FBIN(5260, 0),
+                        /* Data[0].ctledges[2].bchannel */ FREQ2FBIN(5280, 0),
+                        /* Data[0].ctledges[3].bchannel */ FREQ2FBIN(5500, 0),
+                        /* Data[0].ctledges[4].bchannel */ FREQ2FBIN(5600, 0),
+                        /* Data[0].ctledges[5].bchannel */ FREQ2FBIN(5700, 0),
+                        /* Data[0].ctledges[6].bchannel */ FREQ2FBIN(5745, 0),
+                        /* Data[0].ctledges[7].bchannel */ FREQ2FBIN(5825, 0)
+                },
+                {
+                        /* Data[1].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
+                        /* Data[1].ctledges[1].bchannel */ FREQ2FBIN(5260, 0),
+                        /* Data[1].ctledges[2].bchannel */ FREQ2FBIN(5280, 0),
+                        /* Data[1].ctledges[3].bchannel */ FREQ2FBIN(5500, 0),
+                        /* Data[1].ctledges[4].bchannel */ FREQ2FBIN(5520, 0),
+                        /* Data[1].ctledges[5].bchannel */ FREQ2FBIN(5700, 0),
+                        /* Data[1].ctledges[6].bchannel */ FREQ2FBIN(5745, 0),
+                        /* Data[1].ctledges[7].bchannel */ FREQ2FBIN(5825, 0)
+                },
+
+                {
+                        /* Data[2].ctledges[0].bchannel */ FREQ2FBIN(5190, 0),
+                        /* Data[2].ctledges[1].bchannel */ FREQ2FBIN(5230, 0),
+                        /* Data[2].ctledges[2].bchannel */ FREQ2FBIN(5270, 0),
+                        /* Data[2].ctledges[3].bchannel */ FREQ2FBIN(5310, 0),
+                        /* Data[2].ctledges[4].bchannel */ FREQ2FBIN(5510, 0),
+                        /* Data[2].ctledges[5].bchannel */ FREQ2FBIN(5550, 0),
+                        /* Data[2].ctledges[6].bchannel */ FREQ2FBIN(5670, 0),
+                        /* Data[2].ctledges[7].bchannel */ FREQ2FBIN(5755, 0)
+                },
+
+                {
+                        /* Data[3].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
+                        /* Data[3].ctledges[1].bchannel */ FREQ2FBIN(5200, 0),
+                        /* Data[3].ctledges[2].bchannel */ FREQ2FBIN(5260, 0),
+                        /* Data[3].ctledges[3].bchannel */ FREQ2FBIN(5320, 0),
+                        /* Data[3].ctledges[4].bchannel */ FREQ2FBIN(5500, 0),
+                        /* Data[3].ctledges[5].bchannel */ FREQ2FBIN(5700, 0),
+                        /* Data[3].ctledges[6].bchannel */ 0xFF,
+                        /* Data[3].ctledges[7].bchannel */ 0xFF,
+                },
+
+                {
+                        /* Data[4].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
+                        /* Data[4].ctledges[1].bchannel */ FREQ2FBIN(5260, 0),
+                        /* Data[4].ctledges[2].bchannel */ FREQ2FBIN(5500, 0),
+                        /* Data[4].ctledges[3].bchannel */ FREQ2FBIN(5700, 0),
+                        /* Data[4].ctledges[4].bchannel */ 0xFF,
+                        /* Data[4].ctledges[5].bchannel */ 0xFF,
+                        /* Data[4].ctledges[6].bchannel */ 0xFF,
+                        /* Data[4].ctledges[7].bchannel */ 0xFF,
+                },
+
+                {
+                        /* Data[5].ctledges[0].bchannel */ FREQ2FBIN(5190, 0),
+                        /* Data[5].ctledges[1].bchannel */ FREQ2FBIN(5270, 0),
+                        /* Data[5].ctledges[2].bchannel */ FREQ2FBIN(5310, 0),
+                        /* Data[5].ctledges[3].bchannel */ FREQ2FBIN(5510, 0),
+                        /* Data[5].ctledges[4].bchannel */ FREQ2FBIN(5590, 0),
+                        /* Data[5].ctledges[5].bchannel */ FREQ2FBIN(5670, 0),
+                        /* Data[5].ctledges[6].bchannel */ 0xFF,
+                        /* Data[5].ctledges[7].bchannel */ 0xFF
+                },
+
+                {
+                        /* Data[6].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
+                        /* Data[6].ctledges[1].bchannel */ FREQ2FBIN(5200, 0),
+                        /* Data[6].ctledges[2].bchannel */ FREQ2FBIN(5220, 0),
+                        /* Data[6].ctledges[3].bchannel */ FREQ2FBIN(5260, 0),
+                        /* Data[6].ctledges[4].bchannel */ FREQ2FBIN(5500, 0),
+                        /* Data[6].ctledges[5].bchannel */ FREQ2FBIN(5600, 0),
+                        /* Data[6].ctledges[6].bchannel */ FREQ2FBIN(5700, 0),
+                        /* Data[6].ctledges[7].bchannel */ FREQ2FBIN(5745, 0)
+                },
+
+                {
+                        /* Data[7].ctledges[0].bchannel */ FREQ2FBIN(5180, 0),
+                        /* Data[7].ctledges[1].bchannel */ FREQ2FBIN(5260, 0),
+                        /* Data[7].ctledges[2].bchannel */ FREQ2FBIN(5320, 0),
+                        /* Data[7].ctledges[3].bchannel */ FREQ2FBIN(5500, 0),
+                        /* Data[7].ctledges[4].bchannel */ FREQ2FBIN(5560, 0),
+                        /* Data[7].ctledges[5].bchannel */ FREQ2FBIN(5700, 0),
+                        /* Data[7].ctledges[6].bchannel */ FREQ2FBIN(5745, 0),
+                        /* Data[7].ctledges[7].bchannel */ FREQ2FBIN(5825, 0)
+                },
+
+                {
+                        /* Data[8].ctledges[0].bchannel */ FREQ2FBIN(5190, 0),
+                        /* Data[8].ctledges[1].bchannel */ FREQ2FBIN(5230, 0),
+                        /* Data[8].ctledges[2].bchannel */ FREQ2FBIN(5270, 0),
+                        /* Data[8].ctledges[3].bchannel */ FREQ2FBIN(5510, 0),
+                        /* Data[8].ctledges[4].bchannel */ FREQ2FBIN(5550, 0),
+                        /* Data[8].ctledges[5].bchannel */ FREQ2FBIN(5670, 0),
+                        /* Data[8].ctledges[6].bchannel */ FREQ2FBIN(5755, 0),
+                        /* Data[8].ctledges[7].bchannel */ FREQ2FBIN(5795, 0)
+                }
+        },
+        .ctlPowerData_5G = {
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 0}, {60, 1}, {60, 0}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                        }
+                },
+                {
+                        {
+                                {60, 0}, {60, 1}, {60, 1}, {60, 0},
+                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                                {60, 0}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 0}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                        }
+                },
+        }
+};
+
+static const struct ar9300_eeprom ar9300_h116 = {
+        .eepromVersion = 2,
+        .templateVersion = 4,
+        .macAddr = {0x00, 0x03, 0x7f, 0x0, 0x0, 0x0},
+        .custData = {"h116-041-f0000"},
+        .baseEepHeader = {
+                .regDmn = { LE16(0), LE16(0x1f) },
+                .txrxMask =  0x33, /* 4 bits tx and 4 bits rx */
+                .opCapFlags = {
+                        .opFlags = AR9300_OPFLAGS_11G | AR9300_OPFLAGS_11A,
+                        .eepMisc = 0,
+                },
+                .rfSilent = 0,
+                .blueToothOptions = 0,
+                .deviceCap = 0,
+                .deviceType = 5, /* takes lower byte in eeprom location */
+                .pwrTableOffset = AR9300_PWR_TABLE_OFFSET,
+                .params_for_tuning_caps = {0, 0},
+                .featureEnable = 0x0d,
+                 /*
+                  * bit0 - enable tx temp comp - disabled
+                  * bit1 - enable tx volt comp - disabled
+                  * bit2 - enable fastClock - enabled
+                  * bit3 - enable doubling - enabled
+                  * bit4 - enable internal regulator - disabled
+                  * bit5 - enable pa predistortion - disabled
+                  */
+                .miscConfiguration = 0, /* bit0 - turn down drivestrength */
+                .eepromWriteEnableGpio = 6,
+                .wlanDisableGpio = 0,
+                .wlanLedGpio = 8,
+                .rxBandSelectGpio = 0xff,
+                .txrxgain = 0x10,
+                .swreg = 0,
+         },
+        .modalHeader2G = {
+        /* ar9300_modal_eep_header  2g */
+                /* 4 idle,t1,t2,b(4 bits per setting) */
+                .antCtrlCommon = LE32(0x110),
+                /* 4 ra1l1, ra2l1, ra1l2, ra2l2, ra12 */
+                .antCtrlCommon2 = LE32(0x44444),
+
+                /*
+                 * antCtrlChain[AR9300_MAX_CHAINS]; 6 idle, t, r,
+                 * rx1, rx12, b (2 bits each)
+                 */
+                .antCtrlChain = { LE16(0x10), LE16(0x10), LE16(0x10) },
+
+                /*
+                 * xatten1DB[AR9300_MAX_CHAINS];  3 xatten1_db
+                 * for ar9280 (0xa20c/b20c 5:0)
+                 */
+                .xatten1DB = {0x1f, 0x1f, 0x1f},
+
+                /*
+                 * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
+                 * for ar9280 (0xa20c/b20c 16:12
+                 */
+                .xatten1Margin = {0x12, 0x12, 0x12},
+                .tempSlope = 25,
+                .voltSlope = 0,
+
+                /*
+                 * spurChans[OSPREY_EEPROM_MODAL_SPURS]; spur
+                 * channels in usual fbin coding format
+                 */
+                .spurChans = {FREQ2FBIN(2464, 1), 0, 0, 0, 0},
+
+                /*
+                 * noiseFloorThreshCh[AR9300_MAX_CHAINS]; 3 Check
+                 * if the register is per chain
+                 */
+                .noiseFloorThreshCh = {-1, 0, 0},
+                .ob = {1, 1, 1},/* 3 chain */
+                .db_stage2 = {1, 1, 1}, /* 3 chain  */
+                .db_stage3 = {0, 0, 0},
+                .db_stage4 = {0, 0, 0},
+                .xpaBiasLvl = 0,
+                .txFrameToDataStart = 0x0e,
+                .txFrameToPaOn = 0x0e,
+                .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
+                .antennaGain = 0,
+                .switchSettling = 0x2c,
+                .adcDesiredSize = -30,
+                .txEndToXpaOff = 0,
+                .txEndToRxOn = 0x2,
+                .txFrameToXpaOn = 0xe,
+                .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0x0c80C080),
+                .papdRateMaskHt40 = LE32(0x0080C080),
+                .futureModal = {
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                },
+         },
+         .base_ext1 = {
+                .ant_div_control = 0,
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+         },
+        .calFreqPier2G = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1),
+         },
+        /* ar9300_cal_data_per_freq_op_loop 2g */
+        .calPierData2G = {
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+                { {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} },
+         },
+        .calTarget_freqbin_Cck = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2472, 1),
+         },
+        .calTarget_freqbin_2G = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+         },
+        .calTarget_freqbin_2GHT20 = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+         },
+        .calTarget_freqbin_2GHT40 = {
+                FREQ2FBIN(2412, 1),
+                FREQ2FBIN(2437, 1),
+                FREQ2FBIN(2472, 1)
+         },
+        .calTargetPowerCck = {
+                 /* 1L-5L,5S,11L,11S */
+                 { {34, 34, 34, 34} },
+                 { {34, 34, 34, 34} },
+        },
+        .calTargetPower2G = {
+                 /* 6-24,36,48,54 */
+                 { {34, 34, 32, 32} },
+                 { {34, 34, 32, 32} },
+                 { {34, 34, 32, 32} },
+        },
+        .calTargetPower2GHT20 = {
+                { {32, 32, 32, 32, 32, 30, 32, 32, 30, 28, 0, 0, 0, 0} },
+                { {32, 32, 32, 32, 32, 30, 32, 32, 30, 28, 0, 0, 0, 0} },
+                { {32, 32, 32, 32, 32, 30, 32, 32, 30, 28, 0, 0, 0, 0} },
+        },
+        .calTargetPower2GHT40 = {
+                { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 0, 0, 0, 0} },
+                { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 0, 0, 0, 0} },
+                { {30, 30, 30, 30, 30, 28, 30, 30, 28, 26, 0, 0, 0, 0} },
+        },
+        .ctlIndex_2G =  {
+                0x11, 0x12, 0x15, 0x17, 0x41, 0x42,
+                0x45, 0x47, 0x31, 0x32, 0x35, 0x37,
+        },
+        .ctl_freqbin_2G = {
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2457, 1),
+                        FREQ2FBIN(2462, 1)
+                },
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2462, 1),
+                        0xFF,
+                },
+
+                {
+                        FREQ2FBIN(2412, 1),
+                        FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2462, 1),
+                        0xFF,
+                },
+                {
+                        FREQ2FBIN(2422, 1),
+                        FREQ2FBIN(2427, 1),
+                        FREQ2FBIN(2447, 1),
+                        FREQ2FBIN(2452, 1)
+                },
+
+                {
+                        /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(2484, 1),
+                },
+
+                {
+                        /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        0,
+                },
+
+                {
+                        /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        FREQ2FBIN(2472, 1),
+                        0,
+                },
+
+                {
+                        /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
+                        /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
+                        /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
+                        /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
+                },
+
+                {
+                        /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                },
+
+                {
+                        /* Data[9].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[9].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[9].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        0
+                },
+
+                {
+                        /* Data[10].ctlEdges[0].bChannel */ FREQ2FBIN(2412, 1),
+                        /* Data[10].ctlEdges[1].bChannel */ FREQ2FBIN(2417, 1),
+                        /* Data[10].ctlEdges[2].bChannel */ FREQ2FBIN(2472, 1),
+                        0
+                },
+
+                {
+                        /* Data[11].ctlEdges[0].bChannel */ FREQ2FBIN(2422, 1),
+                        /* Data[11].ctlEdges[1].bChannel */ FREQ2FBIN(2427, 1),
+                        /* Data[11].ctlEdges[2].bChannel */ FREQ2FBIN(2447, 1),
+                        /* Data[11].ctlEdges[3].bChannel */ FREQ2FBIN(2462, 1),
+                }
+         },
+        .ctlPowerData_2G = {
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 1}, {60, 0}, {60, 0}, {60, 1} } },
+
+                 { { {60, 1}, {60, 0}, {0, 0}, {0, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+
+                 { { {60, 0}, {60, 1}, {60, 1}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+
+                 { { {60, 0}, {60, 1}, {60, 0}, {60, 0} } },
+                 { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+                 { { {60, 0}, {60, 1}, {60, 1}, {60, 1} } },
+         },
+        .modalHeader5G = {
+                /* 4 idle,t1,t2,b (4 bits per setting) */
+                .antCtrlCommon = LE32(0x220),
+                /* 4 ra1l1, ra2l1, ra1l2,ra2l2,ra12 */
+                .antCtrlCommon2 = LE32(0x44444),
+                 /* antCtrlChain 6 idle, t,r,rx1,rx12,b (2 bits each) */
+                .antCtrlChain = {
+                        LE16(0x150), LE16(0x150), LE16(0x150),
+                },
+                 /* xatten1DB 3 xatten1_db for AR9280 (0xa20c/b20c 5:0) */
+                .xatten1DB = {0x19, 0x19, 0x19},
+
+                /*
+                 * xatten1Margin[AR9300_MAX_CHAINS]; 3 xatten1_margin
+                 * for merlin (0xa20c/b20c 16:12
+                 */
+                .xatten1Margin = {0x14, 0x14, 0x14},
+                .tempSlope = 70,
+                .voltSlope = 0,
+                /* spurChans spur channels in usual fbin coding format */
+                .spurChans = {0, 0, 0, 0, 0},
+                /* noiseFloorThreshCh Check if the register is per chain */
+                .noiseFloorThreshCh = {-1, 0, 0},
+                .ob = {3, 3, 3}, /* 3 chain */
+                .db_stage2 = {3, 3, 3}, /* 3 chain */
+                .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
+                .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
+                .xpaBiasLvl = 0,
+                .txFrameToDataStart = 0x0e,
+                .txFrameToPaOn = 0x0e,
+                .txClip = 3, /* 4 bits tx_clip, 4 bits dac_scale_cck */
+                .antennaGain = 0,
+                .switchSettling = 0x2d,
+                .adcDesiredSize = -30,
+                .txEndToXpaOff = 0,
+                .txEndToRxOn = 0x2,
+                .txFrameToXpaOn = 0xe,
+                .thresh62 = 28,
+                .papdRateMaskHt20 = LE32(0x0cf0e0e0),
+                .papdRateMaskHt40 = LE32(0x6cf0e0e0),
+                .futureModal = {
+                        0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                },
+         },
+        .base_ext2 = {
+                .tempSlopeLow = 35,
+                .tempSlopeHigh = 50,
+                .xatten1DBLow = {0, 0, 0},
+                .xatten1MarginLow = {0, 0, 0},
+                .xatten1DBHigh = {0, 0, 0},
+                .xatten1MarginHigh = {0, 0, 0}
+         },
+        .calFreqPier5G = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5220, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5785, 0)
+        },
+        .calPierData5G = {
+                        {
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                        },
+                        {
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                        },
+                        {
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                                {0, 0, 0, 0, 0},
+                        },
+
+        },
+        .calTarget_freqbin_5G = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5240, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5600, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calTarget_freqbin_5GHT20 = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5240, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5745, 0),
+                FREQ2FBIN(5825, 0)
+        },
+        .calTarget_freqbin_5GHT40 = {
+                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5240, 0),
+                FREQ2FBIN(5320, 0),
+                FREQ2FBIN(5400, 0),
+                FREQ2FBIN(5500, 0),
+                FREQ2FBIN(5700, 0),
+                FREQ2FBIN(5745, 0),
+                FREQ2FBIN(5825, 0)
+         },
+        .calTargetPower5G = {
+                /* 6-24,36,48,54 */
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+                { {30, 30, 28, 24} },
+         },
+        .calTargetPower5GHT20 = {
+                /*
+                 * 0_8_16,1-3_9-11_17-19,
+                 * 4,5,6,7,12,13,14,15,20,21,22,23
+                 */
+                { {30, 30, 30, 28, 24, 20, 30, 28, 24, 20, 0, 0, 0, 0} },
+                { {30, 30, 30, 28, 24, 20, 30, 28, 24, 20, 0, 0, 0, 0} },
+                { {30, 30, 30, 26, 22, 18, 30, 26, 22, 18, 0, 0, 0, 0} },
+                { {30, 30, 30, 26, 22, 18, 30, 26, 22, 18, 0, 0, 0, 0} },
+                { {30, 30, 30, 24, 20, 16, 30, 24, 20, 16, 0, 0, 0, 0} },
+                { {30, 30, 30, 24, 20, 16, 30, 24, 20, 16, 0, 0, 0, 0} },
+                { {30, 30, 30, 22, 18, 14, 30, 22, 18, 14, 0, 0, 0, 0} },
+                { {30, 30, 30, 22, 18, 14, 30, 22, 18, 14, 0, 0, 0, 0} },
+         },
+        .calTargetPower5GHT40 =  {
+                /*
+                 * 0_8_16,1-3_9-11_17-19,
+                 * 4,5,6,7,12,13,14,15,20,21,22,23
+                 */
+                { {28, 28, 28, 26, 22, 18, 28, 26, 22, 18, 0, 0, 0, 0} },
+                { {28, 28, 28, 26, 22, 18, 28, 26, 22, 18, 0, 0, 0, 0} },
+                { {28, 28, 28, 24, 20, 16, 28, 24, 20, 16, 0, 0, 0, 0} },
+                { {28, 28, 28, 24, 20, 16, 28, 24, 20, 16, 0, 0, 0, 0} },
+                { {28, 28, 28, 22, 18, 14, 28, 22, 18, 14, 0, 0, 0, 0} },
+                { {28, 28, 28, 22, 18, 14, 28, 22, 18, 14, 0, 0, 0, 0} },
+                { {28, 28, 28, 20, 16, 12, 28, 20, 16, 12, 0, 0, 0, 0} },
+                { {28, 28, 28, 20, 16, 12, 28, 20, 16, 12, 0, 0, 0, 0} },
+         },
+        .ctlIndex_5G =  {
+                0x10, 0x16, 0x18, 0x40, 0x46,
+                0x48, 0x30, 0x36, 0x38
+        },
+        .ctl_freqbin_5G =  {
+                {
+                        /* Data[0].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[0].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[0].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
+                        /* Data[0].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[0].ctlEdges[4].bChannel */ FREQ2FBIN(5600, 0),
+                        /* Data[0].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[0].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
+                        /* Data[0].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
+                },
+                {
+                        /* Data[1].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[1].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[1].ctlEdges[2].bChannel */ FREQ2FBIN(5280, 0),
+                        /* Data[1].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[1].ctlEdges[4].bChannel */ FREQ2FBIN(5520, 0),
+                        /* Data[1].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[1].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
+                        /* Data[1].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
+                },
+
+                {
+                        /* Data[2].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
+                        /* Data[2].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
+                        /* Data[2].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
+                        /* Data[2].ctlEdges[3].bChannel */ FREQ2FBIN(5310, 0),
+                        /* Data[2].ctlEdges[4].bChannel */ FREQ2FBIN(5510, 0),
+                        /* Data[2].ctlEdges[5].bChannel */ FREQ2FBIN(5550, 0),
+                        /* Data[2].ctlEdges[6].bChannel */ FREQ2FBIN(5670, 0),
+                        /* Data[2].ctlEdges[7].bChannel */ FREQ2FBIN(5755, 0)
+                },
+
+                {
+                        /* Data[3].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[3].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
+                        /* Data[3].ctlEdges[2].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[3].ctlEdges[3].bChannel */ FREQ2FBIN(5320, 0),
+                        /* Data[3].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[3].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[3].ctlEdges[6].bChannel */ 0xFF,
+                        /* Data[3].ctlEdges[7].bChannel */ 0xFF,
+                },
+
+                {
+                        /* Data[4].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[4].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[4].ctlEdges[2].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[4].ctlEdges[3].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[4].ctlEdges[4].bChannel */ 0xFF,
+                        /* Data[4].ctlEdges[5].bChannel */ 0xFF,
+                        /* Data[4].ctlEdges[6].bChannel */ 0xFF,
+                        /* Data[4].ctlEdges[7].bChannel */ 0xFF,
+                },
+
+                {
+                        /* Data[5].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
+                        /* Data[5].ctlEdges[1].bChannel */ FREQ2FBIN(5270, 0),
+                        /* Data[5].ctlEdges[2].bChannel */ FREQ2FBIN(5310, 0),
+                        /* Data[5].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
+                        /* Data[5].ctlEdges[4].bChannel */ FREQ2FBIN(5590, 0),
+                        /* Data[5].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
+                        /* Data[5].ctlEdges[6].bChannel */ 0xFF,
+                        /* Data[5].ctlEdges[7].bChannel */ 0xFF
+                },
+
+                {
+                        /* Data[6].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[6].ctlEdges[1].bChannel */ FREQ2FBIN(5200, 0),
+                        /* Data[6].ctlEdges[2].bChannel */ FREQ2FBIN(5220, 0),
+                        /* Data[6].ctlEdges[3].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[6].ctlEdges[4].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[6].ctlEdges[5].bChannel */ FREQ2FBIN(5600, 0),
+                        /* Data[6].ctlEdges[6].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[6].ctlEdges[7].bChannel */ FREQ2FBIN(5745, 0)
+                },
+
+                {
+                        /* Data[7].ctlEdges[0].bChannel */ FREQ2FBIN(5180, 0),
+                        /* Data[7].ctlEdges[1].bChannel */ FREQ2FBIN(5260, 0),
+                        /* Data[7].ctlEdges[2].bChannel */ FREQ2FBIN(5320, 0),
+                        /* Data[7].ctlEdges[3].bChannel */ FREQ2FBIN(5500, 0),
+                        /* Data[7].ctlEdges[4].bChannel */ FREQ2FBIN(5560, 0),
+                        /* Data[7].ctlEdges[5].bChannel */ FREQ2FBIN(5700, 0),
+                        /* Data[7].ctlEdges[6].bChannel */ FREQ2FBIN(5745, 0),
+                        /* Data[7].ctlEdges[7].bChannel */ FREQ2FBIN(5825, 0)
+                },
+
+                {
+                        /* Data[8].ctlEdges[0].bChannel */ FREQ2FBIN(5190, 0),
+                        /* Data[8].ctlEdges[1].bChannel */ FREQ2FBIN(5230, 0),
+                        /* Data[8].ctlEdges[2].bChannel */ FREQ2FBIN(5270, 0),
+                        /* Data[8].ctlEdges[3].bChannel */ FREQ2FBIN(5510, 0),
+                        /* Data[8].ctlEdges[4].bChannel */ FREQ2FBIN(5550, 0),
+                        /* Data[8].ctlEdges[5].bChannel */ FREQ2FBIN(5670, 0),
+                        /* Data[8].ctlEdges[6].bChannel */ FREQ2FBIN(5755, 0),
+                        /* Data[8].ctlEdges[7].bChannel */ FREQ2FBIN(5795, 0)
+                }
+         },
+        .ctlPowerData_5G = {
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 0}, {60, 1}, {60, 0}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                        }
+                },
+                {
+                        {
+                                {60, 0}, {60, 1}, {60, 1}, {60, 0},
+                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                                {60, 0}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 0}, {60, 0}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 1},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 1}, {60, 0},
+                        }
+                },
+                {
+                        {
+                                {60, 1}, {60, 0}, {60, 1}, {60, 1},
+                                {60, 1}, {60, 1}, {60, 0}, {60, 1},
+                        }
+                },
+         }
+};
+
+
+static const struct ar9300_eeprom *ar9300_eep_templates[] = {
+        &ar9300_default,
+        &ar9300_x112,
+        &ar9300_h116,
+        &ar9300_h112,
+        &ar9300_x113,
+};
+
+static const struct ar9300_eeprom *ar9003_eeprom_struct_find_by_id(int id)
+{
+#define N_LOOP (sizeof(ar9300_eep_templates) / sizeof(ar9300_eep_templates[0]))
+        int it;
+
+        for (it = 0; it < N_LOOP; it++)
+                if (ar9300_eep_templates[it]->templateVersion == id)
+                        return ar9300_eep_templates[it];
+        return NULL;
+#undef N_LOOP
+}
+
+
 static u16 ath9k_hw_fbin2freq(u8 fbin, bool is2GHz)
 {
         if (fbin == AR9300_BCHAN_UNUSED)
@@ -636,6 +2982,16 @@ static int ath9k_hw_ar9300_check_eeprom(struct ath_hw *ah)
         return 0;
 }
 
+static int interpolate(int x, int xa, int xb, int ya, int yb)
+{
+        int bf, factor, plus;
+
+        bf = 2 * (yb - ya) * (x - xa) / (xb - xa);
+        factor = bf / 2;
+        plus = bf % 2;
+        return ya + factor + plus;
+}
+
 static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
                                       enum eeprom_param param)
 {
@@ -748,6 +3104,36 @@ error:
         return false;
 }
 
+static bool ar9300_otp_read_word(struct ath_hw *ah, int addr, u32 *data)
+{
+        REG_READ(ah, AR9300_OTP_BASE + (4 * addr));
+
+        if (!ath9k_hw_wait(ah, AR9300_OTP_STATUS, AR9300_OTP_STATUS_TYPE,
+                           AR9300_OTP_STATUS_VALID, 1000))
+                return false;
+
+        *data = REG_READ(ah, AR9300_OTP_READ_DATA);
+        return true;
+}
+
+static bool ar9300_read_otp(struct ath_hw *ah, int address, u8 *buffer,
+                            int count)
+{
+        u32 data;
+        int i;
+
+        for (i = 0; i < count; i++) {
+                int offset = 8 * ((address - i) % 4);
+                if (!ar9300_otp_read_word(ah, (address - i) / 4, &data))
+                        return false;
+
+                buffer[i] = (data >> offset) & 0xff;
+        }
+
+        return true;
+}
+
+
 static void ar9300_comp_hdr_unpack(u8 *best, int *code, int *reference,
                                    int *length, int *major, int *minor)
 {
@@ -824,6 +3210,7 @@ static int ar9300_compress_decision(struct ath_hw *ah,
 {
         struct ath_common *common = ath9k_hw_common(ah);
         u8 *dptr;
+        const struct ar9300_eeprom *eep = NULL;
 
         switch (code) {
         case _CompressNone:
@@ -841,13 +3228,14 @@ static int ar9300_compress_decision(struct ath_hw *ah,
                 if (reference == 0) {
                         dptr = mptr;
                 } else {
-                        if (reference != 2) {
+                        eep = ar9003_eeprom_struct_find_by_id(reference);
+                        if (eep == NULL) {
                                 ath_print(common, ATH_DBG_EEPROM,
                                           "cant find reference eeprom"
                                           "struct %d\n", reference);
                                 return -1;
                         }
-                        memcpy(mptr, &ar9300_default, mdata_size);
+                        memcpy(mptr, eep, mdata_size);
                 }
                 ath_print(common, ATH_DBG_EEPROM,
                           "restore eeprom %d: block, reference %d,"
@@ -863,6 +3251,38 @@ static int ar9300_compress_decision(struct ath_hw *ah,
         return 0;
 }
 
+typedef bool (*eeprom_read_op)(struct ath_hw *ah, int address, u8 *buffer,
+                               int count);
+
+static bool ar9300_check_header(void *data)
+{
+        u32 *word = data;
+        return !(*word == 0 || *word == ~0);
+}
+
+static bool ar9300_check_eeprom_header(struct ath_hw *ah, eeprom_read_op read,
+                                       int base_addr)
+{
+        u8 header[4];
+
+        if (!read(ah, base_addr, header, 4))
+                return false;
+
+        return ar9300_check_header(header);
+}
+
+static int ar9300_eeprom_restore_flash(struct ath_hw *ah, u8 *mptr,
+                                       int mdata_size)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        u16 *data = (u16 *) mptr;
+        int i;
+
+        for (i = 0; i < mdata_size / 2; i++, data++)
+                ath9k_hw_nvram_read(common, i, data);
+
+        return 0;
+}
 /*
  * Read the configuration data from the eeprom.
  * The data can be put in any specified memory buffer.
@@ -883,6 +3303,10 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,
         int it;
         u16 checksum, mchecksum;
         struct ath_common *common = ath9k_hw_common(ah);
+        eeprom_read_op read;
+
+        if (ath9k_hw_use_flash(ah))
+                return ar9300_eeprom_restore_flash(ah, mptr, mdata_size);
 
         word = kzalloc(2048, GFP_KERNEL);
         if (!word)
@@ -890,14 +3314,42 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,
 
         memcpy(mptr, &ar9300_default, mdata_size);
 
+        read = ar9300_read_eeprom;
+        cptr = AR9300_BASE_ADDR;
+        ath_print(common, ATH_DBG_EEPROM,
+                "Trying EEPROM accesss at Address 0x%04x\n", cptr);
+        if (ar9300_check_eeprom_header(ah, read, cptr))
+                goto found;
+
+        cptr = AR9300_BASE_ADDR_512;
+        ath_print(common, ATH_DBG_EEPROM,
+                "Trying EEPROM accesss at Address 0x%04x\n", cptr);
+        if (ar9300_check_eeprom_header(ah, read, cptr))
+                goto found;
+
+        read = ar9300_read_otp;
         cptr = AR9300_BASE_ADDR;
+        ath_print(common, ATH_DBG_EEPROM,
+                "Trying OTP accesss at Address 0x%04x\n", cptr);
+        if (ar9300_check_eeprom_header(ah, read, cptr))
+                goto found;
+
+        cptr = AR9300_BASE_ADDR_512;
+        ath_print(common, ATH_DBG_EEPROM,
+                "Trying OTP accesss at Address 0x%04x\n", cptr);
+        if (ar9300_check_eeprom_header(ah, read, cptr))
+                goto found;
+
+        goto fail;
+
+found:
+        ath_print(common, ATH_DBG_EEPROM, "Found valid EEPROM data");
+
         for (it = 0; it < MSTATE; it++) {
-                if (!ar9300_read_eeprom(ah, cptr, word, COMP_HDR_LEN))
+                if (!read(ah, cptr, word, COMP_HDR_LEN))
                         goto fail;
 
-                if ((word[0] == 0 && word[1] == 0 && word[2] == 0 &&
-                     word[3] == 0) || (word[0] == 0xff && word[1] == 0xff
-                                       && word[2] == 0xff && word[3] == 0xff))
+                if (!ar9300_check_header(word))
                         break;
 
                 ar9300_comp_hdr_unpack(word, &code, &reference,
@@ -914,8 +3366,7 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,
                 }
 
                 osize = length;
-                ar9300_read_eeprom(ah, cptr, word,
-                                   COMP_HDR_LEN + osize + COMP_CKSUM_LEN);
+                read(ah, cptr, word, COMP_HDR_LEN + osize + COMP_CKSUM_LEN);
                 checksum = ar9300_comp_cksum(&word[COMP_HDR_LEN], length);
                 mchecksum = word[COMP_HDR_LEN + osize] |
                     (word[COMP_HDR_LEN + osize + 1] << 8);
@@ -992,9 +3443,9 @@ static s32 ar9003_hw_xpa_bias_level_get(struct ath_hw *ah, bool is2ghz)
 static void ar9003_hw_xpa_bias_level_apply(struct ath_hw *ah, bool is2ghz)
 {
         int bias = ar9003_hw_xpa_bias_level_get(ah, is2ghz);
-        REG_RMW_FIELD(ah, AR_CH0_TOP, AR_CH0_TOP_XPABIASLVL, (bias & 0x3));
-        REG_RMW_FIELD(ah, AR_CH0_THERM, AR_CH0_THERM_SPARE,
-                      ((bias >> 2) & 0x3));
+        REG_RMW_FIELD(ah, AR_CH0_TOP, AR_CH0_TOP_XPABIASLVL, bias);
+        REG_RMW_FIELD(ah, AR_CH0_THERM, AR_CH0_THERM_XPABIASLVL_MSB, bias >> 2);
+        REG_RMW_FIELD(ah, AR_CH0_THERM, AR_CH0_THERM_XPASHORT2GND, 1);
 }
 
 static u32 ar9003_hw_ant_ctrl_common_get(struct ath_hw *ah, bool is2ghz)
@@ -1097,6 +3548,82 @@ static void ar9003_hw_drive_strength_apply(struct ath_hw *ah)
         REG_WRITE(ah, AR_PHY_65NM_CH0_BIAS4, reg);
 }
 
+static u16 ar9003_hw_atten_chain_get(struct ath_hw *ah, int chain,
+                                     struct ath9k_channel *chan)
+{
+        int f[3], t[3];
+        u16 value;
+        struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+
+        if (chain >= 0 && chain < 3) {
+                if (IS_CHAN_2GHZ(chan))
+                        return eep->modalHeader2G.xatten1DB[chain];
+                else if (eep->base_ext2.xatten1DBLow[chain] != 0) {
+                        t[0] = eep->base_ext2.xatten1DBLow[chain];
+                        f[0] = 5180;
+                        t[1] = eep->modalHeader5G.xatten1DB[chain];
+                        f[1] = 5500;
+                        t[2] = eep->base_ext2.xatten1DBHigh[chain];
+                        f[2] = 5785;
+                        value = ar9003_hw_power_interpolate((s32) chan->channel,
+                                                            f, t, 3);
+                        return value;
+                } else
+                        return eep->modalHeader5G.xatten1DB[chain];
+        }
+
+        return 0;
+}
+
+
+static u16 ar9003_hw_atten_chain_get_margin(struct ath_hw *ah, int chain,
+                                            struct ath9k_channel *chan)
+{
+        int f[3], t[3];
+        u16 value;
+        struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+
+        if (chain >= 0 && chain < 3) {
+                if (IS_CHAN_2GHZ(chan))
+                        return eep->modalHeader2G.xatten1Margin[chain];
+                else if (eep->base_ext2.xatten1MarginLow[chain] != 0) {
+                        t[0] = eep->base_ext2.xatten1MarginLow[chain];
+                        f[0] = 5180;
+                        t[1] = eep->modalHeader5G.xatten1Margin[chain];
+                        f[1] = 5500;
+                        t[2] = eep->base_ext2.xatten1MarginHigh[chain];
+                        f[2] = 5785;
+                        value = ar9003_hw_power_interpolate((s32) chan->channel,
+                                                            f, t, 3);
+                        return value;
+                } else
+                        return eep->modalHeader5G.xatten1Margin[chain];
+        }
+
+        return 0;
+}
+
+static void ar9003_hw_atten_apply(struct ath_hw *ah, struct ath9k_channel *chan)
+{
+        int i;
+        u16 value;
+        unsigned long ext_atten_reg[3] = {AR_PHY_EXT_ATTEN_CTL_0,
+                                          AR_PHY_EXT_ATTEN_CTL_1,
+                                          AR_PHY_EXT_ATTEN_CTL_2,
+                                         };
+
+        /* Test value. if 0 then attenuation is unused. Don't load anything. */
+        for (i = 0; i < 3; i++) {
+                value = ar9003_hw_atten_chain_get(ah, i, chan);
+                REG_RMW_FIELD(ah, ext_atten_reg[i],
+                              AR_PHY_EXT_ATTEN_CTL_XATTEN1_DB, value);
+
+                value = ar9003_hw_atten_chain_get_margin(ah, i, chan);
+                REG_RMW_FIELD(ah, ext_atten_reg[i],
+                              AR_PHY_EXT_ATTEN_CTL_XATTEN1_MARGIN, value);
+        }
+}
+
 static void ar9003_hw_internal_regulator_apply(struct ath_hw *ah)
 {
         int internal_regulator =
@@ -1128,6 +3655,7 @@ static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,
         ar9003_hw_xpa_bias_level_apply(ah, IS_CHAN_2GHZ(chan));
         ar9003_hw_ant_ctrl_apply(ah, IS_CHAN_2GHZ(chan));
         ar9003_hw_drive_strength_apply(ah);
+        ar9003_hw_atten_apply(ah, chan);
         ar9003_hw_internal_regulator_apply(ah);
 }
 
@@ -1189,7 +3717,7 @@ static int ar9003_hw_power_interpolate(int32_t x,
                         if (hx == lx)
                                 y = ly;
                         else    /* interpolate  */
-                                y = ly + (((x - lx) * (hy - ly)) / (hx - lx));
+                                y = interpolate(x, lx, hx, ly, hy);
                 } else          /* only low is good, use it */
                         y = ly;
         } else if (hhave)       /* only high is good, use it */
@@ -1637,6 +4165,7 @@ static int ar9003_hw_power_control_override(struct ath_hw *ah,
 {
         int tempSlope = 0;
         struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+        int f[3], t[3];
 
         REG_RMW(ah, AR_PHY_TPC_11_B0,
                 (correction[0] << AR_PHY_TPC_OLPC_GAIN_DELTA_S),
@@ -1665,7 +4194,16 @@ static int ar9003_hw_power_control_override(struct ath_hw *ah,
          */
         if (frequency < 4000)
                 tempSlope = eep->modalHeader2G.tempSlope;
-        else
+        else if (eep->base_ext2.tempSlopeLow != 0) {
+                t[0] = eep->base_ext2.tempSlopeLow;
+                f[0] = 5180;
+                t[1] = eep->modalHeader5G.tempSlope;
+                f[1] = 5500;
+                t[2] = eep->base_ext2.tempSlopeHigh;
+                f[2] = 5785;
+                tempSlope = ar9003_hw_power_interpolate((s32) frequency,
+                                                        f, t, 3);
+        } else
                 tempSlope = eep->modalHeader5G.tempSlope;
 
         REG_RMW_FIELD(ah, AR_PHY_TPC_19, AR_PHY_TPC_19_ALPHA_THERM, tempSlope);
@@ -1769,25 +4307,23 @@ static int ar9003_hw_calibration_apply(struct ath_hw *ah, int frequency)
                         /* so is the high frequency, interpolate */
                         if (hfrequency[ichain] - frequency < 1000) {
 
-                                correction[ichain] = lcorrection[ichain] +
-                                    (((frequency - lfrequency[ichain]) *
-                                      (hcorrection[ichain] -
-                                       lcorrection[ichain])) /
-                                     (hfrequency[ichain] - lfrequency[ichain]));
-
-                                temperature[ichain] = ltemperature[ichain] +
-                                    (((frequency - lfrequency[ichain]) *
-                                      (htemperature[ichain] -
-                                       ltemperature[ichain])) /
-                                     (hfrequency[ichain] - lfrequency[ichain]));
-
-                                voltage[ichain] =
-                                    lvoltage[ichain] +
-                                    (((frequency -
-                                       lfrequency[ichain]) * (hvoltage[ichain] -
-                                                              lvoltage[ichain]))
-                                     / (hfrequency[ichain] -
-                                        lfrequency[ichain]));
+                                correction[ichain] = interpolate(frequency,
+                                                lfrequency[ichain],
+                                                hfrequency[ichain],
+                                                lcorrection[ichain],
+                                                hcorrection[ichain]);
+
+                                temperature[ichain] = interpolate(frequency,
+                                                lfrequency[ichain],
+                                                hfrequency[ichain],
+                                                ltemperature[ichain],
+                                                htemperature[ichain]);
+
+                                voltage[ichain] = interpolate(frequency,
+                                                lfrequency[ichain],
+                                                hfrequency[ichain],
+                                                lvoltage[ichain],
+                                                hvoltage[ichain]);
                         }
                         /* only low is good, use it */
                         else {
@@ -1919,14 +4455,16 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
         int i;
         int16_t  twiceLargestAntenna;
         u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
-        u16 ctlModesFor11a[] = {
+        static const u16 ctlModesFor11a[] = {
                 CTL_11A, CTL_5GHT20, CTL_11A_EXT, CTL_5GHT40
         };
-        u16 ctlModesFor11g[] = {
+        static const u16 ctlModesFor11g[] = {
                 CTL_11B, CTL_11G, CTL_2GHT20, CTL_11B_EXT,
                 CTL_11G_EXT, CTL_2GHT40
         };
-        u16 numCtlModes, *pCtlMode, ctlMode, freq;
+        u16 numCtlModes;
+        const u16 *pCtlMode;
+        u16 ctlMode, freq;
         struct chan_centers centers;
         u8 *ctlIndex;
         u8 ctlNum;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index 3c533bb983c..57f64dbbcd8 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@ -79,6 +79,15 @@
 #define FIXED_CCA_THRESHOLD 15
 
 #define AR9300_BASE_ADDR 0x3ff
+#define AR9300_BASE_ADDR_512 0x1ff
+
+#define AR9300_OTP_BASE                 0x14000
+#define AR9300_OTP_STATUS               0x15f18
+#define AR9300_OTP_STATUS_TYPE          0x7
+#define AR9300_OTP_STATUS_VALID         0x4
+#define AR9300_OTP_STATUS_ACCESS_BUSY   0x2
+#define AR9300_OTP_STATUS_SM_BUSY       0x1
+#define AR9300_OTP_READ_DATA            0x15f1c
 
 enum targetPowerHTRates {
         HT_TARGET_RATE_0_8_16,
@@ -236,7 +245,7 @@ struct ar9300_modal_eep_header {
         u8 thresh62;
         __le32 papdRateMaskHt20;
         __le32 papdRateMaskHt40;
-        u8 futureModal[24];
+        u8 futureModal[10];
 } __packed;
 
 struct ar9300_cal_data_per_freq_op_loop {
@@ -274,6 +283,20 @@ struct cal_ctl_data_5g {
         struct cal_ctl_edge_pwr ctlEdges[AR9300_NUM_BAND_EDGES_5G];
 } __packed;
 
+struct ar9300_BaseExtension_1 {
+        u8 ant_div_control;
+        u8 future[13];
+} __packed;
+
+struct ar9300_BaseExtension_2 {
+        int8_t    tempSlopeLow;
+        int8_t    tempSlopeHigh;
+        u8   xatten1DBLow[AR9300_MAX_CHAINS];
+        u8   xatten1MarginLow[AR9300_MAX_CHAINS];
+        u8   xatten1DBHigh[AR9300_MAX_CHAINS];
+        u8   xatten1MarginHigh[AR9300_MAX_CHAINS];
+} __packed;
+
 struct ar9300_eeprom {
         u8 eepromVersion;
         u8 templateVersion;
@@ -283,6 +306,7 @@ struct ar9300_eeprom {
         struct ar9300_base_eep_hdr baseEepHeader;
 
         struct ar9300_modal_eep_header modalHeader2G;
+        struct ar9300_BaseExtension_1 base_ext1;
         u8 calFreqPier2G[AR9300_NUM_2G_CAL_PIERS];
         struct ar9300_cal_data_per_freq_op_loop
          calPierData2G[AR9300_MAX_CHAINS][AR9300_NUM_2G_CAL_PIERS];
@@ -302,6 +326,7 @@ struct ar9300_eeprom {
         u8 ctl_freqbin_2G[AR9300_NUM_CTLS_2G][AR9300_NUM_BAND_EDGES_2G];
         struct cal_ctl_data_2g ctlPowerData_2G[AR9300_NUM_CTLS_2G];
         struct ar9300_modal_eep_header modalHeader5G;
+        struct ar9300_BaseExtension_2 base_ext2;
         u8 calFreqPier5G[AR9300_NUM_5G_CAL_PIERS];
         struct ar9300_cal_data_per_freq_op_loop
          calPierData5G[AR9300_MAX_CHAINS][AR9300_NUM_5G_CAL_PIERS];
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
index 10c812e353a..f5896aa3000 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -410,12 +410,36 @@ static void ar9003_hw_set11n_ratescenario(struct ath_hw *ah, void *ds,
 static void ar9003_hw_set11n_aggr_first(struct ath_hw *ah, void *ds,
                                         u32 aggrLen)
 {
+#define FIRST_DESC_NDELIMS 60
         struct ar9003_txc *ads = (struct ar9003_txc *) ds;
 
         ads->ctl12 |= (AR_IsAggr | AR_MoreAggr);
 
-        ads->ctl17 &= ~AR_AggrLen;
-        ads->ctl17 |= SM(aggrLen, AR_AggrLen);
+        if (ah->ent_mode & AR_ENT_OTP_MPSD) {
+                u32 ctl17, ndelim;
+                /*
+                 * Add delimiter when using RTS/CTS with aggregation
+                 * and non enterprise AR9003 card
+                 */
+                ctl17 = ads->ctl17;
+                ndelim = MS(ctl17, AR_PadDelim);
+
+                if (ndelim < FIRST_DESC_NDELIMS) {
+                        aggrLen += (FIRST_DESC_NDELIMS - ndelim) * 4;
+                        ndelim = FIRST_DESC_NDELIMS;
+                }
+
+                ctl17 &= ~AR_AggrLen;
+                ctl17 |= SM(aggrLen, AR_AggrLen);
+
+                ctl17 &= ~AR_PadDelim;
+                ctl17 |= SM(ndelim, AR_PadDelim);
+
+                ads->ctl17 = ctl17;
+        } else {
+                ads->ctl17 &= ~AR_AggrLen;
+                ads->ctl17 |= SM(aggrLen, AR_AggrLen);
+        }
 }
 
 static void ar9003_hw_set11n_aggr_middle(struct ath_hw *ah, void *ds,
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
index 716db414c25..850bc9866c1 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
@@ -32,12 +32,12 @@ static void ar9003_paprd_setup_single_table(struct ath_hw *ah)
 {
         struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
         struct ar9300_modal_eep_header *hdr;
-        const u32 ctrl0[3] = {
+        static const u32 ctrl0[3] = {
                 AR_PHY_PAPRD_CTRL0_B0,
                 AR_PHY_PAPRD_CTRL0_B1,
                 AR_PHY_PAPRD_CTRL0_B2
         };
-        const u32 ctrl1[3] = {
+        static const u32 ctrl1[3] = {
                 AR_PHY_PAPRD_CTRL1_B0,
                 AR_PHY_PAPRD_CTRL1_B1,
                 AR_PHY_PAPRD_CTRL1_B2
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 44c5454b2ad..656d8ce251a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -128,7 +128,7 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
 static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,
                                             struct ath9k_channel *chan)
 {
-        u32 spur_freq[4] = { 2420, 2440, 2464, 2480 };
+        static const u32 spur_freq[4] = { 2420, 2440, 2464, 2480 };
         int cur_bb_spur, negative = 0, cck_spur_freq;
         int i;
 
@@ -1113,10 +1113,55 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah)
         aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK;
 }
 
+static void ar9003_hw_set_radar_params(struct ath_hw *ah,
+                                       struct ath_hw_radar_conf *conf)
+{
+        u32 radar_0 = 0, radar_1 = 0;
+
+        if (!conf) {
+                REG_CLR_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_ENA);
+                return;
+        }
+
+        radar_0 |= AR_PHY_RADAR_0_ENA | AR_PHY_RADAR_0_FFT_ENA;
+        radar_0 |= SM(conf->fir_power, AR_PHY_RADAR_0_FIRPWR);
+        radar_0 |= SM(conf->radar_rssi, AR_PHY_RADAR_0_RRSSI);
+        radar_0 |= SM(conf->pulse_height, AR_PHY_RADAR_0_HEIGHT);
+        radar_0 |= SM(conf->pulse_rssi, AR_PHY_RADAR_0_PRSSI);
+        radar_0 |= SM(conf->pulse_inband, AR_PHY_RADAR_0_INBAND);
+
+        radar_1 |= AR_PHY_RADAR_1_MAX_RRSSI;
+        radar_1 |= AR_PHY_RADAR_1_BLOCK_CHECK;
+        radar_1 |= SM(conf->pulse_maxlen, AR_PHY_RADAR_1_MAXLEN);
+        radar_1 |= SM(conf->pulse_inband_step, AR_PHY_RADAR_1_RELSTEP_THRESH);
+        radar_1 |= SM(conf->radar_inband, AR_PHY_RADAR_1_RELPWR_THRESH);
+
+        REG_WRITE(ah, AR_PHY_RADAR_0, radar_0);
+        REG_WRITE(ah, AR_PHY_RADAR_1, radar_1);
+        if (conf->ext_channel)
+                REG_SET_BIT(ah, AR_PHY_RADAR_EXT, AR_PHY_RADAR_EXT_ENA);
+        else
+                REG_CLR_BIT(ah, AR_PHY_RADAR_EXT, AR_PHY_RADAR_EXT_ENA);
+}
+
+static void ar9003_hw_set_radar_conf(struct ath_hw *ah)
+{
+        struct ath_hw_radar_conf *conf = &ah->radar_conf;
+
+        conf->fir_power = -28;
+        conf->radar_rssi = 0;
+        conf->pulse_height = 10;
+        conf->pulse_rssi = 24;
+        conf->pulse_inband = 8;
+        conf->pulse_maxlen = 255;
+        conf->pulse_inband_step = 12;
+        conf->radar_inband = 8;
+}
+
 void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
 {
         struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
-        const u32 ar9300_cca_regs[6] = {
+        static const u32 ar9300_cca_regs[6] = {
                 AR_PHY_CCA_0,
                 AR_PHY_CCA_1,
                 AR_PHY_CCA_2,
@@ -1141,8 +1186,10 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
         priv_ops->ani_control = ar9003_hw_ani_control;
         priv_ops->do_getnf = ar9003_hw_do_getnf;
         priv_ops->ani_cache_ini_regs = ar9003_hw_ani_cache_ini_regs;
+        priv_ops->set_radar_params = ar9003_hw_set_radar_params;
 
         ar9003_hw_set_nf_limits(ah);
+        ar9003_hw_set_radar_conf(ah);
         memcpy(ah->nf_regs, ar9300_cca_regs, sizeof(ah->nf_regs));
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index b3180935875..6f90acc5cca 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -86,33 +86,19 @@ struct ath_config {
 /**
  * enum buffer_type - Buffer type flags
  *
- * @BUF_HT: Send this buffer using HT capabilities
  * @BUF_AMPDU: This buffer is an ampdu, as part of an aggregate (during TX)
  * @BUF_AGGR: Indicates whether the buffer can be aggregated
  *      (used in aggregation scheduling)
- * @BUF_RETRY: Indicates whether the buffer is retried
  * @BUF_XRETRY: To denote excessive retries of the buffer
  */
 enum buffer_type {
-        BUF_HT                  = BIT(1),
         BUF_AMPDU               = BIT(2),
         BUF_AGGR                = BIT(3),
-        BUF_RETRY               = BIT(4),
         BUF_XRETRY              = BIT(5),
 };
 
-#define bf_nframes              bf_state.bfs_nframes
-#define bf_al                   bf_state.bfs_al
-#define bf_frmlen               bf_state.bfs_frmlen
-#define bf_retries              bf_state.bfs_retries
-#define bf_seqno                bf_state.bfs_seqno
-#define bf_tidno                bf_state.bfs_tidno
-#define bf_keyix                bf_state.bfs_keyix
-#define bf_keytype              bf_state.bfs_keytype
-#define bf_isht(bf)             (bf->bf_state.bf_type & BUF_HT)
 #define bf_isampdu(bf)          (bf->bf_state.bf_type & BUF_AMPDU)
 #define bf_isaggr(bf)           (bf->bf_state.bf_type & BUF_AGGR)
-#define bf_isretried(bf)        (bf->bf_state.bf_type & BUF_RETRY)
 #define bf_isxretried(bf)       (bf->bf_state.bf_type & BUF_XRETRY)
 
 #define ATH_TXSTATUS_RING_SIZE 64
@@ -177,8 +163,8 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd,
 
 /* returns delimiter padding required given the packet length */
 #define ATH_AGGR_GET_NDELIM(_len)                                       \
-        (((((_len) + ATH_AGGR_DELIM_SZ) < ATH_AGGR_MINPLEN) ?           \
-          (ATH_AGGR_MINPLEN - (_len) - ATH_AGGR_DELIM_SZ) : 0) >> 2)
+       (((_len) >= ATH_AGGR_MINPLEN) ? 0 :                             \
+        DIV_ROUND_UP(ATH_AGGR_MINPLEN - (_len), ATH_AGGR_DELIM_SZ))
 
 #define BAW_WITHIN(_start, _bawsz, _seqno) \
         ((((_seqno) - (_start)) & 4095) < (_bawsz))
@@ -217,18 +203,18 @@ struct ath_atx_ac {
         struct list_head tid_q;
 };
 
+struct ath_frame_info {
+        int framelen;
+        u32 keyix;
+        enum ath9k_key_type keytype;
+        u8 retries;
+        u16 seqno;
+};
+
 struct ath_buf_state {
-        int bfs_nframes;
-        u16 bfs_al;
-        u16 bfs_frmlen;
-        int bfs_seqno;
-        int bfs_tidno;
-        int bfs_retries;
         u8 bf_type;
         u8 bfs_paprd;
-        unsigned long bfs_paprd_timestamp;
-        u32 bfs_keyix;
-        enum ath9k_key_type bfs_keytype;
+        enum ath9k_internal_frame_type bfs_ftype;
 };
 
 struct ath_buf {
@@ -241,7 +227,6 @@ struct ath_buf {
         dma_addr_t bf_daddr;            /* physical addr of desc */
         dma_addr_t bf_buf_addr; /* physical addr of data buffer, for DMA */
         bool bf_stale;
-        bool bf_tx_aborted;
         u16 bf_flags;
         struct ath_buf_state bf_state;
         struct ath_wiphy *aphy;
@@ -278,6 +263,7 @@ struct ath_node {
 
 struct ath_tx_control {
         struct ath_txq *txq;
+        struct ath_node *an;
         int if_id;
         enum ath9k_internal_frame_type frame_type;
         u8 paprd;
@@ -338,7 +324,6 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
                  struct ath_tx_control *txctl);
 void ath_tx_tasklet(struct ath_softc *sc);
 void ath_tx_edma_tasklet(struct ath_softc *sc);
-void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb);
 int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
                       u16 tid, u16 *ssn);
 void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
@@ -603,6 +588,7 @@ struct ath_softc {
         struct work_struct paprd_work;
         struct work_struct hw_check_work;
         struct completion paprd_complete;
+        bool paprd_pending;
 
         u32 intrstatus;
         u32 sc_flags; /* SC_OP_* */
@@ -712,7 +698,7 @@ void ath9k_ps_restore(struct ath_softc *sc);
 void ath9k_set_bssid_mask(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
 int ath9k_wiphy_add(struct ath_softc *sc);
 int ath9k_wiphy_del(struct ath_wiphy *aphy);
-void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb);
+void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, int ftype);
 int ath9k_wiphy_pause(struct ath_wiphy *aphy);
 int ath9k_wiphy_unpause(struct ath_wiphy *aphy);
 int ath9k_wiphy_select(struct ath_wiphy *aphy);
diff --git a/drivers/net/wireless/ath/ath9k/beacon.c b/drivers/net/wireless/ath/ath9k/beacon.c
index 2377376c8d4..30724a4e8bb 100644
--- a/drivers/net/wireless/ath/ath9k/beacon.c
+++ b/drivers/net/wireless/ath/ath9k/beacon.c
@@ -109,6 +109,25 @@ static void ath_beacon_setup(struct ath_softc *sc, struct ath_vif *avp,
                                      series, 4, 0);
 }
 
+static void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
+{
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_tx_control txctl;
+
+        memset(&txctl, 0, sizeof(struct ath_tx_control));
+        txctl.txq = sc->beacon.cabq;
+
+        ath_print(common, ATH_DBG_XMIT,
+                  "transmitting CABQ packet, skb: %p\n", skb);
+
+        if (ath_tx_start(hw, skb, &txctl) != 0) {
+                ath_print(common, ATH_DBG_XMIT, "CABQ TX failed\n");
+                dev_kfree_skb_any(skb);
+        }
+}
+
 static struct ath_buf *ath_beacon_generate(struct ieee80211_hw *hw,
                                            struct ieee80211_vif *vif)
 {
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index c40c534c666..c2481b3ac7e 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -534,7 +534,9 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
         u16 twiceMinEdgePower;
         u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER;
         u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
-        u16 numCtlModes, *pCtlMode, ctlMode, freq;
+        u16 numCtlModes;
+        const u16 *pCtlMode;
+        u16 ctlMode, freq;
         struct chan_centers centers;
         struct cal_ctl_data_4k *rep;
         struct ar5416_eeprom_4k *pEepData = &ah->eeprom.map4k;
@@ -550,10 +552,10 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
         struct cal_target_power_ht targetPowerHt20, targetPowerHt40 = {
                 0, {0, 0, 0, 0}
         };
-        u16 ctlModesFor11g[] =
-                { CTL_11B, CTL_11G, CTL_2GHT20, CTL_11B_EXT, CTL_11G_EXT,
-                  CTL_2GHT40
-                };
+        static const u16 ctlModesFor11g[] = {
+                CTL_11B, CTL_11G, CTL_2GHT20,
+                CTL_11B_EXT, CTL_11G_EXT, CTL_2GHT40
+        };
 
         ath9k_hw_get_channel_centers(ah, chan, &centers);
 
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
index 3ad1de253c8..bcb9ed39c04 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
@@ -37,10 +37,10 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)
         int addr, eep_start_loc;
         eep_data = (u16 *)eep;
 
-        if (AR9287_HTC_DEVID(ah))
-                eep_start_loc = AR9287_HTC_EEP_START_LOC;
-        else
+        if (!common->driver_info)
                 eep_start_loc = AR9287_EEP_START_LOC;
+        else
+                eep_start_loc = AR9287_HTC_EEP_START_LOC;
 
         if (!ath9k_hw_use_flash(ah)) {
                 ath_print(common, ATH_DBG_EEPROM,
@@ -626,13 +626,13 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,
         struct cal_target_power_ht targetPowerHt20,
                                     targetPowerHt40 = {0, {0, 0, 0, 0} };
         u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
-        u16 ctlModesFor11g[] = {CTL_11B,
-                                CTL_11G,
-                                CTL_2GHT20,
-                                CTL_11B_EXT,
-                                CTL_11G_EXT,
-                                CTL_2GHT40};
-        u16 numCtlModes = 0, *pCtlMode = NULL, ctlMode, freq;
+        static const u16 ctlModesFor11g[] = {
+                CTL_11B, CTL_11G, CTL_2GHT20,
+                CTL_11B_EXT, CTL_11G_EXT, CTL_2GHT40
+        };
+        u16 numCtlModes = 0;
+        const u16 *pCtlMode = NULL;
+        u16 ctlMode, freq;
         struct chan_centers centers;
         int tx_chainmask;
         u16 twiceMinEdgePower;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index a819ddc9fdb..e94216e1e10 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -1021,13 +1021,16 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
                 0, {0, 0, 0, 0}
         };
         u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
-        u16 ctlModesFor11a[] =
-                { CTL_11A, CTL_5GHT20, CTL_11A_EXT, CTL_5GHT40 };
-        u16 ctlModesFor11g[] =
-                { CTL_11B, CTL_11G, CTL_2GHT20, CTL_11B_EXT, CTL_11G_EXT,
-                  CTL_2GHT40
-                };
-        u16 numCtlModes, *pCtlMode, ctlMode, freq;
+        static const u16 ctlModesFor11a[] = {
+                CTL_11A, CTL_5GHT20, CTL_11A_EXT, CTL_5GHT40
+        };
+        static const u16 ctlModesFor11g[] = {
+                CTL_11B, CTL_11G, CTL_2GHT20,
+                CTL_11B_EXT, CTL_11G_EXT, CTL_2GHT40
+        };
+        u16 numCtlModes;
+        const u16 *pCtlMode;
+        u16 ctlMode, freq;
         struct chan_centers centers;
         int tx_chainmask;
         u16 twiceMinEdgePower;
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index dfb6560dab9..ae842dbf9b5 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -28,10 +28,16 @@ MODULE_FIRMWARE(FIRMWARE_AR9271);
 static struct usb_device_id ath9k_hif_usb_ids[] = {
         { USB_DEVICE(0x0cf3, 0x9271) }, /* Atheros */
         { USB_DEVICE(0x0cf3, 0x1006) }, /* Atheros */
-        { USB_DEVICE(0x0cf3, 0x7010) }, /* Atheros */
-        { USB_DEVICE(0x0cf3, 0x7015) }, /* Atheros */
+        { USB_DEVICE(0x0cf3, 0x7010),
+                .driver_info = AR7010_DEVICE },
+                                        /* Atheros */
+        { USB_DEVICE(0x0cf3, 0x7015),
+                .driver_info = AR7010_DEVICE | AR9287_DEVICE },
+                                        /* Atheros */
         { USB_DEVICE(0x0846, 0x9030) }, /* Netgear N150 */
-        { USB_DEVICE(0x0846, 0x9018) }, /* Netgear WNDA3200 */
+        { USB_DEVICE(0x0846, 0x9018),
+                .driver_info = AR7010_DEVICE },
+                                        /* Netgear WNDA3200 */
         { USB_DEVICE(0x07D1, 0x3A10) }, /* Dlink Wireless 150 */
         { USB_DEVICE(0x13D3, 0x3327) }, /* Azurewave */
         { USB_DEVICE(0x13D3, 0x3328) }, /* Azurewave */
@@ -40,9 +46,13 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
         { USB_DEVICE(0x13D3, 0x3349) }, /* Azurewave */
         { USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
         { USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
-        { USB_DEVICE(0x083A, 0xA704) }, /* SMC Networks */
+        { USB_DEVICE(0x083A, 0xA704),
+                .driver_info = AR7010_DEVICE },
+                                        /* SMC Networks */
         { USB_DEVICE(0x040D, 0x3801) }, /* VIA */
-        { USB_DEVICE(0x1668, 0x1200) }, /* Verizon */
+        { USB_DEVICE(0x1668, 0x1200),
+                .driver_info = AR7010_DEVICE | AR9287_DEVICE },
+                                        /* Verizon */
         { },
 };
 
@@ -776,7 +786,8 @@ static void ath9k_hif_usb_dealloc_urbs(struct hif_device_usb *hif_dev)
         ath9k_hif_usb_dealloc_rx_urbs(hif_dev);
 }
 
-static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
+static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev,
+                                     u32 drv_info)
 {
         int transfer, err;
         const void *data = hif_dev->firmware->data;
@@ -807,18 +818,10 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
         }
         kfree(buf);
 
-        switch (hif_dev->device_id) {
-        case 0x7010:
-        case 0x7015:
-        case 0x9018:
-        case 0xA704:
-        case 0x1200:
+        if (drv_info & AR7010_DEVICE)
                 firm_offset = AR7010_FIRMWARE_TEXT;
-                break;
-        default:
+        else
                 firm_offset = AR9271_FIRMWARE_TEXT;
-                break;
-        }
 
         /*
          * Issue FW download complete command to firmware.
@@ -836,7 +839,7 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
         return 0;
 }
 
-static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev)
+static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev, u32 drv_info)
 {
         int ret, idx;
         struct usb_host_interface *alt = &hif_dev->interface->altsetting[0];
@@ -852,7 +855,7 @@ static int ath9k_hif_usb_dev_init(struct hif_device_usb *hif_dev)
         }
 
         /* Download firmware */
-        ret = ath9k_hif_usb_download_fw(hif_dev);
+        ret = ath9k_hif_usb_download_fw(hif_dev, drv_info);
         if (ret) {
                 dev_err(&hif_dev->udev->dev,
                         "ath9k_htc: Firmware - %s download failed\n",
@@ -931,23 +934,15 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
 
         /* Find out which firmware to load */
 
-        switch(hif_dev->device_id) {
-        case 0x7010:
-        case 0x7015:
-        case 0x9018:
-        case 0xA704:
-        case 0x1200:
+        if (id->driver_info & AR7010_DEVICE)
                 if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
                         hif_dev->fw_name = FIRMWARE_AR7010_1_1;
                 else
                         hif_dev->fw_name = FIRMWARE_AR7010;
-                break;
-        default:
+        else
                 hif_dev->fw_name = FIRMWARE_AR9271;
-                break;
-        }
 
-        ret = ath9k_hif_usb_dev_init(hif_dev);
+        ret = ath9k_hif_usb_dev_init(hif_dev, id->driver_info);
         if (ret) {
                 ret = -EINVAL;
                 goto err_hif_init_usb;
@@ -955,7 +950,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
 
         ret = ath9k_htc_hw_init(hif_dev->htc_handle,
                                 &hif_dev->udev->dev, hif_dev->device_id,
-                                hif_dev->udev->product);
+                                hif_dev->udev->product, id->driver_info);
         if (ret) {
                 ret = -EINVAL;
                 goto err_htc_hw_init;
@@ -1033,6 +1028,7 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface)
 {
         struct hif_device_usb *hif_dev =
                 (struct hif_device_usb *) usb_get_intfdata(interface);
+        struct htc_target *htc_handle = hif_dev->htc_handle;
         int ret;
 
         ret = ath9k_hif_usb_alloc_urbs(hif_dev);
@@ -1040,7 +1036,8 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface)
                 return ret;
 
         if (hif_dev->firmware) {
-                ret = ath9k_hif_usb_download_fw(hif_dev);
+                ret = ath9k_hif_usb_download_fw(hif_dev,
+                                htc_handle->drv_priv->ah->common.driver_info);
                 if (ret)
                         goto fail_resume;
         } else {
@@ -1050,7 +1047,7 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface)
 
         mdelay(100);
 
-        ret = ath9k_htc_resume(hif_dev->htc_handle);
+        ret = ath9k_htc_resume(htc_handle);
 
         if (ret)
                 goto fail_resume;
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index 75ecf6a30d2..afe39a91190 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -368,7 +368,7 @@ struct ath9k_htc_priv {
         u16 seq_no;
         u32 bmiss_cnt;
 
-        struct ath9k_hw_cal_data caldata[38];
+        struct ath9k_hw_cal_data caldata[ATH9K_NUM_CHANNELS];
 
         spinlock_t beacon_lock;
 
@@ -461,7 +461,7 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv);
 void ath9k_deinit_leds(struct ath9k_htc_priv *priv);
 
 int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev,
-                           u16 devid, char *product);
+                           u16 devid, char *product, u32 drv_info);
 void ath9k_htc_disconnect_device(struct htc_target *htc_handle, bool hotunplug);
 #ifdef CONFIG_PM
 int ath9k_htc_resume(struct htc_target *htc_handle);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 7c8a38d0456..071d0c97474 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -181,7 +181,8 @@ static inline int ath9k_htc_connect_svc(struct ath9k_htc_priv *priv,
         return htc_connect_service(priv->htc, &req, ep_id);
 }
 
-static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid)
+static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid,
+                                   u32 drv_info)
 {
         int ret;
 
@@ -245,17 +246,10 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid)
          * the HIF layer, shouldn't matter much.
          */
 
-        switch(devid) {
-        case 0x7010:
-        case 0x7015:
-        case 0x9018:
-        case 0xA704:
-        case 0x1200:
+        if (drv_info & AR7010_DEVICE)
                 priv->htc->credits = 45;
-                break;
-        default:
+        else
                 priv->htc->credits = 33;
-        }
 
         ret = htc_init(priv->htc);
         if (ret)
@@ -308,7 +302,7 @@ static void ath9k_regwrite_single(void *hw_priv, u32 val, u32 reg_offset)
         struct ath_hw *ah = (struct ath_hw *) hw_priv;
         struct ath_common *common = ath9k_hw_common(ah);
         struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
-        __be32 buf[2] = {
+        const __be32 buf[2] = {
                 cpu_to_be32(reg_offset),
                 cpu_to_be32(val),
         };
@@ -627,7 +621,8 @@ static void ath9k_init_btcoex(struct ath9k_htc_priv *priv)
 }
 
 static int ath9k_init_priv(struct ath9k_htc_priv *priv,
-                           u16 devid, char *product)
+                           u16 devid, char *product,
+                           u32 drv_info)
 {
         struct ath_hw *ah = NULL;
         struct ath_common *common;
@@ -641,6 +636,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
 
         ah->hw_version.devid = devid;
         ah->hw_version.subsysid = 0; /* FIXME */
+        ah->ah_flags |= AH_USE_EEPROM;
         priv->ah = ah;
 
         common = ath9k_hw_common(ah);
@@ -650,6 +646,7 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
         common->hw = priv->hw;
         common->priv = priv;
         common->debug_mask = ath9k_debug;
+        common->driver_info = drv_info;
 
         spin_lock_init(&priv->wmi->wmi_lock);
         spin_lock_init(&priv->beacon_lock);
@@ -762,7 +759,7 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
 }
 
 static int ath9k_init_device(struct ath9k_htc_priv *priv,
-                             u16 devid, char *product)
+                             u16 devid, char *product, u32 drv_info)
 {
         struct ieee80211_hw *hw = priv->hw;
         struct ath_common *common;
@@ -771,7 +768,7 @@ static int ath9k_init_device(struct ath9k_htc_priv *priv,
         struct ath_regulatory *reg;
 
         /* Bring up device */
-        error = ath9k_init_priv(priv, devid, product);
+        error = ath9k_init_priv(priv, devid, product, drv_info);
         if (error != 0)
                 goto err_init;
 
@@ -829,7 +826,7 @@ err_init:
 }
 
 int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev,
-                           u16 devid, char *product)
+                           u16 devid, char *product, u32 drv_info)
 {
         struct ieee80211_hw *hw;
         struct ath9k_htc_priv *priv;
@@ -856,14 +853,14 @@ int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev,
                 goto err_free;
         }
 
-        ret = ath9k_init_htc_services(priv, devid);
+        ret = ath9k_init_htc_services(priv, devid, drv_info);
         if (ret)
                 goto err_init;
 
         /* The device may have been unplugged earlier. */
         priv->op_flags &= ~OP_UNPLUGGED;
 
-        ret = ath9k_init_device(priv, devid, product);
+        ret = ath9k_init_device(priv, devid, product, drv_info);
         if (ret)
                 goto err_init;
 
@@ -893,14 +890,15 @@ void ath9k_htc_disconnect_device(struct htc_target *htc_handle, bool hotunplug)
 #ifdef CONFIG_PM
 int ath9k_htc_resume(struct htc_target *htc_handle)
 {
+        struct ath9k_htc_priv *priv = htc_handle->drv_priv;
         int ret;
 
-        ret = ath9k_htc_wait_for_target(htc_handle->drv_priv);
+        ret = ath9k_htc_wait_for_target(priv);
         if (ret)
                 return ret;
 
-        ret = ath9k_init_htc_services(htc_handle->drv_priv,
-                              htc_handle->drv_priv->ah->hw_version.devid);
+        ret = ath9k_init_htc_services(priv, priv->ah->hw_version.devid,
+                                      priv->ah->common.driver_info);
         return ret;
 }
 #endif
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 861ec926930..c41ab8c3016 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -462,9 +462,10 @@ void ath9k_htc_hw_free(struct htc_target *htc)
 }
 
 int ath9k_htc_hw_init(struct htc_target *target,
-                      struct device *dev, u16 devid, char *product)
+                      struct device *dev, u16 devid,
+                      char *product, u32 drv_info)
 {
-        if (ath9k_htc_probe_device(target, dev, devid, product)) {
+        if (ath9k_htc_probe_device(target, dev, devid, product, drv_info)) {
                 printk(KERN_ERR "Failed to initialize the device\n");
                 return -ENODEV;
         }
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.h b/drivers/net/wireless/ath/ath9k/htc_hst.h
index 07b6509d589..6fc1b21faa5 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.h
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.h
@@ -239,7 +239,8 @@ struct htc_target *ath9k_htc_hw_alloc(void *hif_handle,
                                       struct device *dev);
 void ath9k_htc_hw_free(struct htc_target *htc);
 int ath9k_htc_hw_init(struct htc_target *target,
-                      struct device *dev, u16 devid, char *product);
+                      struct device *dev, u16 devid, char *product,
+                      u32 drv_info);
 void ath9k_htc_hw_deinit(struct htc_target *target, bool hot_unplug);
 
 #endif /* HTC_HST_H */
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 5fb1bf33faa..ce9e59f4cd3 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -310,10 +310,9 @@ static bool ath9k_hw_chip_test(struct ath_hw *ah)
         struct ath_common *common = ath9k_hw_common(ah);
         u32 regAddr[2] = { AR_STA_ID0 };
         u32 regHold[2];
-        u32 patternData[4] = { 0x55555555,
-                               0xaaaaaaaa,
-                               0x66666666,
-                               0x99999999 };
+        static const u32 patternData[4] = {
+                0x55555555, 0xaaaaaaaa, 0x66666666, 0x99999999
+        };
         int i, j, loop_max;
 
         if (!AR_SREV_9300_20_OR_LATER(ah)) {
@@ -419,10 +418,6 @@ static void ath9k_hw_init_defaults(struct ath_hw *ah)
         ah->hw_version.magic = AR5416_MAGIC;
         ah->hw_version.subvendorid = 0;
 
-        ah->ah_flags = 0;
-        if (!AR_SREV_9100(ah))
-                ah->ah_flags = AH_USE_EEPROM;
-
         ah->atim_window = 0;
         ah->sta_id1_defaults =
                 AR_STA_ID1_CRPT_MIC_ENABLE |
@@ -440,7 +435,7 @@ static int ath9k_hw_init_macaddr(struct ath_hw *ah)
         u32 sum;
         int i;
         u16 eeval;
-        u32 EEP_MAC[] = { EEP_MAC_LSW, EEP_MAC_MID, EEP_MAC_MSW };
+        static const u32 EEP_MAC[] = { EEP_MAC_LSW, EEP_MAC_MID, EEP_MAC_MSW };
 
         sum = 0;
         for (i = 0; i < 3; i++) {
@@ -1833,6 +1828,10 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
 
         ah->misc_mode |= AR_PCU_MIC_NEW_LOC_ENA;
 
+        /* enable key search for every frame in an aggregate */
+        if (AR_SREV_9300_20_OR_LATER(ah))
+                ah->misc_mode |= AR_PCU_ALWAYS_PERFORM_KEYSEARCH;
+
         pCap->low_2ghz_chan = 2312;
         pCap->high_2ghz_chan = 2732;
 
@@ -1963,6 +1962,9 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
         if (AR_SREV_9300_20_OR_LATER(ah))
                 pCap->hw_caps |= ATH9K_HW_CAP_RAC_SUPPORTED;
 
+        if (AR_SREV_9300_20_OR_LATER(ah))
+                ah->ent_mode = REG_READ(ah, AR_ENT_OTP);
+
         if (AR_SREV_9287_11_OR_LATER(ah) || AR_SREV_9271(ah))
                 pCap->hw_caps |= ATH9K_HW_CAP_SGI_20;
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index e29c7122f46..cc8f3b9af71 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -485,6 +485,40 @@ struct ath_hw_antcomb_conf {
 };
 
 /**
+ * struct ath_hw_radar_conf - radar detection initialization parameters
+ *
+ * @pulse_inband: threshold for checking the ratio of in-band power
+ *      to total power for short radar pulses (half dB steps)
+ * @pulse_inband_step: threshold for checking an in-band power to total
+ *      power ratio increase for short radar pulses (half dB steps)
+ * @pulse_height: threshold for detecting the beginning of a short
+ *      radar pulse (dB step)
+ * @pulse_rssi: threshold for detecting if a short radar pulse is
+ *      gone (dB step)
+ * @pulse_maxlen: maximum pulse length (0.8 us steps)
+ *
+ * @radar_rssi: RSSI threshold for starting long radar detection (dB steps)
+ * @radar_inband: threshold for checking the ratio of in-band power
+ *      to total power for long radar pulses (half dB steps)
+ * @fir_power: threshold for detecting the end of a long radar pulse (dB)
+ *
+ * @ext_channel: enable extension channel radar detection
+ */
+struct ath_hw_radar_conf {
+        unsigned int pulse_inband;
+        unsigned int pulse_inband_step;
+        unsigned int pulse_height;
+        unsigned int pulse_rssi;
+        unsigned int pulse_maxlen;
+
+        unsigned int radar_rssi;
+        unsigned int radar_inband;
+        int fir_power;
+
+        bool ext_channel;
+};
+
+/**
  * struct ath_hw_private_ops - callbacks used internally by hardware code
  *
  * This structure contains private callbacks designed to only be used internally
@@ -549,6 +583,8 @@ struct ath_hw_private_ops {
         bool (*ani_control)(struct ath_hw *ah, enum ath9k_ani_cmd cmd,
                             int param);
         void (*do_getnf)(struct ath_hw *ah, int16_t nfarray[NUM_NF_READINGS]);
+        void (*set_radar_params)(struct ath_hw *ah,
+                                 struct ath_hw_radar_conf *conf);
 
         /* ANI */
         void (*ani_cache_ini_regs)(struct ath_hw *ah);
@@ -747,6 +783,8 @@ struct ath_hw {
         u8 txchainmask;
         u8 rxchainmask;
 
+        struct ath_hw_radar_conf radar_conf;
+
         u32 originalGain[22];
         int initPDADC;
         int PDADCdelta;
@@ -804,6 +842,9 @@ struct ath_hw {
          * this register when in sleep states.
          */
         u32 WARegVal;
+
+        /* Enterprise mode cap */
+        u32 ent_mode;
 };
 
 static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 5c26818d79e..7eef1faee66 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -533,6 +533,9 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
         ah->hw_version.subsysid = subsysid;
         sc->sc_ah = ah;
 
+        if (!sc->dev->platform_data)
+                ah->ah_flags |= AH_USE_EEPROM;
+
         common = ath9k_hw_common(ah);
         common->ops = &ath9k_common_ops;
         common->bus_ops = bus_ops;
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 65b1ee2a979..b04b37b1124 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -766,14 +766,6 @@ void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning)
 }
 EXPORT_SYMBOL(ath9k_hw_startpcureceive);
 
-void ath9k_hw_stoppcurecv(struct ath_hw *ah)
-{
-        REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_DIS);
-
-        ath9k_hw_disable_mib_counters(ah);
-}
-EXPORT_SYMBOL(ath9k_hw_stoppcurecv);
-
 void ath9k_hw_abortpcurecv(struct ath_hw *ah)
 {
         REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_ABORT | AR_DIAG_RX_DIS);
diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index 22907e21cc4..7512f97e8f4 100644
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -691,7 +691,6 @@ void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds,
 bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set);
 void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp);
 void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning);
-void ath9k_hw_stoppcurecv(struct ath_hw *ah);
 void ath9k_hw_abortpcurecv(struct ath_hw *ah);
 bool ath9k_hw_stopdmarecv(struct ath_hw *ah);
 int ath9k_hw_beaconq_setup(struct ath_hw *ah);
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index f8c811af312..50bdb5db23b 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -380,6 +380,7 @@ void ath_paprd_calibrate(struct work_struct *work)
                 }
 
                 init_completion(&sc->paprd_complete);
+                sc->paprd_pending = true;
                 ar9003_paprd_setup_gain_table(ah, chain);
                 txctl.paprd = BIT(chain);
                 if (ath_tx_start(hw, skb, &txctl) != 0)
@@ -387,6 +388,7 @@ void ath_paprd_calibrate(struct work_struct *work)
 
                 time_left = wait_for_completion_timeout(&sc->paprd_complete,
                                 msecs_to_jiffies(ATH_PAPRD_TIMEOUT));
+                sc->paprd_pending = false;
                 if (!time_left) {
                         ath_print(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,
                                   "Timeout waiting for paprd training on "
@@ -1193,12 +1195,10 @@ mutex_unlock:
 static int ath9k_tx(struct ieee80211_hw *hw,
                     struct sk_buff *skb)
 {
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         struct ath_wiphy *aphy = hw->priv;
         struct ath_softc *sc = aphy->sc;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_tx_control txctl;
-        int padpos, padsize;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
 
         if (aphy->state != ATH_WIPHY_ACTIVE && aphy->state != ATH_WIPHY_SCAN) {
@@ -1249,29 +1249,6 @@ static int ath9k_tx(struct ieee80211_hw *hw,
         }
 
         memset(&txctl, 0, sizeof(struct ath_tx_control));
-
-        /*
-         * As a temporary workaround, assign seq# here; this will likely need
-         * to be cleaned up to work better with Beacon transmission and virtual
-         * BSSes.
-         */
-        if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
-                if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
-                        sc->tx.seq_no += 0x10;
-                hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
-                hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no);
-        }
-
-        /* Add the padding after the header if this is not already done */
-        padpos = ath9k_cmn_padpos(hdr->frame_control);
-        padsize = padpos & 3;
-        if (padsize && skb->len>padpos) {
-                if (skb_headroom(skb) < padsize)
-                        return -1;
-                skb_push(skb, padsize);
-                memmove(skb->data, skb->data + padsize, padpos);
-        }
-
         txctl.txq = sc->tx.txq_map[skb_get_queue_mapping(skb)];
 
         ath_print(common, ATH_DBG_XMIT, "transmitting packet, skb: %p\n", skb);
@@ -2015,6 +1992,9 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
         case IEEE80211_AMPDU_RX_STOP:
                 break;
         case IEEE80211_AMPDU_TX_START:
+                if (!(sc->sc_flags & SC_OP_TXAGGR))
+                        return -EOPNOTSUPP;
+
                 ath9k_ps_wakeup(sc);
                 ret = ath_tx_aggr_start(sc, sta, tid, ssn);
                 if (!ret)
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index 6605bc2c203..09f69a9617f 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -16,6 +16,7 @@
 
 #include <linux/nl80211.h>
 #include <linux/pci.h>
+#include <linux/ath9k_platform.h>
 #include "ath9k.h"
 
 static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
@@ -53,21 +54,36 @@ static void ath_pci_read_cachesize(struct ath_common *common, int *csz)
 
 static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data)
 {
-        struct ath_hw *ah = (struct ath_hw *) common->ah;
-
-        common->ops->read(ah, AR5416_EEPROM_OFFSET + (off << AR5416_EEPROM_S));
-
-        if (!ath9k_hw_wait(ah,
-                           AR_EEPROM_STATUS_DATA,
-                           AR_EEPROM_STATUS_DATA_BUSY |
-                           AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0,
-                           AH_WAIT_TIMEOUT)) {
-                return false;
+        struct ath_softc *sc = (struct ath_softc *) common->priv;
+        struct ath9k_platform_data *pdata = sc->dev->platform_data;
+
+        if (pdata) {
+                if (off >= (ARRAY_SIZE(pdata->eeprom_data))) {
+                        ath_print(common, ATH_DBG_FATAL,
+                                  "%s: eeprom read failed, offset %08x "
+                                  "is out of range\n",
+                                  __func__, off);
+                }
+
+                *data = pdata->eeprom_data[off];
+        } else {
+                struct ath_hw *ah = (struct ath_hw *) common->ah;
+
+                common->ops->read(ah, AR5416_EEPROM_OFFSET +
+                                      (off << AR5416_EEPROM_S));
+
+                if (!ath9k_hw_wait(ah,
+                                   AR_EEPROM_STATUS_DATA,
+                                   AR_EEPROM_STATUS_DATA_BUSY |
+                                   AR_EEPROM_STATUS_DATA_PROT_ACCESS, 0,
+                                   AH_WAIT_TIMEOUT)) {
+                        return false;
+                }
+
+                *data = MS(common->ops->read(ah, AR_EEPROM_STATUS_DATA),
+                           AR_EEPROM_STATUS_DATA_VAL);
         }
 
-        *data = MS(common->ops->read(ah, AR_EEPROM_STATUS_DATA),
-                   AR_EEPROM_STATUS_DATA_VAL);
-
         return true;
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 85c8e9310ca..3e6ea3bc3d8 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -864,7 +864,7 @@ static bool ath_rc_update_per(struct ath_softc *sc,
         bool state_change = false;
         int count, n_bad_frames;
         u8 last_per;
-        static u32 nretry_to_per_lookup[10] = {
+        static const u32 nretry_to_per_lookup[10] = {
                 100 * 0 / 1,
                 100 * 1 / 4,
                 100 * 1 / 2,
@@ -1087,13 +1087,13 @@ static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table,
                                 struct ieee80211_tx_rate *rate)
 {
         int rix = 0, i = 0;
-        int mcs_rix_off[] = { 7, 15, 20, 21, 22, 23 };
+        static const int mcs_rix_off[] = { 7, 15, 20, 21, 22, 23 };
 
         if (!(rate->flags & IEEE80211_TX_RC_MCS))
                 return rate->idx;
 
         while (rate->idx > mcs_rix_off[i] &&
-              i < sizeof(mcs_rix_off)/sizeof(int)) {
+               i < ARRAY_SIZE(mcs_rix_off)) {
                 rix++; i++;
         }
 
@@ -1354,23 +1354,7 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband,
                 tx_info->status.ampdu_len = 1;
         }
 
-        /*
-         * If an underrun error is seen assume it as an excessive retry only
-         * if max frame trigger level has been reached (2 KB for singel stream,
-         * and 4 KB for dual stream). Adjust the long retry as if the frame was
-         * tried hw->max_rate_tries times to affect how ratectrl updates PER for
-         * the failed rate. In case of congestion on the bus penalizing these
-         * type of underruns should help hardware actually transmit new frames
-         * successfully by eventually preferring slower rates. This itself
-         * should also alleviate congestion on the bus.
-         */
-        if ((tx_info->pad[0] & ATH_TX_INFO_UNDERRUN) &&
-            (sc->sc_ah->tx_trig_level >= ath_rc_priv->tx_triglevel_max)) {
-                tx_status = 1;
-                is_underrun = 1;
-        }
-
-        if (tx_info->pad[0] & ATH_TX_INFO_XRETRY)
+        if (!(tx_info->flags & IEEE80211_TX_STAT_ACK))
                 tx_status = 1;
 
         ath_rc_tx_status(sc, ath_rc_priv, tx_info, final_ts_idx, tx_status,
@@ -1379,7 +1363,8 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband,
         /* Check if aggregation has to be enabled for this tid */
         if (conf_is_ht(&sc->hw->conf) &&
             !(skb->protocol == cpu_to_be16(ETH_P_PAE))) {
-                if (ieee80211_is_data_qos(fc)) {
+                if (ieee80211_is_data_qos(fc) &&
+                    skb_get_queue_mapping(skb) != IEEE80211_AC_VO) {
                         u8 *qc, tid;
                         struct ath_node *an;
 
@@ -1596,8 +1581,6 @@ static void *ath_rate_alloc_sta(void *priv, struct ieee80211_sta *sta, gfp_t gfp
                 return NULL;
         }
 
-        rate_priv->tx_triglevel_max = sc->sc_ah->caps.tx_triglevel_max;
-
         return rate_priv;
 }
 
diff --git a/drivers/net/wireless/ath/ath9k/rc.h b/drivers/net/wireless/ath/ath9k/rc.h
index 2f46a2266ba..31a004cb60a 100644
--- a/drivers/net/wireless/ath/ath9k/rc.h
+++ b/drivers/net/wireless/ath/ath9k/rc.h
@@ -215,7 +215,6 @@ struct ath_rate_priv {
         u32 per_down_time;
         u32 probe_interval;
         u32 prev_data_rix;
-        u32 tx_triglevel_max;
         struct ath_rateset neg_rates;
         struct ath_rateset neg_ht_rates;
         struct ath_rate_softc *asc;
@@ -225,11 +224,6 @@ struct ath_rate_priv {
         struct ath_rc_stats rcstats[RATE_TABLE_SIZE];
 };
 
-#define ATH_TX_INFO_FRAME_TYPE_INTERNAL (1 << 0)
-#define ATH_TX_INFO_FRAME_TYPE_PAUSE    (1 << 1)
-#define ATH_TX_INFO_XRETRY              (1 << 3)
-#define ATH_TX_INFO_UNDERRUN            (1 << 4)
-
 enum ath9k_internal_frame_type {
         ATH9K_IFT_NOT_INTERNAL,
         ATH9K_IFT_PAUSE,
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index c5c80764a94..262c81595f6 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -518,7 +518,7 @@ bool ath_stoprecv(struct ath_softc *sc)
         bool stopped;
 
         spin_lock_bh(&sc->rx.rxbuflock);
-        ath9k_hw_stoppcurecv(ah);
+        ath9k_hw_abortpcurecv(ah);
         ath9k_hw_setrxfilter(ah, 0);
         stopped = ath9k_hw_stopdmarecv(ah);
 
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index dddf579aacf..a597cc8d864 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -864,15 +864,7 @@
      ((REG_READ(_ah, AR_AN_SYNTH9) & 0x7) == 0x1))
 
 #define AR_DEVID_7010(_ah) \
-        (((_ah)->hw_version.devid == 0x7010) || \
-         ((_ah)->hw_version.devid == 0x7015) || \
-         ((_ah)->hw_version.devid == 0x9018) || \
-         ((_ah)->hw_version.devid == 0xA704) || \
-         ((_ah)->hw_version.devid == 0x1200))
-
-#define AR9287_HTC_DEVID(_ah) \
-        (((_ah)->hw_version.devid == 0x7015) || \
-         ((_ah)->hw_version.devid == 0x1200))
+        ((_ah)->common.driver_info & AR7010_DEVICE)
 
 #define AR_RADIO_SREV_MAJOR                   0xf0
 #define AR_RAD5133_SREV_MAJOR                 0xc0
@@ -1072,6 +1064,9 @@ enum {
 #define AR_INTR_PRIO_ASYNC_MASK   0x40c8
 #define AR_INTR_PRIO_SYNC_MASK    0x40cc
 #define AR_INTR_PRIO_ASYNC_ENABLE 0x40d4
+#define AR_ENT_OTP                0x40d8
+#define AR_ENT_OTP_CHAIN2_DISABLE               0x00020000
+#define AR_ENT_OTP_MPSD         0x00800000
 
 #define AR_RTC_9300_PLL_DIV          0x000003ff
 #define AR_RTC_9300_PLL_DIV_S        0
@@ -1572,6 +1567,7 @@ enum {
 #define AR_PCU_TBTT_PROTECT        0x00200000
 #define AR_PCU_CLEAR_VMF           0x01000000
 #define AR_PCU_CLEAR_BA_VALID      0x04000000
+#define AR_PCU_ALWAYS_PERFORM_KEYSEARCH 0x10000000
 
 #define AR_PCU_BT_ANT_PREVENT_RX   0x00100000
 #define AR_PCU_BT_ANT_PREVENT_RX_S 20
diff --git a/drivers/net/wireless/ath/ath9k/virtual.c b/drivers/net/wireless/ath/ath9k/virtual.c
index 4008f51d34c..d5442c3745c 100644
--- a/drivers/net/wireless/ath/ath9k/virtual.c
+++ b/drivers/net/wireless/ath/ath9k/virtual.c
@@ -305,13 +305,12 @@ void ath9k_wiphy_chan_work(struct work_struct *work)
  * ath9k version of ieee80211_tx_status() for TX frames that are generated
  * internally in the driver.
  */
-void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
+void ath9k_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb, int ftype)
 {
         struct ath_wiphy *aphy = hw->priv;
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
 
-        if ((tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_PAUSE) &&
-            aphy->state == ATH_WIPHY_PAUSING) {
+        if (ftype == ATH9K_IFT_PAUSE && aphy->state == ATH_WIPHY_PAUSING) {
                 if (!(tx_info->flags & IEEE80211_TX_STAT_ACK)) {
                         printk(KERN_DEBUG "ath9k: %s: no ACK for pause "
                                "frame\n", wiphy_name(hw->wiphy));
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 6380bbd82d4..495432ec85a 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -48,19 +48,17 @@ static u16 bits_per_symbol[][2] = {
 
 #define IS_HT_RATE(_rate)     ((_rate) & 0x80)
 
-static void ath_tx_send_ht_normal(struct ath_softc *sc, struct ath_txq *txq,
-                                  struct ath_atx_tid *tid,
-                                  struct list_head *bf_head);
+static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
+                               struct ath_atx_tid *tid,
+                               struct list_head *bf_head);
 static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
                                 struct ath_txq *txq, struct list_head *bf_q,
                                 struct ath_tx_status *ts, int txok, int sendbar);
 static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,
                              struct list_head *head);
-static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf);
-static int ath_tx_num_badfrms(struct ath_softc *sc, struct ath_buf *bf,
-                              struct ath_tx_status *ts, int txok);
+static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, int len);
 static void ath_tx_rc_status(struct ath_buf *bf, struct ath_tx_status *ts,
-                             int nbad, int txok, bool update_rc);
+                             int nframes, int nbad, int txok, bool update_rc);
 static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
                               int seqno);
 
@@ -140,12 +138,21 @@ unlock:
         spin_unlock_bh(&txq->axq_lock);
 }
 
+static struct ath_frame_info *get_frame_info(struct sk_buff *skb)
+{
+        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+        BUILD_BUG_ON(sizeof(struct ath_frame_info) >
+                     sizeof(tx_info->rate_driver_data));
+        return (struct ath_frame_info *) &tx_info->rate_driver_data[0];
+}
+
 static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
 {
         struct ath_txq *txq = tid->ac->txq;
         struct ath_buf *bf;
         struct list_head bf_head;
         struct ath_tx_status ts;
+        struct ath_frame_info *fi;
 
         INIT_LIST_HEAD(&bf_head);
 
@@ -156,12 +163,15 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
                 bf = list_first_entry(&tid->buf_q, struct ath_buf, list);
                 list_move_tail(&bf->list, &bf_head);
 
-                if (bf_isretried(bf)) {
-                        ath_tx_update_baw(sc, tid, bf->bf_seqno);
+                spin_unlock_bh(&txq->axq_lock);
+                fi = get_frame_info(bf->bf_mpdu);
+                if (fi->retries) {
+                        ath_tx_update_baw(sc, tid, fi->seqno);
                         ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0);
                 } else {
-                        ath_tx_send_ht_normal(sc, txq, tid, &bf_head);
+                        ath_tx_send_normal(sc, txq, tid, &bf_head);
                 }
+                spin_lock_bh(&txq->axq_lock);
         }
 
         spin_unlock_bh(&txq->axq_lock);
@@ -184,14 +194,11 @@ static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
 }
 
 static void ath_tx_addto_baw(struct ath_softc *sc, struct ath_atx_tid *tid,
-                             struct ath_buf *bf)
+                             u16 seqno)
 {
         int index, cindex;
 
-        if (bf_isretried(bf))
-                return;
-
-        index  = ATH_BA_INDEX(tid->seq_start, bf->bf_seqno);
+        index  = ATH_BA_INDEX(tid->seq_start, seqno);
         cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1);
         __set_bit(cindex, tid->tx_buf);
 
@@ -215,6 +222,7 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,
         struct ath_buf *bf;
         struct list_head bf_head;
         struct ath_tx_status ts;
+        struct ath_frame_info *fi;
 
         memset(&ts, 0, sizeof(ts));
         INIT_LIST_HEAD(&bf_head);
@@ -226,8 +234,9 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,
                 bf = list_first_entry(&tid->buf_q, struct ath_buf, list);
                 list_move_tail(&bf->list, &bf_head);
 
-                if (bf_isretried(bf))
-                        ath_tx_update_baw(sc, tid, bf->bf_seqno);
+                fi = get_frame_info(bf->bf_mpdu);
+                if (fi->retries)
+                        ath_tx_update_baw(sc, tid, fi->seqno);
 
                 spin_unlock(&txq->axq_lock);
                 ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0);
@@ -239,16 +248,15 @@ static void ath_tid_drain(struct ath_softc *sc, struct ath_txq *txq,
 }
 
 static void ath_tx_set_retry(struct ath_softc *sc, struct ath_txq *txq,
-                             struct ath_buf *bf)
+                             struct sk_buff *skb)
 {
-        struct sk_buff *skb;
+        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         struct ieee80211_hdr *hdr;
 
-        bf->bf_state.bf_type |= BUF_RETRY;
-        bf->bf_retries++;
         TX_STAT_INC(txq->axq_qnum, a_retries);
+        if (tx_info->control.rates[4].count++ > 0)
+                return;
 
-        skb = bf->bf_mpdu;
         hdr = (struct ieee80211_hdr *)skb->data;
         hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_RETRY);
 }
@@ -298,9 +306,41 @@ static struct ath_buf* ath_clone_txbuf(struct ath_softc *sc, struct ath_buf *bf)
         return tbf;
 }
 
+static void ath_tx_count_frames(struct ath_softc *sc, struct ath_buf *bf,
+                                struct ath_tx_status *ts, int txok,
+                                int *nframes, int *nbad)
+{
+        struct ath_frame_info *fi;
+        u16 seq_st = 0;
+        u32 ba[WME_BA_BMP_SIZE >> 5];
+        int ba_index;
+        int isaggr = 0;
+
+        *nbad = 0;
+        *nframes = 0;
+
+        isaggr = bf_isaggr(bf);
+        if (isaggr) {
+                seq_st = ts->ts_seqnum;
+                memcpy(ba, &ts->ba_low, WME_BA_BMP_SIZE >> 3);
+        }
+
+        while (bf) {
+                fi = get_frame_info(bf->bf_mpdu);
+                ba_index = ATH_BA_INDEX(seq_st, fi->seqno);
+
+                (*nframes)++;
+                if (!txok || (isaggr && !ATH_BA_ISSET(ba, ba_index)))
+                        (*nbad)++;
+
+                bf = bf->bf_next;
+        }
+}
+
+
 static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                                  struct ath_buf *bf, struct list_head *bf_q,
-                                 struct ath_tx_status *ts, int txok)
+                                 struct ath_tx_status *ts, int txok, bool retry)
 {
         struct ath_node *an = NULL;
         struct sk_buff *skb;
@@ -316,7 +356,9 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         int isaggr, txfail, txpending, sendbar = 0, needreset = 0, nbad = 0;
         bool rc_update = true;
         struct ieee80211_tx_rate rates[4];
+        struct ath_frame_info *fi;
         int nframes;
+        u8 tidno;
 
         skb = bf->bf_mpdu;
         hdr = (struct ieee80211_hdr *)skb->data;
@@ -325,7 +367,6 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         hw = bf->aphy->hw;
 
         memcpy(rates, tx_info->control.rates, sizeof(rates));
-        nframes = bf->bf_nframes;
 
         rcu_read_lock();
 
@@ -342,7 +383,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                             !bf->bf_stale || bf_next != NULL)
                                 list_move_tail(&bf->list, &bf_head);
 
-                        ath_tx_rc_status(bf, ts, 1, 0, false);
+                        ath_tx_rc_status(bf, ts, 1, 1, 0, false);
                         ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
                                 0, 0);
 
@@ -352,14 +393,15 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         }
 
         an = (struct ath_node *)sta->drv_priv;
-        tid = ATH_AN_2_TID(an, bf->bf_tidno);
+        tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
+        tid = ATH_AN_2_TID(an, tidno);
 
         /*
          * The hardware occasionally sends a tx status for the wrong TID.
          * In this case, the BA status cannot be considered valid and all
          * subframes need to be retransmitted
          */
-        if (bf->bf_tidno != ts->tid)
+        if (tidno != ts->tid)
                 txok = false;
 
         isaggr = bf_isaggr(bf);
@@ -385,15 +427,16 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
         INIT_LIST_HEAD(&bf_pending);
         INIT_LIST_HEAD(&bf_head);
 
-        nbad = ath_tx_num_badfrms(sc, bf, ts, txok);
+        ath_tx_count_frames(sc, bf, ts, txok, &nframes, &nbad);
         while (bf) {
                 txfail = txpending = 0;
                 bf_next = bf->bf_next;
 
                 skb = bf->bf_mpdu;
                 tx_info = IEEE80211_SKB_CB(skb);
+                fi = get_frame_info(skb);
 
-                if (ATH_BA_ISSET(ba, ATH_BA_INDEX(seq_st, bf->bf_seqno))) {
+                if (ATH_BA_ISSET(ba, ATH_BA_INDEX(seq_st, fi->seqno))) {
                         /* transmit completion, subframe is
                          * acked by block ack */
                         acked_cnt++;
@@ -401,10 +444,9 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                         /* transmit completion */
                         acked_cnt++;
                 } else {
-                        if (!(tid->state & AGGR_CLEANUP) &&
-                            !bf_last->bf_tx_aborted) {
-                                if (bf->bf_retries < ATH_MAX_SW_RETRIES) {
-                                        ath_tx_set_retry(sc, txq, bf);
+                        if (!(tid->state & AGGR_CLEANUP) && retry) {
+                                if (fi->retries < ATH_MAX_SW_RETRIES) {
+                                        ath_tx_set_retry(sc, txq, bf->bf_mpdu);
                                         txpending = 1;
                                 } else {
                                         bf->bf_state.bf_type |= BUF_XRETRY;
@@ -442,16 +484,15 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                          * block-ack window
                          */
                         spin_lock_bh(&txq->axq_lock);
-                        ath_tx_update_baw(sc, tid, bf->bf_seqno);
+                        ath_tx_update_baw(sc, tid, fi->seqno);
                         spin_unlock_bh(&txq->axq_lock);
 
                         if (rc_update && (acked_cnt == 1 || txfail_cnt == 1)) {
                                 memcpy(tx_info->control.rates, rates, sizeof(rates));
-                                bf->bf_nframes = nframes;
-                                ath_tx_rc_status(bf, ts, nbad, txok, true);
+                                ath_tx_rc_status(bf, ts, nframes, nbad, txok, true);
                                 rc_update = false;
                         } else {
-                                ath_tx_rc_status(bf, ts, nbad, txok, false);
+                                ath_tx_rc_status(bf, ts, nframes, nbad, txok, false);
                         }
 
                         ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
@@ -470,14 +511,13 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
                                          */
                                         if (!tbf) {
                                                 spin_lock_bh(&txq->axq_lock);
-                                                ath_tx_update_baw(sc, tid,
-                                                                bf->bf_seqno);
+                                                ath_tx_update_baw(sc, tid, fi->seqno);
                                                 spin_unlock_bh(&txq->axq_lock);
 
                                                 bf->bf_state.bf_type |=
                                                         BUF_XRETRY;
-                                                ath_tx_rc_status(bf, ts, nbad,
-                                                                0, false);
+                                                ath_tx_rc_status(bf, ts, nframes,
+                                                                nbad, 0, false);
                                                 ath_tx_complete_buf(sc, bf, txq,
                                                                     &bf_head,
                                                                     ts, 0, 0);
@@ -611,6 +651,7 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
         u16 minlen;
         u8 flags, rix;
         int width, streams, half_gi, ndelim, mindelim;
+        struct ath_frame_info *fi = get_frame_info(bf->bf_mpdu);
 
         /* Select standard number of delimiters based on frame length alone */
         ndelim = ATH_AGGR_GET_NDELIM(frmlen);
@@ -621,7 +662,7 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
          * TODO - this could be improved to be dependent on the rate.
          *      The hardware can keep up at lower rates, but not higher rates
          */
-        if (bf->bf_keytype != ATH9K_KEY_TYPE_CLEAR)
+        if (fi->keyix != ATH9K_TXKEYIX_INVALID)
                 ndelim += ATH_AGGR_ENCRYPTDELIM;
 
         /*
@@ -665,7 +706,8 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
 static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
                                              struct ath_txq *txq,
                                              struct ath_atx_tid *tid,
-                                             struct list_head *bf_q)
+                                             struct list_head *bf_q,
+                                             int *aggr_len)
 {
 #define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
         struct ath_buf *bf, *bf_first, *bf_prev = NULL;
@@ -674,14 +716,16 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
                 al_delta, h_baw = tid->baw_size / 2;
         enum ATH_AGGR_STATUS status = ATH_AGGR_DONE;
         struct ieee80211_tx_info *tx_info;
+        struct ath_frame_info *fi;
 
         bf_first = list_first_entry(&tid->buf_q, struct ath_buf, list);
 
         do {
                 bf = list_first_entry(&tid->buf_q, struct ath_buf, list);
+                fi = get_frame_info(bf->bf_mpdu);
 
                 /* do not step over block-ack window */
-                if (!BAW_WITHIN(tid->seq_start, tid->baw_size, bf->bf_seqno)) {
+                if (!BAW_WITHIN(tid->seq_start, tid->baw_size, fi->seqno)) {
                         status = ATH_AGGR_BAW_CLOSED;
                         break;
                 }
@@ -692,7 +736,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
                 }
 
                 /* do not exceed aggregation limit */
-                al_delta = ATH_AGGR_DELIM_SZ + bf->bf_frmlen;
+                al_delta = ATH_AGGR_DELIM_SZ + fi->framelen;
 
                 if (nframes &&
                     (aggr_limit < (al + bpad + al_delta + prev_al))) {
@@ -719,14 +763,15 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
                  * Get the delimiters needed to meet the MPDU
                  * density for this node.
                  */
-                ndelim = ath_compute_num_delims(sc, tid, bf_first, bf->bf_frmlen);
+                ndelim = ath_compute_num_delims(sc, tid, bf_first, fi->framelen);
                 bpad = PADBYTES(al_delta) + (ndelim << 2);
 
                 bf->bf_next = NULL;
                 ath9k_hw_set_desc_link(sc->sc_ah, bf->bf_desc, 0);
 
                 /* link buffers of this frame to the aggregate */
-                ath_tx_addto_baw(sc, tid, bf);
+                if (!fi->retries)
+                        ath_tx_addto_baw(sc, tid, fi->seqno);
                 ath9k_hw_set11n_aggr_middle(sc->sc_ah, bf->bf_desc, ndelim);
                 list_move_tail(&bf->list, bf_q);
                 if (bf_prev) {
@@ -738,8 +783,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
 
         } while (!list_empty(&tid->buf_q));
 
-        bf_first->bf_al = al;
-        bf_first->bf_nframes = nframes;
+        *aggr_len = al;
 
         return status;
 #undef PADBYTES
@@ -750,7 +794,9 @@ static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
 {
         struct ath_buf *bf;
         enum ATH_AGGR_STATUS status;
+        struct ath_frame_info *fi;
         struct list_head bf_q;
+        int aggr_len;
 
         do {
                 if (list_empty(&tid->buf_q))
@@ -758,7 +804,7 @@ static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
 
                 INIT_LIST_HEAD(&bf_q);
 
-                status = ath_tx_form_aggr(sc, txq, tid, &bf_q);
+                status = ath_tx_form_aggr(sc, txq, tid, &bf_q, &aggr_len);
 
                 /*
                  * no frames picked up to be aggregated;
@@ -771,18 +817,20 @@ static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq,
                 bf->bf_lastbf = list_entry(bf_q.prev, struct ath_buf, list);
 
                 /* if only one frame, send as non-aggregate */
-                if (bf->bf_nframes == 1) {
+                if (bf == bf->bf_lastbf) {
+                        fi = get_frame_info(bf->bf_mpdu);
+
                         bf->bf_state.bf_type &= ~BUF_AGGR;
                         ath9k_hw_clr11n_aggr(sc->sc_ah, bf->bf_desc);
-                        ath_buf_set_rate(sc, bf);
+                        ath_buf_set_rate(sc, bf, fi->framelen);
                         ath_tx_txqaddbuf(sc, txq, &bf_q);
                         continue;
                 }
 
                 /* setup first desc of aggregate */
                 bf->bf_state.bf_type |= BUF_AGGR;
-                ath_buf_set_rate(sc, bf);
-                ath9k_hw_set11n_aggr_first(sc->sc_ah, bf->bf_desc, bf->bf_al);
+                ath_buf_set_rate(sc, bf, aggr_len);
+                ath9k_hw_set11n_aggr_first(sc->sc_ah, bf->bf_desc, aggr_len);
 
                 /* anchor last desc of aggregate */
                 ath9k_hw_set11n_aggr_last(sc->sc_ah, bf->bf_lastbf->bf_desc);
@@ -1067,8 +1115,6 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)
                 }
 
                 lastbf = bf->bf_lastbf;
-                if (!retry_tx)
-                        lastbf->bf_tx_aborted = true;
 
                 if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
                         list_cut_position(&bf_head,
@@ -1085,7 +1131,8 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)
                 spin_unlock_bh(&txq->axq_lock);
 
                 if (bf_isampdu(bf))
-                        ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, 0);
+                        ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, 0,
+                                             retry_tx);
                 else
                         ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0);
         }
@@ -1106,7 +1153,7 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx)
 
                         if (bf_isampdu(bf))
                                 ath_tx_complete_aggr(sc, txq, bf, &bf_head,
-                                                     &ts, 0);
+                                                     &ts, 0, retry_tx);
                         else
                                 ath_tx_complete_buf(sc, bf, txq, &bf_head,
                                                     &ts, 0, 0);
@@ -1284,12 +1331,11 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,
 }
 
 static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,
-                              struct list_head *bf_head,
-                              struct ath_tx_control *txctl)
+                              struct ath_buf *bf, struct ath_tx_control *txctl)
 {
-        struct ath_buf *bf;
+        struct ath_frame_info *fi = get_frame_info(bf->bf_mpdu);
+        struct list_head bf_head;
 
-        bf = list_first_entry(bf_head, struct ath_buf, list);
         bf->bf_state.bf_type |= BUF_AMPDU;
         TX_STAT_INC(txctl->txq->axq_qnum, a_queued);
 
@@ -1301,56 +1347,47 @@ static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid,
          * - h/w queue depth exceeds low water mark
          */
         if (!list_empty(&tid->buf_q) || tid->paused ||
-            !BAW_WITHIN(tid->seq_start, tid->baw_size, bf->bf_seqno) ||
+            !BAW_WITHIN(tid->seq_start, tid->baw_size, fi->seqno) ||
             txctl->txq->axq_depth >= ATH_AGGR_MIN_QDEPTH) {
                 /*
                  * Add this frame to software queue for scheduling later
                  * for aggregation.
                  */
-                list_move_tail(&bf->list, &tid->buf_q);
+                list_add_tail(&bf->list, &tid->buf_q);
                 ath_tx_queue_tid(txctl->txq, tid);
                 return;
         }
 
+        INIT_LIST_HEAD(&bf_head);
+        list_add(&bf->list, &bf_head);
+
         /* Add sub-frame to BAW */
-        ath_tx_addto_baw(sc, tid, bf);
+        if (!fi->retries)
+                ath_tx_addto_baw(sc, tid, fi->seqno);
 
         /* Queue to h/w without aggregation */
-        bf->bf_nframes = 1;
         bf->bf_lastbf = bf;
-        ath_buf_set_rate(sc, bf);
-        ath_tx_txqaddbuf(sc, txctl->txq, bf_head);
+        ath_buf_set_rate(sc, bf, fi->framelen);
+        ath_tx_txqaddbuf(sc, txctl->txq, &bf_head);
 }
 
-static void ath_tx_send_ht_normal(struct ath_softc *sc, struct ath_txq *txq,
-                                  struct ath_atx_tid *tid,
-                                  struct list_head *bf_head)
+static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
+                               struct ath_atx_tid *tid,
+                               struct list_head *bf_head)
 {
+        struct ath_frame_info *fi;
         struct ath_buf *bf;
 
         bf = list_first_entry(bf_head, struct ath_buf, list);
         bf->bf_state.bf_type &= ~BUF_AMPDU;
 
         /* update starting sequence number for subsequent ADDBA request */
-        INCR(tid->seq_start, IEEE80211_SEQ_MAX);
-
-        bf->bf_nframes = 1;
-        bf->bf_lastbf = bf;
-        ath_buf_set_rate(sc, bf);
-        ath_tx_txqaddbuf(sc, txq, bf_head);
-        TX_STAT_INC(txq->axq_qnum, queued);
-}
-
-static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
-                               struct list_head *bf_head)
-{
-        struct ath_buf *bf;
-
-        bf = list_first_entry(bf_head, struct ath_buf, list);
+        if (tid)
+                INCR(tid->seq_start, IEEE80211_SEQ_MAX);
 
         bf->bf_lastbf = bf;
-        bf->bf_nframes = 1;
-        ath_buf_set_rate(sc, bf);
+        fi = get_frame_info(bf->bf_mpdu);
+        ath_buf_set_rate(sc, bf, fi->framelen);
         ath_tx_txqaddbuf(sc, txq, bf_head);
         TX_STAT_INC(txq->axq_qnum, queued);
 }
@@ -1378,40 +1415,52 @@ static enum ath9k_pkt_type get_hw_packet_type(struct sk_buff *skb)
         return htype;
 }
 
-static void assign_aggr_tid_seqno(struct sk_buff *skb,
-                                  struct ath_buf *bf)
+static void setup_frame_info(struct ieee80211_hw *hw, struct sk_buff *skb,
+                             int framelen)
 {
+        struct ath_wiphy *aphy = hw->priv;
+        struct ath_softc *sc = aphy->sc;
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_sta *sta = tx_info->control.sta;
+        struct ieee80211_key_conf *hw_key = tx_info->control.hw_key;
         struct ieee80211_hdr *hdr;
+        struct ath_frame_info *fi = get_frame_info(skb);
         struct ath_node *an;
         struct ath_atx_tid *tid;
-        __le16 fc;
-        u8 *qc;
+        enum ath9k_key_type keytype;
+        u16 seqno = 0;
+        u8 tidno;
 
-        if (!tx_info->control.sta)
-                return;
+        keytype = ath9k_cmn_get_hw_crypto_keytype(skb);
 
-        an = (struct ath_node *)tx_info->control.sta->drv_priv;
         hdr = (struct ieee80211_hdr *)skb->data;
-        fc = hdr->frame_control;
+        if (sta && ieee80211_is_data_qos(hdr->frame_control) &&
+                conf_is_ht(&hw->conf) && (sc->sc_flags & SC_OP_TXAGGR)) {
 
-        if (ieee80211_is_data_qos(fc)) {
-                qc = ieee80211_get_qos_ctl(hdr);
-                bf->bf_tidno = qc[0] & 0xf;
+                an = (struct ath_node *) sta->drv_priv;
+                tidno = ieee80211_get_qos_ctl(hdr)[0] & IEEE80211_QOS_CTL_TID_MASK;
+
+                /*
+                 * Override seqno set by upper layer with the one
+                 * in tx aggregation state.
+                 */
+                tid = ATH_AN_2_TID(an, tidno);
+                seqno = tid->seq_next;
+                hdr->seq_ctrl = cpu_to_le16(seqno << IEEE80211_SEQ_SEQ_SHIFT);
+                INCR(tid->seq_next, IEEE80211_SEQ_MAX);
         }
 
-        /*
-         * For HT capable stations, we save tidno for later use.
-         * We also override seqno set by upper layer with the one
-         * in tx aggregation state.
-         */
-        tid = ATH_AN_2_TID(an, bf->bf_tidno);
-        hdr->seq_ctrl = cpu_to_le16(tid->seq_next << IEEE80211_SEQ_SEQ_SHIFT);
-        bf->bf_seqno = tid->seq_next;
-        INCR(tid->seq_next, IEEE80211_SEQ_MAX);
+        memset(fi, 0, sizeof(*fi));
+        if (hw_key)
+                fi->keyix = hw_key->hw_key_idx;
+        else
+                fi->keyix = ATH9K_TXKEYIX_INVALID;
+        fi->keytype = keytype;
+        fi->framelen = framelen;
+        fi->seqno = seqno;
 }
 
-static int setup_tx_flags(struct sk_buff *skb, bool use_ldpc)
+static int setup_tx_flags(struct sk_buff *skb)
 {
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         int flags = 0;
@@ -1422,7 +1471,7 @@ static int setup_tx_flags(struct sk_buff *skb, bool use_ldpc)
         if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK)
                 flags |= ATH9K_TXDESC_NOACK;
 
-        if (use_ldpc)
+        if (tx_info->flags & IEEE80211_TX_CTL_LDPC)
                 flags |= ATH9K_TXDESC_LDPC;
 
         return flags;
@@ -1434,13 +1483,11 @@ static int setup_tx_flags(struct sk_buff *skb, bool use_ldpc)
  * width  - 0 for 20 MHz, 1 for 40 MHz
  * half_gi - to use 4us v/s 3.6 us for symbol time
  */
-static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, struct ath_buf *bf,
+static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, int pktlen,
                             int width, int half_gi, bool shortPreamble)
 {
         u32 nbits, nsymbits, duration, nsymbols;
-        int streams, pktlen;
-
-        pktlen = bf_isaggr(bf) ? bf->bf_al : bf->bf_frmlen;
+        int streams;
 
         /* find number of symbols: PLCP + data */
         streams = HT_RC_2_STREAMS(rix);
@@ -1459,7 +1506,7 @@ static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, struct ath_buf *bf,
         return duration;
 }
 
-static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
+static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, int len)
 {
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath9k_11n_rate_series series[4];
@@ -1522,7 +1569,7 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
                 if (rates[i].flags & IEEE80211_TX_RC_MCS) {
                         /* MCS rates */
                         series[i].Rate = rix | 0x80;
-                        series[i].PktDuration = ath_pkt_duration(sc, rix, bf,
+                        series[i].PktDuration = ath_pkt_duration(sc, rix, len,
                                  is_40, is_sgi, is_sp);
                         if (rix < 8 && (tx_info->flags & IEEE80211_TX_CTL_STBC))
                                 series[i].RateFlags |= ATH9K_RATESERIES_STBC;
@@ -1546,11 +1593,11 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
                 }
 
                 series[i].PktDuration = ath9k_hw_computetxtime(sc->sc_ah,
-                        phy, rate->bitrate * 100, bf->bf_frmlen, rix, is_sp);
+                        phy, rate->bitrate * 100, len, rix, is_sp);
         }
 
         /* For AR5416 - RTS cannot be followed by a frame larger than 8K */
-        if (bf_isaggr(bf) && (bf->bf_al > sc->sc_ah->caps.rts_aggr_limit))
+        if (bf_isaggr(bf) && (len > sc->sc_ah->caps.rts_aggr_limit))
                 flags &= ~ATH9K_TXDESC_RTSENA;
 
         /* ATH9K_TXDESC_RTSENA and ATH9K_TXDESC_CTSENA are mutually exclusive. */
@@ -1567,67 +1614,29 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf)
                 ath9k_hw_set11n_burstduration(sc->sc_ah, bf->bf_desc, 8192);
 }
 
-static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf,
-                                struct sk_buff *skb,
-                                struct ath_tx_control *txctl)
+static struct ath_buf *ath_tx_setup_buffer(struct ieee80211_hw *hw,
+                                           struct ath_txq *txq,
+                                           struct sk_buff *skb)
 {
         struct ath_wiphy *aphy = hw->priv;
         struct ath_softc *sc = aphy->sc;
-        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        int hdrlen;
-        __le16 fc;
-        int padpos, padsize;
-        bool use_ldpc = false;
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_frame_info *fi = get_frame_info(skb);
+        struct ath_buf *bf;
+        struct ath_desc *ds;
+        int frm_type;
 
-        tx_info->pad[0] = 0;
-        switch (txctl->frame_type) {
-        case ATH9K_IFT_NOT_INTERNAL:
-                break;
-        case ATH9K_IFT_PAUSE:
-                tx_info->pad[0] |= ATH_TX_INFO_FRAME_TYPE_PAUSE;
-                /* fall through */
-        case ATH9K_IFT_UNPAUSE:
-                tx_info->pad[0] |= ATH_TX_INFO_FRAME_TYPE_INTERNAL;
-                break;
+        bf = ath_tx_get_buffer(sc);
+        if (!bf) {
+                ath_print(common, ATH_DBG_XMIT, "TX buffers are full\n");
+                return NULL;
         }
-        hdrlen = ieee80211_get_hdrlen_from_skb(skb);
-        fc = hdr->frame_control;
 
         ATH_TXBUF_RESET(bf);
 
         bf->aphy = aphy;
-        bf->bf_frmlen = skb->len + FCS_LEN;
-        /* Remove the padding size from bf_frmlen, if any */
-        padpos = ath9k_cmn_padpos(hdr->frame_control);
-        padsize = padpos & 3;
-        if (padsize && skb->len>padpos+padsize) {
-                bf->bf_frmlen -= padsize;
-        }
-
-        if (!txctl->paprd && conf_is_ht(&hw->conf)) {
-                bf->bf_state.bf_type |= BUF_HT;
-                if (tx_info->flags & IEEE80211_TX_CTL_LDPC)
-                        use_ldpc = true;
-        }
-
-        bf->bf_state.bfs_paprd = txctl->paprd;
-        if (txctl->paprd)
-                bf->bf_state.bfs_paprd_timestamp = jiffies;
-        bf->bf_flags = setup_tx_flags(skb, use_ldpc);
-
-        bf->bf_keytype = ath9k_cmn_get_hw_crypto_keytype(skb);
-        if (bf->bf_keytype != ATH9K_KEY_TYPE_CLEAR) {
-                bf->bf_frmlen += tx_info->control.hw_key->icv_len;
-                bf->bf_keyix = tx_info->control.hw_key->hw_key_idx;
-        } else {
-                bf->bf_keyix = ATH9K_TXKEYIX_INVALID;
-        }
-
-        if (ieee80211_is_data_qos(fc) && bf_isht(bf) &&
-            (sc->sc_flags & SC_OP_TXAGGR))
-                assign_aggr_tid_seqno(skb, bf);
-
+        bf->bf_flags = setup_tx_flags(skb);
         bf->bf_mpdu = skb;
 
         bf->bf_buf_addr = dma_map_single(sc->dev, skb->data,
@@ -1637,40 +1646,17 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf,
                 bf->bf_buf_addr = 0;
                 ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,
                           "dma_mapping_error() on TX\n");
-                return -ENOMEM;
+                ath_tx_return_buffer(sc, bf);
+                return NULL;
         }
 
-        bf->bf_tx_aborted = false;
-
-        return 0;
-}
-
-/* FIXME: tx power */
-static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
-                             struct ath_tx_control *txctl)
-{
-        struct sk_buff *skb = bf->bf_mpdu;
-        struct ieee80211_tx_info *tx_info =  IEEE80211_SKB_CB(skb);
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-        struct ath_node *an = NULL;
-        struct list_head bf_head;
-        struct ath_desc *ds;
-        struct ath_atx_tid *tid;
-        struct ath_hw *ah = sc->sc_ah;
-        int frm_type;
-        __le16 fc;
-
         frm_type = get_hw_packet_type(skb);
-        fc = hdr->frame_control;
-
-        INIT_LIST_HEAD(&bf_head);
-        list_add_tail(&bf->list, &bf_head);
 
         ds = bf->bf_desc;
         ath9k_hw_set_desc_link(ah, ds, 0);
 
-        ath9k_hw_set11n_txdesc(ah, ds, bf->bf_frmlen, frm_type, MAX_RATE_POWER,
-                               bf->bf_keyix, bf->bf_keytype, bf->bf_flags);
+        ath9k_hw_set11n_txdesc(ah, ds, fi->framelen, frm_type, MAX_RATE_POWER,
+                               fi->keyix, fi->keytype, bf->bf_flags);
 
         ath9k_hw_filltxdesc(ah, ds,
                             skb->len,   /* segment length */
@@ -1678,43 +1664,50 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
                             true,       /* last segment */
                             ds,         /* first descriptor */
                             bf->bf_buf_addr,
-                            txctl->txq->axq_qnum);
+                            txq->axq_qnum);
 
-        if (bf->bf_state.bfs_paprd)
-                ar9003_hw_set_paprd_txdesc(ah, ds, bf->bf_state.bfs_paprd);
 
-        spin_lock_bh(&txctl->txq->axq_lock);
+        return bf;
+}
 
-        if (bf_isht(bf) && (sc->sc_flags & SC_OP_TXAGGR) &&
-            tx_info->control.sta) {
-                an = (struct ath_node *)tx_info->control.sta->drv_priv;
-                tid = ATH_AN_2_TID(an, bf->bf_tidno);
+/* FIXME: tx power */
+static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
+                             struct ath_tx_control *txctl)
+{
+        struct sk_buff *skb = bf->bf_mpdu;
+        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+        struct list_head bf_head;
+        struct ath_atx_tid *tid;
+        u8 tidno;
 
-                if (!ieee80211_is_data_qos(fc)) {
-                        ath_tx_send_normal(sc, txctl->txq, &bf_head);
-                        goto tx_done;
-                }
+        spin_lock_bh(&txctl->txq->axq_lock);
+
+        if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && txctl->an) {
+                tidno = ieee80211_get_qos_ctl(hdr)[0] &
+                        IEEE80211_QOS_CTL_TID_MASK;
+                tid = ATH_AN_2_TID(txctl->an, tidno);
 
                 WARN_ON(tid->ac->txq != txctl->txq);
-                if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
-                        /*
-                         * Try aggregation if it's a unicast data frame
-                         * and the destination is HT capable.
-                         */
-                        ath_tx_send_ampdu(sc, tid, &bf_head, txctl);
-                } else {
-                        /*
-                         * Send this frame as regular when ADDBA
-                         * exchange is neither complete nor pending.
-                         */
-                        ath_tx_send_ht_normal(sc, txctl->txq,
-                                              tid, &bf_head);
-                }
+                /*
+                 * Try aggregation if it's a unicast data frame
+                 * and the destination is HT capable.
+                 */
+                ath_tx_send_ampdu(sc, tid, bf, txctl);
         } else {
-                ath_tx_send_normal(sc, txctl->txq, &bf_head);
+                INIT_LIST_HEAD(&bf_head);
+                list_add_tail(&bf->list, &bf_head);
+
+                bf->bf_state.bfs_ftype = txctl->frame_type;
+                bf->bf_state.bfs_paprd = txctl->paprd;
+
+                if (bf->bf_state.bfs_paprd)
+                        ar9003_hw_set_paprd_txdesc(sc->sc_ah, bf->bf_desc,
+                                                   bf->bf_state.bfs_paprd);
+
+                ath_tx_send_normal(sc, txctl->txq, NULL, &bf_head);
         }
 
-tx_done:
         spin_unlock_bh(&txctl->txq->axq_lock);
 }
 
@@ -1722,65 +1715,20 @@ tx_done:
 int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
                  struct ath_tx_control *txctl)
 {
+        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+        struct ieee80211_sta *sta = info->control.sta;
         struct ath_wiphy *aphy = hw->priv;
         struct ath_softc *sc = aphy->sc;
-        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         struct ath_txq *txq = txctl->txq;
         struct ath_buf *bf;
-        int q, r;
-
-        bf = ath_tx_get_buffer(sc);
-        if (!bf) {
-                ath_print(common, ATH_DBG_XMIT, "TX buffers are full\n");
-                return -1;
-        }
-
-        q = skb_get_queue_mapping(skb);
-        r = ath_tx_setup_buffer(hw, bf, skb, txctl);
-        if (unlikely(r)) {
-                ath_print(common, ATH_DBG_FATAL, "TX mem alloc failure\n");
-
-                /* upon ath_tx_processq() this TX queue will be resumed, we
-                 * guarantee this will happen by knowing beforehand that
-                 * we will at least have to run TX completionon one buffer
-                 * on the queue */
-                spin_lock_bh(&txq->axq_lock);
-                if (txq == sc->tx.txq_map[q] && !txq->stopped &&
-                    txq->axq_depth > 1) {
-                        ath_mac80211_stop_queue(sc, q);
-                        txq->stopped = 1;
-                }
-                spin_unlock_bh(&txq->axq_lock);
-
-                ath_tx_return_buffer(sc, bf);
-
-                return r;
-        }
-
-        spin_lock_bh(&txq->axq_lock);
-        if (txq == sc->tx.txq_map[q] &&
-            ++txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
-                ath_mac80211_stop_queue(sc, q);
-                txq->stopped = 1;
-        }
-        spin_unlock_bh(&txq->axq_lock);
-
-        ath_tx_start_dma(sc, bf, txctl);
-
-        return 0;
-}
-
-void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
-{
-        struct ath_wiphy *aphy = hw->priv;
-        struct ath_softc *sc = aphy->sc;
-        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-        struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
         int padpos, padsize;
-        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-        struct ath_tx_control txctl;
+        int frmlen = skb->len + FCS_LEN;
+        int q;
 
-        memset(&txctl, 0, sizeof(struct ath_tx_control));
+        txctl->an = (struct ath_node *)sta->drv_priv;
+        if (info->control.hw_key)
+                frmlen += info->control.hw_key->icv_len;
 
         /*
          * As a temporary workaround, assign seq# here; this will likely need
@@ -1797,30 +1745,37 @@ void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb)
         /* Add the padding after the header if this is not already done */
         padpos = ath9k_cmn_padpos(hdr->frame_control);
         padsize = padpos & 3;
-        if (padsize && skb->len>padpos) {
-                if (skb_headroom(skb) < padsize) {
-                        ath_print(common, ATH_DBG_XMIT,
-                                  "TX CABQ padding failed\n");
-                        dev_kfree_skb_any(skb);
-                        return;
-                }
+        if (padsize && skb->len > padpos) {
+                if (skb_headroom(skb) < padsize)
+                        return -ENOMEM;
+
                 skb_push(skb, padsize);
                 memmove(skb->data, skb->data + padsize, padpos);
         }
 
-        txctl.txq = sc->beacon.cabq;
+        setup_frame_info(hw, skb, frmlen);
 
-        ath_print(common, ATH_DBG_XMIT,
-                  "transmitting CABQ packet, skb: %p\n", skb);
+        /*
+         * At this point, the vif, hw_key and sta pointers in the tx control
+         * info are no longer valid (overwritten by the ath_frame_info data.
+         */
 
-        if (ath_tx_start(hw, skb, &txctl) != 0) {
-                ath_print(common, ATH_DBG_XMIT, "CABQ TX failed\n");
-                goto exit;
+        bf = ath_tx_setup_buffer(hw, txctl->txq, skb);
+        if (unlikely(!bf))
+                return -ENOMEM;
+
+        q = skb_get_queue_mapping(skb);
+        spin_lock_bh(&txq->axq_lock);
+        if (txq == sc->tx.txq_map[q] &&
+            ++txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
+                ath_mac80211_stop_queue(sc, q);
+                txq->stopped = 1;
         }
+        spin_unlock_bh(&txq->axq_lock);
 
-        return;
-exit:
-        dev_kfree_skb_any(skb);
+        ath_tx_start_dma(sc, bf, txctl);
+
+        return 0;
 }
 
 /*****************/
@@ -1828,7 +1783,7 @@ exit:
 /*****************/
 
 static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
-                            struct ath_wiphy *aphy, int tx_flags,
+                            struct ath_wiphy *aphy, int tx_flags, int ftype,
                             struct ath_txq *txq)
 {
         struct ieee80211_hw *hw = sc->hw;
@@ -1872,8 +1827,8 @@ static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
                                         PS_WAIT_FOR_TX_ACK));
         }
 
-        if (unlikely(tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_INTERNAL))
-                ath9k_tx_status(hw, skb);
+        if (unlikely(ftype))
+                ath9k_tx_status(hw, skb, ftype);
         else {
                 q = skb_get_queue_mapping(skb);
                 if (txq == sc->tx.txq_map[q]) {
@@ -1909,15 +1864,14 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
         bf->bf_buf_addr = 0;
 
         if (bf->bf_state.bfs_paprd) {
-                if (time_after(jiffies,
-                               bf->bf_state.bfs_paprd_timestamp +
-                               msecs_to_jiffies(ATH_PAPRD_TIMEOUT)))
+                if (!sc->paprd_pending)
                         dev_kfree_skb_any(skb);
                 else
                         complete(&sc->paprd_complete);
         } else {
                 ath_debug_stat_tx(sc, bf, ts);
-                ath_tx_complete(sc, skb, bf->aphy, tx_flags, txq);
+                ath_tx_complete(sc, skb, bf->aphy, tx_flags,
+                                bf->bf_state.bfs_ftype, txq);
         }
         /* At this point, skb (bf->bf_mpdu) is consumed...make sure we don't
          * accidentally reference it later.
@@ -1932,42 +1886,15 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
         spin_unlock_irqrestore(&sc->tx.txbuflock, flags);
 }
 
-static int ath_tx_num_badfrms(struct ath_softc *sc, struct ath_buf *bf,
-                              struct ath_tx_status *ts, int txok)
-{
-        u16 seq_st = 0;
-        u32 ba[WME_BA_BMP_SIZE >> 5];
-        int ba_index;
-        int nbad = 0;
-        int isaggr = 0;
-
-        if (bf->bf_lastbf->bf_tx_aborted)
-                return 0;
-
-        isaggr = bf_isaggr(bf);
-        if (isaggr) {
-                seq_st = ts->ts_seqnum;
-                memcpy(ba, &ts->ba_low, WME_BA_BMP_SIZE >> 3);
-        }
-
-        while (bf) {
-                ba_index = ATH_BA_INDEX(seq_st, bf->bf_seqno);
-                if (!txok || (isaggr && !ATH_BA_ISSET(ba, ba_index)))
-                        nbad++;
-
-                bf = bf->bf_next;
-        }
-
-        return nbad;
-}
-
 static void ath_tx_rc_status(struct ath_buf *bf, struct ath_tx_status *ts,
-                             int nbad, int txok, bool update_rc)
+                             int nframes, int nbad, int txok, bool update_rc)
 {
         struct sk_buff *skb = bf->bf_mpdu;
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
         struct ieee80211_hw *hw = bf->aphy->hw;
+        struct ath_softc *sc = bf->aphy->sc;
+        struct ath_hw *ah = sc->sc_ah;
         u8 i, tx_rateindex;
 
         if (txok)
@@ -1981,22 +1908,32 @@ static void ath_tx_rc_status(struct ath_buf *bf, struct ath_tx_status *ts,
         if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && update_rc) {
                 tx_info->flags |= IEEE80211_TX_STAT_AMPDU;
 
-                BUG_ON(nbad > bf->bf_nframes);
+                BUG_ON(nbad > nframes);
 
-                tx_info->status.ampdu_len = bf->bf_nframes;
-                tx_info->status.ampdu_ack_len = bf->bf_nframes - nbad;
+                tx_info->status.ampdu_len = nframes;
+                tx_info->status.ampdu_ack_len = nframes - nbad;
         }
 
         if ((ts->ts_status & ATH9K_TXERR_FILT) == 0 &&
             (bf->bf_flags & ATH9K_TXDESC_NOACK) == 0 && update_rc) {
-                if (ieee80211_is_data(hdr->frame_control)) {
-                        if (ts->ts_flags &
-                            (ATH9K_TX_DATA_UNDERRUN | ATH9K_TX_DELIM_UNDERRUN))
-                                tx_info->pad[0] |= ATH_TX_INFO_UNDERRUN;
-                        if ((ts->ts_status & ATH9K_TXERR_XRETRY) ||
-                            (ts->ts_status & ATH9K_TXERR_FIFO))
-                                tx_info->pad[0] |= ATH_TX_INFO_XRETRY;
-                }
+                /*
+                 * If an underrun error is seen assume it as an excessive
+                 * retry only if max frame trigger level has been reached
+                 * (2 KB for single stream, and 4 KB for dual stream).
+                 * Adjust the long retry as if the frame was tried
+                 * hw->max_rate_tries times to affect how rate control updates
+                 * PER for the failed rate.
+                 * In case of congestion on the bus penalizing this type of
+                 * underruns should help hardware actually transmit new frames
+                 * successfully by eventually preferring slower rates.
+                 * This itself should also alleviate congestion on the bus.
+                 */
+                if (ieee80211_is_data(hdr->frame_control) &&
+                    (ts->ts_flags & (ATH9K_TX_DATA_UNDERRUN |
+                                     ATH9K_TX_DELIM_UNDERRUN)) &&
+                    ah->tx_trig_level >= sc->sc_ah->caps.tx_triglevel_max)
+                        tx_info->status.rates[tx_rateindex].count =
+                                hw->max_rate_tries;
         }
 
         for (i = tx_rateindex + 1; i < hw->max_rates; i++) {
@@ -2103,13 +2040,14 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
                          */
                         if (ts.ts_status & ATH9K_TXERR_XRETRY)
                                 bf->bf_state.bf_type |= BUF_XRETRY;
-                        ath_tx_rc_status(bf, &ts, txok ? 0 : 1, txok, true);
+                        ath_tx_rc_status(bf, &ts, 1, txok ? 0 : 1, txok, true);
                 }
 
                 qnum = skb_get_queue_mapping(bf->bf_mpdu);
 
                 if (bf_isampdu(bf))
-                        ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, txok);
+                        ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, txok,
+                                             true);
                 else
                         ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, txok, 0);
 
@@ -2225,13 +2163,14 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)
                 if (!bf_isampdu(bf)) {
                         if (txs.ts_status & ATH9K_TXERR_XRETRY)
                                 bf->bf_state.bf_type |= BUF_XRETRY;
-                        ath_tx_rc_status(bf, &txs, txok ? 0 : 1, txok, true);
+                        ath_tx_rc_status(bf, &txs, 1, txok ? 0 : 1, txok, true);
                 }
 
                 qnum = skb_get_queue_mapping(bf->bf_mpdu);
 
                 if (bf_isampdu(bf))
-                        ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs, txok);
+                        ath_tx_complete_aggr(sc, txq, bf, &bf_head, &txs,
+                                             txok, true);
                 else
                         ath_tx_complete_buf(sc, bf, txq, &bf_head,
                                             &txs, txok, 0);
diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c
index c21f3364bfe..cdfc94c371b 100644
--- a/drivers/net/wireless/ath/carl9170/cmd.c
+++ b/drivers/net/wireless/ath/carl9170/cmd.c
@@ -41,7 +41,7 @@
 
 int carl9170_write_reg(struct ar9170 *ar, const u32 reg, const u32 val)
 {
-        __le32 buf[2] = {
+        const __le32 buf[2] = {
                 cpu_to_le32(reg),
                 cpu_to_le32(val),
         };
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index 4ae6a584907..511dbe3caf5 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -663,7 +663,7 @@ init:
         }
 
 unlock:
-        if (err && (vif_id != -1)) {
+        if (err && (vif_id >= 0)) {
                 vif_priv->active = false;
                 bitmap_release_region(&ar->vif_bitmap, vif_id, 0);
                 ar->vifs--;
diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c
index 688eede4851..aee5c9d89a1 100644
--- a/drivers/net/wireless/ath/carl9170/tx.c
+++ b/drivers/net/wireless/ath/carl9170/tx.c
@@ -1261,7 +1261,7 @@ static void carl9170_tx(struct ar9170 *ar)
 static bool carl9170_tx_ampdu_queue(struct ar9170 *ar,
         struct ieee80211_sta *sta, struct sk_buff *skb)
 {
-        struct _carl9170_tx_superframe *super = (void *) super;
+        struct _carl9170_tx_superframe *super = (void *) skb->data;
         struct carl9170_sta_info *sta_info;
         struct carl9170_sta_tid *agg;
         struct sk_buff *iter;
diff --git a/drivers/net/wireless/ath/debug.c b/drivers/net/wireless/ath/debug.c
index dacfb234f49..a9600ba8cea 100644
--- a/drivers/net/wireless/ath/debug.c
+++ b/drivers/net/wireless/ath/debug.c
@@ -19,14 +19,19 @@
 
 void ath_print(struct ath_common *common, int dbg_mask, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
 
         if (likely(!(common->debug_mask & dbg_mask)))
                 return;
 
         va_start(args, fmt);
-        printk(KERN_DEBUG "ath: ");
-        vprintk(fmt, args);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        printk(KERN_DEBUG "ath: %pV", &vaf);
+
         va_end(args);
 }
 EXPORT_SYMBOL(ath_print);
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index c8f7090b27d..46e382ed46a 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1161,7 +1161,7 @@ static irqreturn_t service_interrupt(int irq, void *dev_id)
         struct atmel_private *priv = netdev_priv(dev);
         u8 isr;
         int i = -1;
-        static u8 irq_order[] = {
+        static const u8 irq_order[] = {
                 ISR_OUT_OF_RANGE,
                 ISR_RxCOMPLETE,
                 ISR_TxCOMPLETE,
@@ -3771,7 +3771,9 @@ static int probe_atmel_card(struct net_device *dev)
 
         if (rc) {
                 if (dev->dev_addr[0] == 0xFF) {
-                        u8 default_mac[] = {0x00, 0x04, 0x25, 0x00, 0x00, 0x00};
+                        static const u8 default_mac[] = {
+                                0x00, 0x04, 0x25, 0x00, 0x00, 0x00
+                        };
                         printk(KERN_ALERT "%s: *** Invalid MAC address. UPGRADE Firmware ****\n", dev->name);
                         memcpy(dev->dev_addr, default_mac, 6);
                 }
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index a1186525c70..fa488036658 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -322,59 +322,83 @@ static int b43_ratelimit(struct b43_wl *wl)
 
 void b43info(struct b43_wl *wl, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
 
         if (b43_modparam_verbose < B43_VERBOSITY_INFO)
                 return;
         if (!b43_ratelimit(wl))
                 return;
+
         va_start(args, fmt);
-        printk(KERN_INFO "b43-%s: ",
-               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-        vprintk(fmt, args);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        printk(KERN_INFO "b43-%s: %pV",
+               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
         va_end(args);
 }
 
 void b43err(struct b43_wl *wl, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
 
         if (b43_modparam_verbose < B43_VERBOSITY_ERROR)
                 return;
         if (!b43_ratelimit(wl))
                 return;
+
         va_start(args, fmt);
-        printk(KERN_ERR "b43-%s ERROR: ",
-               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-        vprintk(fmt, args);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        printk(KERN_ERR "b43-%s ERROR: %pV",
+               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
         va_end(args);
 }
 
 void b43warn(struct b43_wl *wl, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
 
         if (b43_modparam_verbose < B43_VERBOSITY_WARN)
                 return;
         if (!b43_ratelimit(wl))
                 return;
+
         va_start(args, fmt);
-        printk(KERN_WARNING "b43-%s warning: ",
-               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-        vprintk(fmt, args);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        printk(KERN_WARNING "b43-%s warning: %pV",
+               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
         va_end(args);
 }
 
 void b43dbg(struct b43_wl *wl, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
 
         if (b43_modparam_verbose < B43_VERBOSITY_DEBUG)
                 return;
+
         va_start(args, fmt);
-        printk(KERN_DEBUG "b43-%s debug: ",
-               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-        vprintk(fmt, args);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        printk(KERN_DEBUG "b43-%s debug: %pV",
+               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
         va_end(args);
 }
 
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index 7b2ea678145..fa7f83fc8db 100644
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -427,9 +427,11 @@ void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on)
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/Cordic */
 struct b43_c32 b43_cordic(int theta)
 {
-        u32 arctg[] = { 2949120, 1740967, 919879, 466945, 234379, 117304,
-                      58666, 29335, 14668, 7334, 3667, 1833, 917, 458,
-                      229, 115, 57, 29, };
+        static const u32 arctg[] = {
+                2949120, 1740967, 919879, 466945, 234379, 117304,
+                  58666,   29335,  14668,   7334,   3667,   1833,
+                    917,     458,    229,    115,     57,     29,
+        };
         u8 i;
         s32 tmp;
         s8 signx = 1;
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 6facb8ab05d..9769483156e 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -573,7 +573,6 @@ static void b43_nphy_calc_rx_iq_comp(struct b43_wldev *dev, u8 mask)
                         ii = est.i1_pwr;
                         qq = est.q1_pwr;
                 } else {
-                        B43_WARN_ON(1);
                         continue;
                 }
 
@@ -655,7 +654,8 @@ static void b43_nphy_tx_iq_workaround(struct b43_wldev *dev)
 }
 
 /* http://bcm-v4.sipsolutions.net/802.11/PHY/N/clip-detection */
-static void b43_nphy_write_clip_detection(struct b43_wldev *dev, u16 *clip_st)
+static void b43_nphy_write_clip_detection(struct b43_wldev *dev,
+                                          const u16 *clip_st)
 {
         b43_phy_write(dev, B43_NPHY_C1_CLIP1THRES, clip_st[0]);
         b43_phy_write(dev, B43_NPHY_C2_CLIP1THRES, clip_st[1]);
@@ -731,7 +731,7 @@ static void b43_nphy_stay_in_carrier_search(struct b43_wldev *dev, bool enable)
         struct b43_phy_n *nphy = phy->n;
 
         if (enable) {
-                u16 clip[] = { 0xFFFF, 0xFFFF };
+                static const u16 clip[] = { 0xFFFF, 0xFFFF };
                 if (nphy->deaf_count++ == 0) {
                         nphy->classifier_state = b43_nphy_classifier(dev, 0, 0);
                         b43_nphy_classifier(dev, 0x7, 0);
@@ -843,7 +843,7 @@ static void b43_nphy_adjust_lna_gain_table(struct b43_wldev *dev)
         u16 data[4];
         s16 gain[2];
         u16 minmax[2];
-        u16 lna_gain[4] = { -2, 10, 19, 25 };
+        static const u16 lna_gain[4] = { -2, 10, 19, 25 };
 
         if (nphy->hang_avoid)
                 b43_nphy_stay_in_carrier_search(dev, 1);
@@ -875,7 +875,7 @@ static void b43_nphy_adjust_lna_gain_table(struct b43_wldev *dev)
                         data[2] = lna_gain[2] + gain[i];
                         data[3] = lna_gain[3] + gain[i];
                 }
-                b43_ntab_write_bulk(dev, B43_NTAB16(10, 8), 4, data);
+                b43_ntab_write_bulk(dev, B43_NTAB16(i, 8), 4, data);
 
                 minmax[i] = 23 + gain[i];
         }
@@ -895,6 +895,7 @@ static void b43_nphy_gain_ctrl_workarounds(struct b43_wldev *dev)
         struct b43_phy_n *nphy = dev->phy.n;
         u8 i, j;
         u8 code;
+        u16 tmp;
 
         /* TODO: for PHY >= 3
         s8 *lna1_gain, *lna2_gain;
@@ -917,15 +918,15 @@ static void b43_nphy_gain_ctrl_workarounds(struct b43_wldev *dev)
                                 B43_NPHY_C2_CGAINI_CL2DETECT);
 
                 /* Set narrowband clip threshold */
-                b43_phy_set(dev, B43_NPHY_C1_NBCLIPTHRES, 0x84);
-                b43_phy_set(dev, B43_NPHY_C2_NBCLIPTHRES, 0x84);
+                b43_phy_write(dev, B43_NPHY_C1_NBCLIPTHRES, 0x84);
+                b43_phy_write(dev, B43_NPHY_C2_NBCLIPTHRES, 0x84);
 
                 if (!dev->phy.is_40mhz) {
                         /* Set dwell lengths */
-                        b43_phy_set(dev, B43_NPHY_CLIP1_NBDWELL_LEN, 0x002B);
-                        b43_phy_set(dev, B43_NPHY_CLIP2_NBDWELL_LEN, 0x002B);
-                        b43_phy_set(dev, B43_NPHY_W1CLIP1_DWELL_LEN, 0x0009);
-                        b43_phy_set(dev, B43_NPHY_W1CLIP2_DWELL_LEN, 0x0009);
+                        b43_phy_write(dev, B43_NPHY_CLIP1_NBDWELL_LEN, 0x002B);
+                        b43_phy_write(dev, B43_NPHY_CLIP2_NBDWELL_LEN, 0x002B);
+                        b43_phy_write(dev, B43_NPHY_W1CLIP1_DWELL_LEN, 0x0009);
+                        b43_phy_write(dev, B43_NPHY_W1CLIP2_DWELL_LEN, 0x0009);
                 }
 
                 /* Set wideband clip 2 threshold */
@@ -947,7 +948,7 @@ static void b43_nphy_gain_ctrl_workarounds(struct b43_wldev *dev)
                                 ~B43_NPHY_C2_CCK_CGAINI_GAINBKOFF, 0x1);
                 }
 
-                b43_phy_set(dev, B43_NPHY_CCK_SHIFTB_REF, 0x809C);
+                b43_phy_write(dev, B43_NPHY_CCK_SHIFTB_REF, 0x809C);
 
                 if (nphy->gain_boost) {
                         if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ &&
@@ -968,10 +969,10 @@ static void b43_nphy_gain_ctrl_workarounds(struct b43_wldev *dev)
                                 code << B43_NPHY_C2_INITGAIN_HPVGA2_SHIFT);
 
                 b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x1D06);
-                b43_phy_write(dev, B43_NPHY_TABLE_DATALO,
-                                        (code << 8 | 0x7C));
-                b43_phy_write(dev, B43_NPHY_TABLE_DATALO,
-                                        (code << 8 | 0x7C));
+                /* specs say about 2 loops, but wl does 4 */
+                for (i = 0; i < 4; i++)
+                        b43_phy_write(dev, B43_NPHY_TABLE_DATALO,
+                                                        (code << 8 | 0x7C));
 
                 b43_nphy_adjust_lna_gain_table(dev);
 
@@ -989,19 +990,21 @@ static void b43_nphy_gain_ctrl_workarounds(struct b43_wldev *dev)
                         b43_phy_write(dev, B43_NPHY_TABLE_DATALO, 0x1);
 
                         b43_phy_write(dev, B43_NPHY_TABLE_ADDR, 0x1D06);
-                        b43_phy_write(dev, B43_NPHY_TABLE_DATALO,
-                                        (code << 8 | 0x74));
-                        b43_phy_write(dev, B43_NPHY_TABLE_DATALO,
-                                        (code << 8 | 0x74));
+                        /* specs say about 2 loops, but wl does 4 */
+                        for (i = 0; i < 4; i++)
+                                b43_phy_write(dev, B43_NPHY_TABLE_DATALO,
+                                                        (code << 8 | 0x74));
                 }
 
                 if (dev->phy.rev == 2) {
                         for (i = 0; i < 4; i++) {
                                 b43_phy_write(dev, B43_NPHY_TABLE_ADDR,
                                                 (0x0400 * i) + 0x0020);
-                                for (j = 0; j < 21; j++)
+                                for (j = 0; j < 21; j++) {
+                                        tmp = j * (i < 2 ? 3 : 1);
                                         b43_phy_write(dev,
-                                                B43_NPHY_TABLE_DATALO, 3 * j);
+                                                B43_NPHY_TABLE_DATALO, tmp);
+                                }
                         }
 
                         b43_nphy_set_rf_sequence(dev, 5,
@@ -1030,7 +1033,7 @@ static void b43_nphy_workarounds(struct b43_wldev *dev)
         u8 events2[7] = { 0x0, 0x3, 0x5, 0x4, 0x2, 0x1, 0x8 };
         u8 delays2[7] = { 0x8, 0x6, 0x2, 0x4, 0x4, 0x6, 0x1 };
 
-        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)
                 b43_nphy_classifier(dev, 1, 0);
         else
                 b43_nphy_classifier(dev, 1, 1);
@@ -1569,19 +1572,20 @@ static void b43_nphy_rf_control_intc_override(struct b43_wldev *dev, u8 field,
         }
 }
 
+/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/BPHYInit */
 static void b43_nphy_bphy_init(struct b43_wldev *dev)
 {
         unsigned int i;
         u16 val;
 
         val = 0x1E1F;
-        for (i = 0; i < 14; i++) {
+        for (i = 0; i < 16; i++) {
                 b43_phy_write(dev, B43_PHY_N_BMODE(0x88 + i), val);
                 val -= 0x202;
         }
         val = 0x3E3F;
         for (i = 0; i < 16; i++) {
-                b43_phy_write(dev, B43_PHY_N_BMODE(0x97 + i), val);
+                b43_phy_write(dev, B43_PHY_N_BMODE(0x98 + i), val);
                 val -= 0x202;
         }
         b43_phy_write(dev, B43_PHY_N_BMODE(0x38), 0x668);
@@ -1841,6 +1845,14 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
                 save_regs_phy[5] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER);
                 save_regs_phy[6] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B1S0);
                 save_regs_phy[7] = b43_phy_read(dev, B43_NPHY_TXF_40CO_B32S1);
+        } else if (dev->phy.rev == 2) {
+                save_regs_phy[0] = b43_phy_read(dev, B43_NPHY_AFECTL_C1);
+                save_regs_phy[1] = b43_phy_read(dev, B43_NPHY_AFECTL_C2);
+                save_regs_phy[2] = b43_phy_read(dev, B43_NPHY_AFECTL_OVER);
+                save_regs_phy[3] = b43_phy_read(dev, B43_NPHY_RFCTL_CMD);
+                save_regs_phy[4] = b43_phy_read(dev, B43_NPHY_RFCTL_OVER);
+                save_regs_phy[5] = b43_phy_read(dev, B43_NPHY_RFCTL_RSSIO1);
+                save_regs_phy[6] = b43_phy_read(dev, B43_NPHY_RFCTL_RSSIO2);
         }
 
         b43_nphy_rssi_select(dev, 5, type);
@@ -1884,6 +1896,14 @@ static int b43_nphy_poll_rssi(struct b43_wldev *dev, u8 type, s32 *buf,
                 b43_phy_write(dev, B43_NPHY_AFECTL_OVER, save_regs_phy[5]);
                 b43_phy_write(dev, B43_NPHY_TXF_40CO_B1S0, save_regs_phy[6]);
                 b43_phy_write(dev, B43_NPHY_TXF_40CO_B32S1, save_regs_phy[7]);
+        } else if (dev->phy.rev == 2) {
+                b43_phy_write(dev, B43_NPHY_AFECTL_C1, save_regs_phy[0]);
+                b43_phy_write(dev, B43_NPHY_AFECTL_C2, save_regs_phy[1]);
+                b43_phy_write(dev, B43_NPHY_AFECTL_OVER, save_regs_phy[2]);
+                b43_phy_write(dev, B43_NPHY_RFCTL_CMD, save_regs_phy[3]);
+                b43_phy_write(dev, B43_NPHY_RFCTL_OVER, save_regs_phy[4]);
+                b43_phy_write(dev, B43_NPHY_RFCTL_RSSIO1, save_regs_phy[5]);
+                b43_phy_write(dev, B43_NPHY_RFCTL_RSSIO2, save_regs_phy[6]);
         }
 
         return out;
@@ -2008,7 +2028,7 @@ static void b43_nphy_rev2_rssi_cal(struct b43_wldev *dev, u8 type)
         }
 
         b43_radio_maskset(dev, B2055_C1_PD_RSSIMISC, 0xF8, state[0]);
-        b43_radio_maskset(dev, B2055_C1_PD_RSSIMISC, 0xF8, state[1]);
+        b43_radio_maskset(dev, B2055_C2_PD_RSSIMISC, 0xF8, state[1]);
 
         switch (state[2]) {
         case 1:
@@ -2299,7 +2319,7 @@ static void b43_nphy_int_pa_set_tx_dig_filters(struct b43_wldev *dev)
 {
         int i, j;
         /* B43_NPHY_TXF_20CO_S0A1, B43_NPHY_TXF_40CO_S0A1, unknown */
-        u16 offset[] = { 0x186, 0x195, 0x2C5 };
+        static const u16 offset[] = { 0x186, 0x195, 0x2C5 };
 
         for (i = 0; i < 3; i++)
                 for (j = 0; j < 15; j++)
@@ -3092,7 +3112,7 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
 {
         struct b43_phy *phy = &dev->phy;
         struct b43_phy_n *nphy = phy->n;
-        u16 buf[16];
+        /* u16 buf[16]; it's rev3+ */
 
         nphy->phyrxchain = mask;
 
@@ -3236,6 +3256,9 @@ int b43_phy_initn(struct b43_wldev *dev)
 
         b43_nphy_classifier(dev, 0, 0);
         b43_nphy_read_clip_detection(dev, clip);
+        if (b43_current_band(dev->wl) == IEEE80211_BAND_2GHZ)
+                b43_nphy_bphy_init(dev);
+
         tx_pwr_state = nphy->txpwrctrl;
         /* TODO N PHY TX power control with argument 0
                 (turning off power control) */
@@ -3385,7 +3408,6 @@ static int b43_nphy_set_channel(struct b43_wldev *dev,
                                 enum nl80211_channel_type channel_type)
 {
         struct b43_phy *phy = &dev->phy;
-        struct b43_phy_n *nphy = dev->phy.n;
 
         const struct b43_nphy_channeltab_entry_rev2 *tabent_r2;
         const struct b43_nphy_channeltab_entry_rev3 *tabent_r3;
@@ -3455,7 +3477,9 @@ static void b43_nphy_op_prepare_structs(struct b43_wldev *dev)
 
         memset(nphy, 0, sizeof(*nphy));
 
-        //TODO init struct b43_phy_n
+        nphy->gain_boost = true; /* this way we follow wl, assume it is true */
+        nphy->txrx_chain = 2; /* sth different than 0 and 1 for now */
+        nphy->phyrxchain = 3; /* to avoid b43_nphy_set_rx_core_state like wl */
 }
 
 static void b43_nphy_op_free(struct b43_wldev *dev)
@@ -3528,8 +3552,6 @@ static void b43_nphy_op_radio_write(struct b43_wldev *dev, u16 reg, u16 value)
 static void b43_nphy_op_software_rfkill(struct b43_wldev *dev,
                                         bool blocked)
 {
-        struct b43_phy_n *nphy = dev->phy.n;
-
         if (b43_read32(dev, B43_MMIO_MACCTL) & B43_MACCTL_ENABLED)
                 b43err(dev->wl, "MAC not suspended\n");
 
diff --git a/drivers/net/wireless/b43/radio_2055.c b/drivers/net/wireless/b43/radio_2055.c
index 0d6771515bc..10910dc4184 100644
--- a/drivers/net/wireless/b43/radio_2055.c
+++ b/drivers/net/wireless/b43/radio_2055.c
@@ -307,7 +307,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xEC, 0x0F, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xFF, 0xFF, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xB407, 0xB007, 0xAC07, 0x1402, 0x1502, 0x1602),
+        PHYREGS(0x07B4, 0x07B0, 0x07AC, 0x0214, 0x0215, 0x0216),
   },
   {     .channel                = 186,
         .freq                   = 4930, /* MHz */
@@ -315,7 +315,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xED, 0x0F, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xFF, 0xFF, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xB807, 0xB407, 0xB007, 0x1302, 0x1402, 0x1502),
+        PHYREGS(0x07B8, 0x07B4, 0x07B0, 0x0213, 0x0214, 0x0215),
   },
   {     .channel                = 188,
         .freq                   = 4940, /* MHz */
@@ -323,7 +323,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xEE, 0x0F, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xEE, 0xEE, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xBC07, 0xB807, 0xB407, 0x1202, 0x1302, 0x1402),
+        PHYREGS(0x07BC, 0x07B8, 0x07B4, 0x0212, 0x0213, 0x0214),
   },
   {     .channel                = 190,
         .freq                   = 4950, /* MHz */
@@ -331,7 +331,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xEF, 0x0F, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xEE, 0xEE, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xC007, 0xBC07, 0xB807, 0x1102, 0x1202, 0x1302),
+        PHYREGS(0x07C0, 0x07BC, 0x07B8, 0x0211, 0x0212, 0x0213),
   },
   {     .channel                = 192,
         .freq                   = 4960, /* MHz */
@@ -339,7 +339,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF0, 0x0F, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xEE, 0xEE, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xC407, 0xC007, 0xBC07, 0x0F02, 0x1102, 0x1202),
+        PHYREGS(0x07C4, 0x07C0, 0x07BC, 0x020F, 0x0211, 0x0212),
   },
   {     .channel                = 194,
         .freq                   = 4970, /* MHz */
@@ -347,7 +347,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF1, 0x0F, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xEE, 0xEE, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xC807, 0xC407, 0xC007, 0x0E02, 0x0F02, 0x1102),
+        PHYREGS(0x07C8, 0x07C4, 0x07C0, 0x020E, 0x020F, 0x0211),
   },
   {     .channel                = 196,
         .freq                   = 4980, /* MHz */
@@ -355,7 +355,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF2, 0x0E, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xDD, 0xDD, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xCC07, 0xC807, 0xC407, 0x0D02, 0x0E02, 0x0F02),
+        PHYREGS(0x07CC, 0x07C8, 0x07C4, 0x020D, 0x020E, 0x020F),
   },
   {     .channel                = 198,
         .freq                   = 4990, /* MHz */
@@ -363,7 +363,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF3, 0x0E, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xDD, 0xDD, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xD007, 0xCC07, 0xC807, 0x0C02, 0x0D02, 0x0E02),
+        PHYREGS(0x07D0, 0x07CC, 0x07C8, 0x020C, 0x020D, 0x020E),
   },
   {     .channel                = 200,
         .freq                   = 5000, /* MHz */
@@ -371,7 +371,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF4, 0x0E, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xDD, 0xDD, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xD407, 0xD007, 0xCC07, 0x0B02, 0x0C02, 0x0D02),
+        PHYREGS(0x07D4, 0x07D0, 0x07CC, 0x020B, 0x020C, 0x020D),
   },
   {     .channel                = 202,
         .freq                   = 5010, /* MHz */
@@ -379,7 +379,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF5, 0x0E, 0xFF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xDD, 0xDD, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xD807, 0xD407, 0xD007, 0x0A02, 0x0B02, 0x0C02),
+        PHYREGS(0x07D8, 0x07D4, 0x07D0, 0x020A, 0x020B, 0x020C),
   },
   {     .channel                = 204,
         .freq                   = 5020, /* MHz */
@@ -387,7 +387,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF6, 0x0E, 0xF7, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xCC, 0xCC, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xDC07, 0xD807, 0xD407, 0x0902, 0x0A02, 0x0B02),
+        PHYREGS(0x07DC, 0x07D8, 0x07D4, 0x0209, 0x020A, 0x020B),
   },
   {     .channel                = 206,
         .freq                   = 5030, /* MHz */
@@ -395,7 +395,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF7, 0x0E, 0xF7, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xCC, 0xCC, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xE007, 0xDC07, 0xD807, 0x0802, 0x0902, 0x0A02),
+        PHYREGS(0x07E0, 0x07DC, 0x07D8, 0x0208, 0x0209, 0x020A),
   },
   {     .channel                = 208,
         .freq                   = 5040, /* MHz */
@@ -403,7 +403,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF8, 0x0D, 0xEF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xCC, 0xCC, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xE407, 0xE007, 0xDC07, 0x0702, 0x0802, 0x0902),
+        PHYREGS(0x07E4, 0x07E0, 0x07DC, 0x0207, 0x0208, 0x0209),
   },
   {     .channel                = 210,
         .freq                   = 5050, /* MHz */
@@ -411,7 +411,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xF9, 0x0D, 0xEF, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xCC, 0xCC, 0xFF, 0x00, 0x0F, 0x0F,
                   0x8F, 0xFF, 0x00, 0x0F, 0x0F, 0x8F),
-        PHYREGS(0xE807, 0xE407, 0xE007, 0x0602, 0x0702, 0x0802),
+        PHYREGS(0x07E8, 0x07E4, 0x07E0, 0x0206, 0x0207, 0x0208),
   },
   {     .channel                = 212,
         .freq                   = 5060, /* MHz */
@@ -419,7 +419,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xFA, 0x0D, 0xE6, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xBB, 0xBB, 0xFF, 0x00, 0x0E, 0x0F,
                   0x8E, 0xFF, 0x00, 0x0E, 0x0F, 0x8E),
-        PHYREGS(0xEC07, 0xE807, 0xE407, 0x0502, 0x0602, 0x0702),
+        PHYREGS(0x07EC, 0x07E8, 0x07E4, 0x0205, 0x0206, 0x0207),
   },
   {     .channel                = 214,
         .freq                   = 5070, /* MHz */
@@ -427,7 +427,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xFB, 0x0D, 0xE6, 0x01, 0x04, 0x0A,
                   0x00, 0x8F, 0xBB, 0xBB, 0xFF, 0x00, 0x0E, 0x0F,
                   0x8E, 0xFF, 0x00, 0x0E, 0x0F, 0x8E),
-        PHYREGS(0xF007, 0xEC07, 0xE807, 0x0402, 0x0502, 0x0602),
+        PHYREGS(0x07F0, 0x07EC, 0x07E8, 0x0204, 0x0205, 0x0206),
   },
   {     .channel                = 216,
         .freq                   = 5080, /* MHz */
@@ -435,7 +435,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xFC, 0x0D, 0xDE, 0x01, 0x04, 0x0A,
                   0x00, 0x8E, 0xBB, 0xBB, 0xEE, 0x00, 0x0E, 0x0F,
                   0x8D, 0xEE, 0x00, 0x0E, 0x0F, 0x8D),
-        PHYREGS(0xF407, 0xF007, 0xEC07, 0x0302, 0x0402, 0x0502),
+        PHYREGS(0x07F4, 0x07F0, 0x07EC, 0x0203, 0x0204, 0x0205),
   },
   {     .channel                = 218,
         .freq                   = 5090, /* MHz */
@@ -443,7 +443,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xFD, 0x0D, 0xDE, 0x01, 0x04, 0x0A,
                   0x00, 0x8E, 0xBB, 0xBB, 0xEE, 0x00, 0x0E, 0x0F,
                   0x8D, 0xEE, 0x00, 0x0E, 0x0F, 0x8D),
-        PHYREGS(0xF807, 0xF407, 0xF007, 0x0202, 0x0302, 0x0402),
+        PHYREGS(0x07F8, 0x07F4, 0x07F0, 0x0202, 0x0203, 0x0204),
   },
   {     .channel                = 220,
         .freq                   = 5100, /* MHz */
@@ -451,7 +451,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xFE, 0x0C, 0xD6, 0x01, 0x04, 0x0A,
                   0x00, 0x8E, 0xAA, 0xAA, 0xEE, 0x00, 0x0D, 0x0F,
                   0x8D, 0xEE, 0x00, 0x0D, 0x0F, 0x8D),
-        PHYREGS(0xFC07, 0xF807, 0xF407, 0x0102, 0x0202, 0x0302),
+        PHYREGS(0x07FC, 0x07F8, 0x07F4, 0x0201, 0x0202, 0x0203),
   },
   {     .channel                = 222,
         .freq                   = 5110, /* MHz */
@@ -459,7 +459,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x01, 0xFF, 0x0C, 0xD6, 0x01, 0x04, 0x0A,
                   0x00, 0x8E, 0xAA, 0xAA, 0xEE, 0x00, 0x0D, 0x0F,
                   0x8D, 0xEE, 0x00, 0x0D, 0x0F, 0x8D),
-        PHYREGS(0x0008, 0xFC07, 0xF807, 0x0002, 0x0102, 0x0202),
+        PHYREGS(0x0800, 0x07FC, 0x07F8, 0x0200, 0x0201, 0x0202),
   },
   {     .channel                = 224,
         .freq                   = 5120, /* MHz */
@@ -467,7 +467,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x00, 0x0C, 0xCE, 0x01, 0x04, 0x0A,
                   0x00, 0x8D, 0xAA, 0xAA, 0xDD, 0x00, 0x0D, 0x0F,
                   0x8C, 0xDD, 0x00, 0x0D, 0x0F, 0x8C),
-        PHYREGS(0x0408, 0x0008, 0xFC07, 0xFF01, 0x0002, 0x0102),
+        PHYREGS(0x0804, 0x0800, 0x07FC, 0x01FF, 0x0200, 0x0201),
   },
   {     .channel                = 226,
         .freq                   = 5130, /* MHz */
@@ -475,7 +475,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x01, 0x0C, 0xCE, 0x01, 0x04, 0x0A,
                   0x00, 0x8D, 0xAA, 0xAA, 0xDD, 0x00, 0x0D, 0x0F,
                   0x8C, 0xDD, 0x00, 0x0D, 0x0F, 0x8C),
-        PHYREGS(0x0808, 0x0408, 0x0008, 0xFE01, 0xFF01, 0x0002),
+        PHYREGS(0x0808, 0x0804, 0x0800, 0x01FE, 0x01FF, 0x0200),
   },
   {     .channel                = 228,
         .freq                   = 5140, /* MHz */
@@ -483,7 +483,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x02, 0x0C, 0xC6, 0x01, 0x04, 0x0A,
                   0x00, 0x8D, 0x99, 0x99, 0xDD, 0x00, 0x0C, 0x0E,
                   0x8B, 0xDD, 0x00, 0x0C, 0x0E, 0x8B),
-        PHYREGS(0x0C08, 0x0808, 0x0408, 0xFD01, 0xFE01, 0xFF01),
+        PHYREGS(0x080C, 0x0808, 0x0804, 0x01FD, 0x01FE, 0x01FF),
   },
   {     .channel                = 32,
         .freq                   = 5160, /* MHz */
@@ -491,7 +491,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x04, 0x0B, 0xBE, 0x01, 0x04, 0x0A,
                   0x00, 0x8C, 0x99, 0x99, 0xCC, 0x00, 0x0B, 0x0D,
                   0x8A, 0xCC, 0x00, 0x0B, 0x0D, 0x8A),
-        PHYREGS(0x1408, 0x1008, 0x0C08, 0xFB01, 0xFC01, 0xFD01),
+        PHYREGS(0x0814, 0x0810, 0x080C, 0x01FB, 0x01FC, 0x01FD),
   },
   {     .channel                = 34,
         .freq                   = 5170, /* MHz */
@@ -499,7 +499,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x05, 0x0B, 0xBE, 0x01, 0x04, 0x0A,
                   0x00, 0x8C, 0x99, 0x99, 0xCC, 0x00, 0x0B, 0x0D,
                   0x8A, 0xCC, 0x00, 0x0B, 0x0D, 0x8A),
-        PHYREGS(0x1808, 0x1408, 0x1008, 0xFA01, 0xFB01, 0xFC01),
+        PHYREGS(0x0818, 0x0814, 0x0810, 0x01FA, 0x01FB, 0x01FC),
   },
   {     .channel                = 36,
         .freq                   = 5180, /* MHz */
@@ -507,7 +507,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x06, 0x0B, 0xB6, 0x01, 0x04, 0x0A,
                   0x00, 0x8C, 0x88, 0x88, 0xCC, 0x00, 0x0B, 0x0C,
                   0x89, 0xCC, 0x00, 0x0B, 0x0C, 0x89),
-        PHYREGS(0x1C08, 0x1808, 0x1408, 0xF901, 0xFA01, 0xFB01),
+        PHYREGS(0x081C, 0x0818, 0x0814, 0x01F9, 0x01FA, 0x01FB),
   },
   {     .channel                = 38,
         .freq                   = 5190, /* MHz */
@@ -515,7 +515,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x07, 0x0B, 0xB6, 0x01, 0x04, 0x0A,
                   0x00, 0x8C, 0x88, 0x88, 0xCC, 0x00, 0x0B, 0x0C,
                   0x89, 0xCC, 0x00, 0x0B, 0x0C, 0x89),
-        PHYREGS(0x2008, 0x1C08, 0x1808, 0xF801, 0xF901, 0xFA01),
+        PHYREGS(0x0820, 0x081C, 0x0818, 0x01F8, 0x01F9, 0x01FA),
   },
   {     .channel                = 40,
         .freq                   = 5200, /* MHz */
@@ -523,7 +523,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x08, 0x0B, 0xAF, 0x01, 0x04, 0x0A,
                   0x00, 0x8B, 0x88, 0x88, 0xBB, 0x00, 0x0A, 0x0B,
                   0x89, 0xBB, 0x00, 0x0A, 0x0B, 0x89),
-        PHYREGS(0x2408, 0x2008, 0x1C08, 0xF701, 0xF801, 0xF901),
+        PHYREGS(0x0824, 0x0820, 0x081C, 0x01F7, 0x01F8, 0x01F9),
   },
   {     .channel                = 42,
         .freq                   = 5210, /* MHz */
@@ -531,7 +531,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x09, 0x0B, 0xAF, 0x01, 0x04, 0x0A,
                   0x00, 0x8B, 0x88, 0x88, 0xBB, 0x00, 0x0A, 0x0B,
                   0x89, 0xBB, 0x00, 0x0A, 0x0B, 0x89),
-        PHYREGS(0x2808, 0x2408, 0x2008, 0xF601, 0xF701, 0xF801),
+        PHYREGS(0x0828, 0x0824, 0x0820, 0x01F6, 0x01F7, 0x01F8),
   },
   {     .channel                = 44,
         .freq                   = 5220, /* MHz */
@@ -539,7 +539,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x0A, 0x0A, 0xA7, 0x01, 0x04, 0x0A,
                   0x00, 0x8B, 0x77, 0x77, 0xBB, 0x00, 0x09, 0x0A,
                   0x88, 0xBB, 0x00, 0x09, 0x0A, 0x88),
-        PHYREGS(0x2C08, 0x2808, 0x2408, 0xF501, 0xF601, 0xF701),
+        PHYREGS(0x082C, 0x0828, 0x0824, 0x01F5, 0x01F6, 0x01F7),
   },
   {     .channel                = 46,
         .freq                   = 5230, /* MHz */
@@ -547,7 +547,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x0B, 0x0A, 0xA7, 0x01, 0x04, 0x0A,
                   0x00, 0x8B, 0x77, 0x77, 0xBB, 0x00, 0x09, 0x0A,
                   0x88, 0xBB, 0x00, 0x09, 0x0A, 0x88),
-        PHYREGS(0x3008, 0x2C08, 0x2808, 0xF401, 0xF501, 0xF601),
+        PHYREGS(0x0830, 0x082C, 0x0828, 0x01F4, 0x01F5, 0x01F6),
   },
   {     .channel                = 48,
         .freq                   = 5240, /* MHz */
@@ -555,7 +555,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x0C, 0x0A, 0xA0, 0x01, 0x04, 0x0A,
                   0x00, 0x8A, 0x77, 0x77, 0xAA, 0x00, 0x09, 0x0A,
                   0x87, 0xAA, 0x00, 0x09, 0x0A, 0x87),
-        PHYREGS(0x3408, 0x3008, 0x2C08, 0xF301, 0xF401, 0xF501),
+        PHYREGS(0x0834, 0x0830, 0x082C, 0x01F3, 0x01F4, 0x01F5),
   },
   {     .channel                = 50,
         .freq                   = 5250, /* MHz */
@@ -563,7 +563,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x0D, 0x0A, 0xA0, 0x01, 0x04, 0x0A,
                   0x00, 0x8A, 0x77, 0x77, 0xAA, 0x00, 0x09, 0x0A,
                   0x87, 0xAA, 0x00, 0x09, 0x0A, 0x87),
-        PHYREGS(0x3808, 0x3408, 0x3008, 0xF201, 0xF301, 0xF401),
+        PHYREGS(0x0838, 0x0834, 0x0830, 0x01F2, 0x01F3, 0x01F4),
   },
   {     .channel                = 52,
         .freq                   = 5260, /* MHz */
@@ -571,7 +571,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x0E, 0x0A, 0x98, 0x01, 0x04, 0x0A,
                   0x00, 0x8A, 0x66, 0x66, 0xAA, 0x00, 0x08, 0x09,
                   0x87, 0xAA, 0x00, 0x08, 0x09, 0x87),
-        PHYREGS(0x3C08, 0x3808, 0x3408, 0xF101, 0xF201, 0xF301),
+        PHYREGS(0x083C, 0x0838, 0x0834, 0x01F1, 0x01F2, 0x01F3),
   },
   {     .channel                = 54,
         .freq                   = 5270, /* MHz */
@@ -579,7 +579,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x0F, 0x0A, 0x98, 0x01, 0x04, 0x0A,
                   0x00, 0x8A, 0x66, 0x66, 0xAA, 0x00, 0x08, 0x09,
                   0x87, 0xAA, 0x00, 0x08, 0x09, 0x87),
-        PHYREGS(0x4008, 0x3C08, 0x3808, 0xF001, 0xF101, 0xF201),
+        PHYREGS(0x0840, 0x083C, 0x0838, 0x01F0, 0x01F1, 0x01F2),
   },
   {     .channel                = 56,
         .freq                   = 5280, /* MHz */
@@ -587,7 +587,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x10, 0x09, 0x91, 0x01, 0x04, 0x0A,
                   0x00, 0x89, 0x66, 0x66, 0x99, 0x00, 0x08, 0x08,
                   0x86, 0x99, 0x00, 0x08, 0x08, 0x86),
-        PHYREGS(0x4408, 0x4008, 0x3C08, 0xF001, 0xF001, 0xF101),
+        PHYREGS(0x0844, 0x0840, 0x083C, 0x01F0, 0x01F0, 0x01F1),
   },
   {     .channel                = 58,
         .freq                   = 5290, /* MHz */
@@ -595,7 +595,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x11, 0x09, 0x91, 0x01, 0x04, 0x0A,
                   0x00, 0x89, 0x66, 0x66, 0x99, 0x00, 0x08, 0x08,
                   0x86, 0x99, 0x00, 0x08, 0x08, 0x86),
-        PHYREGS(0x4808, 0x4408, 0x4008, 0xEF01, 0xF001, 0xF001),
+        PHYREGS(0x0848, 0x0844, 0x0840, 0x01EF, 0x01F0, 0x01F0),
   },
   {     .channel                = 60,
         .freq                   = 5300, /* MHz */
@@ -603,7 +603,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x12, 0x09, 0x8A, 0x01, 0x04, 0x0A,
                   0x00, 0x89, 0x55, 0x55, 0x99, 0x00, 0x08, 0x07,
                   0x85, 0x99, 0x00, 0x08, 0x07, 0x85),
-        PHYREGS(0x4C08, 0x4808, 0x4408, 0xEE01, 0xEF01, 0xF001),
+        PHYREGS(0x084C, 0x0848, 0x0844, 0x01EE, 0x01EF, 0x01F0),
   },
   {     .channel                = 62,
         .freq                   = 5310, /* MHz */
@@ -611,7 +611,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x13, 0x09, 0x8A, 0x01, 0x04, 0x0A,
                   0x00, 0x89, 0x55, 0x55, 0x99, 0x00, 0x08, 0x07,
                   0x85, 0x99, 0x00, 0x08, 0x07, 0x85),
-        PHYREGS(0x5008, 0x4C08, 0x4808, 0xED01, 0xEE01, 0xEF01),
+        PHYREGS(0x0850, 0x084C, 0x0848, 0x01ED, 0x01EE, 0x01EF),
   },
   {     .channel                = 64,
         .freq                   = 5320, /* MHz */
@@ -619,7 +619,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x14, 0x09, 0x83, 0x01, 0x04, 0x0A,
                   0x00, 0x88, 0x55, 0x55, 0x88, 0x00, 0x07, 0x07,
                   0x84, 0x88, 0x00, 0x07, 0x07, 0x84),
-        PHYREGS(0x5408, 0x5008, 0x4C08, 0xEC01, 0xED01, 0xEE01),
+        PHYREGS(0x0854, 0x0850, 0x084C, 0x01EC, 0x01ED, 0x01EE),
   },
   {     .channel                = 66,
         .freq                   = 5330, /* MHz */
@@ -627,7 +627,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x15, 0x09, 0x83, 0x01, 0x04, 0x0A,
                   0x00, 0x88, 0x55, 0x55, 0x88, 0x00, 0x07, 0x07,
                   0x84, 0x88, 0x00, 0x07, 0x07, 0x84),
-        PHYREGS(0x5808, 0x5408, 0x5008, 0xEB01, 0xEC01, 0xED01),
+        PHYREGS(0x0858, 0x0854, 0x0850, 0x01EB, 0x01EC, 0x01ED),
   },
   {     .channel                = 68,
         .freq                   = 5340, /* MHz */
@@ -635,7 +635,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x16, 0x08, 0x7C, 0x01, 0x04, 0x0A,
                   0x00, 0x88, 0x44, 0x44, 0x88, 0x00, 0x07, 0x06,
                   0x84, 0x88, 0x00, 0x07, 0x06, 0x84),
-        PHYREGS(0x5C08, 0x5808, 0x5408, 0xEA01, 0xEB01, 0xEC01),
+        PHYREGS(0x085C, 0x0858, 0x0854, 0x01EA, 0x01EB, 0x01EC),
   },
   {     .channel                = 70,
         .freq                   = 5350, /* MHz */
@@ -643,7 +643,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x17, 0x08, 0x7C, 0x01, 0x04, 0x0A,
                   0x00, 0x88, 0x44, 0x44, 0x88, 0x00, 0x07, 0x06,
                   0x84, 0x88, 0x00, 0x07, 0x06, 0x84),
-        PHYREGS(0x6008, 0x5C08, 0x5808, 0xE901, 0xEA01, 0xEB01),
+        PHYREGS(0x0860, 0x085C, 0x0858, 0x01E9, 0x01EA, 0x01EB),
   },
   {     .channel                = 72,
         .freq                   = 5360, /* MHz */
@@ -651,7 +651,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x18, 0x08, 0x75, 0x01, 0x04, 0x0A,
                   0x00, 0x87, 0x44, 0x44, 0x77, 0x00, 0x06, 0x05,
                   0x83, 0x77, 0x00, 0x06, 0x05, 0x83),
-        PHYREGS(0x6408, 0x6008, 0x5C08, 0xE801, 0xE901, 0xEA01),
+        PHYREGS(0x0864, 0x0860, 0x085C, 0x01E8, 0x01E9, 0x01EA),
   },
   {     .channel                = 74,
         .freq                   = 5370, /* MHz */
@@ -659,7 +659,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x19, 0x08, 0x75, 0x01, 0x04, 0x0A,
                   0x00, 0x87, 0x44, 0x44, 0x77, 0x00, 0x06, 0x05,
                   0x83, 0x77, 0x00, 0x06, 0x05, 0x83),
-        PHYREGS(0x6808, 0x6408, 0x6008, 0xE701, 0xE801, 0xE901),
+        PHYREGS(0x0868, 0x0864, 0x0860, 0x01E7, 0x01E8, 0x01E9),
   },
   {     .channel                = 76,
         .freq                   = 5380, /* MHz */
@@ -667,7 +667,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x1A, 0x08, 0x6E, 0x01, 0x04, 0x0A,
                   0x00, 0x87, 0x33, 0x33, 0x77, 0x00, 0x06, 0x04,
                   0x82, 0x77, 0x00, 0x06, 0x04, 0x82),
-        PHYREGS(0x6C08, 0x6808, 0x6408, 0xE601, 0xE701, 0xE801),
+        PHYREGS(0x086C, 0x0868, 0x0864, 0x01E6, 0x01E7, 0x01E8),
   },
   {     .channel                = 78,
         .freq                   = 5390, /* MHz */
@@ -675,7 +675,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x1B, 0x08, 0x6E, 0x01, 0x04, 0x0A,
                   0x00, 0x87, 0x33, 0x33, 0x77, 0x00, 0x06, 0x04,
                   0x82, 0x77, 0x00, 0x06, 0x04, 0x82),
-        PHYREGS(0x7008, 0x6C08, 0x6808, 0xE501, 0xE601, 0xE701),
+        PHYREGS(0x0870, 0x086C, 0x0868, 0x01E5, 0x01E6, 0x01E7),
   },
   {     .channel                = 80,
         .freq                   = 5400, /* MHz */
@@ -683,7 +683,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x1C, 0x07, 0x67, 0x01, 0x04, 0x0A,
                   0x00, 0x86, 0x33, 0x33, 0x66, 0x00, 0x05, 0x04,
                   0x81, 0x66, 0x00, 0x05, 0x04, 0x81),
-        PHYREGS(0x7408, 0x7008, 0x6C08, 0xE501, 0xE501, 0xE601),
+        PHYREGS(0x0874, 0x0870, 0x086C, 0x01E5, 0x01E5, 0x01E6),
   },
   {     .channel                = 82,
         .freq                   = 5410, /* MHz */
@@ -691,7 +691,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x1D, 0x07, 0x67, 0x01, 0x04, 0x0A,
                   0x00, 0x86, 0x33, 0x33, 0x66, 0x00, 0x05, 0x04,
                   0x81, 0x66, 0x00, 0x05, 0x04, 0x81),
-        PHYREGS(0x7808, 0x7408, 0x7008, 0xE401, 0xE501, 0xE501),
+        PHYREGS(0x0878, 0x0874, 0x0870, 0x01E4, 0x01E5, 0x01E5),
   },
   {     .channel                = 84,
         .freq                   = 5420, /* MHz */
@@ -699,7 +699,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x1E, 0x07, 0x61, 0x01, 0x04, 0x0A,
                   0x00, 0x86, 0x22, 0x22, 0x66, 0x00, 0x05, 0x03,
                   0x80, 0x66, 0x00, 0x05, 0x03, 0x80),
-        PHYREGS(0x7C08, 0x7808, 0x7408, 0xE301, 0xE401, 0xE501),
+        PHYREGS(0x087C, 0x0878, 0x0874, 0x01E3, 0x01E4, 0x01E5),
   },
   {     .channel                = 86,
         .freq                   = 5430, /* MHz */
@@ -707,7 +707,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x1F, 0x07, 0x61, 0x01, 0x04, 0x0A,
                   0x00, 0x86, 0x22, 0x22, 0x66, 0x00, 0x05, 0x03,
                   0x80, 0x66, 0x00, 0x05, 0x03, 0x80),
-        PHYREGS(0x8008, 0x7C08, 0x7808, 0xE201, 0xE301, 0xE401),
+        PHYREGS(0x0880, 0x087C, 0x0878, 0x01E2, 0x01E3, 0x01E4),
   },
   {     .channel                = 88,
         .freq                   = 5440, /* MHz */
@@ -715,7 +715,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x20, 0x07, 0x5A, 0x01, 0x04, 0x0A,
                   0x00, 0x85, 0x22, 0x22, 0x55, 0x00, 0x04, 0x02,
                   0x80, 0x55, 0x00, 0x04, 0x02, 0x80),
-        PHYREGS(0x8408, 0x8008, 0x7C08, 0xE101, 0xE201, 0xE301),
+        PHYREGS(0x0884, 0x0880, 0x087C, 0x01E1, 0x01E2, 0x01E3),
   },
   {     .channel                = 90,
         .freq                   = 5450, /* MHz */
@@ -723,7 +723,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x21, 0x07, 0x5A, 0x01, 0x04, 0x0A,
                   0x00, 0x85, 0x22, 0x22, 0x55, 0x00, 0x04, 0x02,
                   0x80, 0x55, 0x00, 0x04, 0x02, 0x80),
-        PHYREGS(0x8808, 0x8408, 0x8008, 0xE001, 0xE101, 0xE201),
+        PHYREGS(0x0888, 0x0884, 0x0880, 0x01E0, 0x01E1, 0x01E2),
   },
   {     .channel                = 92,
         .freq                   = 5460, /* MHz */
@@ -731,7 +731,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x22, 0x06, 0x53, 0x01, 0x04, 0x0A,
                   0x00, 0x85, 0x11, 0x11, 0x55, 0x00, 0x04, 0x01,
                   0x80, 0x55, 0x00, 0x04, 0x01, 0x80),
-        PHYREGS(0x8C08, 0x8808, 0x8408, 0xDF01, 0xE001, 0xE101),
+        PHYREGS(0x088C, 0x0888, 0x0884, 0x01DF, 0x01E0, 0x01E1),
   },
   {     .channel                = 94,
         .freq                   = 5470, /* MHz */
@@ -739,7 +739,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x23, 0x06, 0x53, 0x01, 0x04, 0x0A,
                   0x00, 0x85, 0x11, 0x11, 0x55, 0x00, 0x04, 0x01,
                   0x80, 0x55, 0x00, 0x04, 0x01, 0x80),
-        PHYREGS(0x9008, 0x8C08, 0x8808, 0xDE01, 0xDF01, 0xE001),
+        PHYREGS(0x0890, 0x088C, 0x0888, 0x01DE, 0x01DF, 0x01E0),
   },
   {     .channel                = 96,
         .freq                   = 5480, /* MHz */
@@ -747,7 +747,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x24, 0x06, 0x4D, 0x01, 0x04, 0x0A,
                   0x00, 0x84, 0x11, 0x11, 0x44, 0x00, 0x03, 0x00,
                   0x80, 0x44, 0x00, 0x03, 0x00, 0x80),
-        PHYREGS(0x9408, 0x9008, 0x8C08, 0xDD01, 0xDE01, 0xDF01),
+        PHYREGS(0x0894, 0x0890, 0x088C, 0x01DD, 0x01DE, 0x01DF),
   },
   {     .channel                = 98,
         .freq                   = 5490, /* MHz */
@@ -755,7 +755,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x25, 0x06, 0x4D, 0x01, 0x04, 0x0A,
                   0x00, 0x84, 0x11, 0x11, 0x44, 0x00, 0x03, 0x00,
                   0x80, 0x44, 0x00, 0x03, 0x00, 0x80),
-        PHYREGS(0x9808, 0x9408, 0x9008, 0xDD01, 0xDD01, 0xDE01),
+        PHYREGS(0x0898, 0x0894, 0x0890, 0x01DD, 0x01DD, 0x01DE),
   },
   {     .channel                = 100,
         .freq                   = 5500, /* MHz */
@@ -763,7 +763,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x26, 0x06, 0x47, 0x01, 0x04, 0x0A,
                   0x00, 0x84, 0x00, 0x00, 0x44, 0x00, 0x03, 0x00,
                   0x80, 0x44, 0x00, 0x03, 0x00, 0x80),
-        PHYREGS(0x9C08, 0x9808, 0x9408, 0xDC01, 0xDD01, 0xDD01),
+        PHYREGS(0x089C, 0x0898, 0x0894, 0x01DC, 0x01DD, 0x01DD),
   },
   {     .channel                = 102,
         .freq                   = 5510, /* MHz */
@@ -771,7 +771,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x27, 0x06, 0x47, 0x01, 0x04, 0x0A,
                   0x00, 0x84, 0x00, 0x00, 0x44, 0x00, 0x03, 0x00,
                   0x80, 0x44, 0x00, 0x03, 0x00, 0x80),
-        PHYREGS(0xA008, 0x9C08, 0x9808, 0xDB01, 0xDC01, 0xDD01),
+        PHYREGS(0x08A0, 0x089C, 0x0898, 0x01DB, 0x01DC, 0x01DD),
   },
   {     .channel                = 104,
         .freq                   = 5520, /* MHz */
@@ -779,7 +779,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x28, 0x05, 0x40, 0x01, 0x04, 0x0A,
                   0x00, 0x83, 0x00, 0x00, 0x33, 0x00, 0x02, 0x00,
                   0x80, 0x33, 0x00, 0x02, 0x00, 0x80),
-        PHYREGS(0xA408, 0xA008, 0x9C08, 0xDA01, 0xDB01, 0xDC01),
+        PHYREGS(0x08A4, 0x08A0, 0x089C, 0x01DA, 0x01DB, 0x01DC),
   },
   {     .channel                = 106,
         .freq                   = 5530, /* MHz */
@@ -787,7 +787,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x29, 0x05, 0x40, 0x01, 0x04, 0x0A,
                   0x00, 0x83, 0x00, 0x00, 0x33, 0x00, 0x02, 0x00,
                   0x80, 0x33, 0x00, 0x02, 0x00, 0x80),
-        PHYREGS(0xA808, 0xA408, 0xA008, 0xD901, 0xDA01, 0xDB01),
+        PHYREGS(0x08A8, 0x08A4, 0x08A0, 0x01D9, 0x01DA, 0x01DB),
   },
   {     .channel                = 108,
         .freq                   = 5540, /* MHz */
@@ -795,7 +795,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x2A, 0x05, 0x3A, 0x01, 0x04, 0x0A,
                   0x00, 0x83, 0x00, 0x00, 0x33, 0x00, 0x02, 0x00,
                   0x80, 0x33, 0x00, 0x02, 0x00, 0x80),
-        PHYREGS(0xAC08, 0xA808, 0xA408, 0xD801, 0xD901, 0xDA01),
+        PHYREGS(0x08AC, 0x08A8, 0x08A4, 0x01D8, 0x01D9, 0x01DA),
   },
   {     .channel                = 110,
         .freq                   = 5550, /* MHz */
@@ -803,7 +803,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x2B, 0x05, 0x3A, 0x01, 0x04, 0x0A,
                   0x00, 0x83, 0x00, 0x00, 0x33, 0x00, 0x02, 0x00,
                   0x80, 0x33, 0x00, 0x02, 0x00, 0x80),
-        PHYREGS(0xB008, 0xAC08, 0xA808, 0xD701, 0xD801, 0xD901),
+        PHYREGS(0x08B0, 0x08AC, 0x08A8, 0x01D7, 0x01D8, 0x01D9),
   },
   {     .channel                = 112,
         .freq                   = 5560, /* MHz */
@@ -811,7 +811,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x2C, 0x05, 0x34, 0x01, 0x04, 0x0A,
                   0x00, 0x82, 0x00, 0x00, 0x22, 0x00, 0x01, 0x00,
                   0x80, 0x22, 0x00, 0x01, 0x00, 0x80),
-        PHYREGS(0xB408, 0xB008, 0xAC08, 0xD701, 0xD701, 0xD801),
+        PHYREGS(0x08B4, 0x08B0, 0x08AC, 0x01D7, 0x01D7, 0x01D8),
   },
   {     .channel                = 114,
         .freq                   = 5570, /* MHz */
@@ -819,7 +819,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x2D, 0x05, 0x34, 0x01, 0x04, 0x0A,
                   0x00, 0x82, 0x00, 0x00, 0x22, 0x00, 0x01, 0x00,
                   0x80, 0x22, 0x00, 0x01, 0x00, 0x80),
-        PHYREGS(0xB808, 0xB408, 0xB008, 0xD601, 0xD701, 0xD701),
+        PHYREGS(0x08B8, 0x08B4, 0x08B0, 0x01D6, 0x01D7, 0x01D7),
   },
   {     .channel                = 116,
         .freq                   = 5580, /* MHz */
@@ -827,7 +827,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x2E, 0x04, 0x2E, 0x01, 0x04, 0x0A,
                   0x00, 0x82, 0x00, 0x00, 0x22, 0x00, 0x01, 0x00,
                   0x80, 0x22, 0x00, 0x01, 0x00, 0x80),
-        PHYREGS(0xBC08, 0xB808, 0xB408, 0xD501, 0xD601, 0xD701),
+        PHYREGS(0x08BC, 0x08B8, 0x08B4, 0x01D5, 0x01D6, 0x01D7),
   },
   {     .channel                = 118,
         .freq                   = 5590, /* MHz */
@@ -835,7 +835,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x2F, 0x04, 0x2E, 0x01, 0x04, 0x0A,
                   0x00, 0x82, 0x00, 0x00, 0x22, 0x00, 0x01, 0x00,
                   0x80, 0x22, 0x00, 0x01, 0x00, 0x80),
-        PHYREGS(0xC008, 0xBC08, 0xB808, 0xD401, 0xD501, 0xD601),
+        PHYREGS(0x08C0, 0x08BC, 0x08B8, 0x01D4, 0x01D5, 0x01D6),
   },
   {     .channel                = 120,
         .freq                   = 5600, /* MHz */
@@ -843,7 +843,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x30, 0x04, 0x28, 0x01, 0x04, 0x0A,
                   0x00, 0x81, 0x00, 0x00, 0x11, 0x00, 0x01, 0x00,
                   0x80, 0x11, 0x00, 0x01, 0x00, 0x80),
-        PHYREGS(0xC408, 0xC008, 0xBC08, 0xD301, 0xD401, 0xD501),
+        PHYREGS(0x08C4, 0x08C0, 0x08BC, 0x01D3, 0x01D4, 0x01D5),
   },
   {     .channel                = 122,
         .freq                   = 5610, /* MHz */
@@ -851,7 +851,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x31, 0x04, 0x28, 0x01, 0x04, 0x0A,
                   0x00, 0x81, 0x00, 0x00, 0x11, 0x00, 0x01, 0x00,
                   0x80, 0x11, 0x00, 0x01, 0x00, 0x80),
-        PHYREGS(0xC808, 0xC408, 0xC008, 0xD201, 0xD301, 0xD401),
+        PHYREGS(0x08C8, 0x08C4, 0x08C0, 0x01D2, 0x01D3, 0x01D4),
   },
   {     .channel                = 124,
         .freq                   = 5620, /* MHz */
@@ -859,7 +859,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x32, 0x04, 0x21, 0x01, 0x04, 0x0A,
                   0x00, 0x81, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
                   0x80, 0x11, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xCC08, 0xC808, 0xC408, 0xD201, 0xD201, 0xD301),
+        PHYREGS(0x08CC, 0x08C8, 0x08C4, 0x01D2, 0x01D2, 0x01D3),
   },
   {     .channel                = 126,
         .freq                   = 5630, /* MHz */
@@ -867,7 +867,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x33, 0x04, 0x21, 0x01, 0x04, 0x0A,
                   0x00, 0x81, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00,
                   0x80, 0x11, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xD008, 0xCC08, 0xC808, 0xD101, 0xD201, 0xD201),
+        PHYREGS(0x08D0, 0x08CC, 0x08C8, 0x01D1, 0x01D2, 0x01D2),
   },
   {     .channel                = 128,
         .freq                   = 5640, /* MHz */
@@ -875,7 +875,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x34, 0x03, 0x1C, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xD408, 0xD008, 0xCC08, 0xD001, 0xD101, 0xD201),
+        PHYREGS(0x08D4, 0x08D0, 0x08CC, 0x01D0, 0x01D1, 0x01D2),
   },
   {     .channel                = 130,
         .freq                   = 5650, /* MHz */
@@ -883,7 +883,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x35, 0x03, 0x1C, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xD808, 0xD408, 0xD008, 0xCF01, 0xD001, 0xD101),
+        PHYREGS(0x08D8, 0x08D4, 0x08D0, 0x01CF, 0x01D0, 0x01D1),
   },
   {     .channel                = 132,
         .freq                   = 5660, /* MHz */
@@ -891,7 +891,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x36, 0x03, 0x16, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xDC08, 0xD808, 0xD408, 0xCE01, 0xCF01, 0xD001),
+        PHYREGS(0x08DC, 0x08D8, 0x08D4, 0x01CE, 0x01CF, 0x01D0),
   },
   {     .channel                = 134,
         .freq                   = 5670, /* MHz */
@@ -899,7 +899,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x37, 0x03, 0x16, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xE008, 0xDC08, 0xD808, 0xCE01, 0xCE01, 0xCF01),
+        PHYREGS(0x08E0, 0x08DC, 0x08D8, 0x01CE, 0x01CE, 0x01CF),
   },
   {     .channel                = 136,
         .freq                   = 5680, /* MHz */
@@ -907,7 +907,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x38, 0x03, 0x10, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xE408, 0xE008, 0xDC08, 0xCD01, 0xCE01, 0xCE01),
+        PHYREGS(0x08E4, 0x08E0, 0x08DC, 0x01CD, 0x01CE, 0x01CE),
   },
   {     .channel                = 138,
         .freq                   = 5690, /* MHz */
@@ -915,7 +915,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x39, 0x03, 0x10, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xE808, 0xE408, 0xE008, 0xCC01, 0xCD01, 0xCE01),
+        PHYREGS(0x08E8, 0x08E4, 0x08E0, 0x01CC, 0x01CD, 0x01CE),
   },
   {     .channel                = 140,
         .freq                   = 5700, /* MHz */
@@ -923,7 +923,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x3A, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xEC08, 0xE808, 0xE408, 0xCB01, 0xCC01, 0xCD01),
+        PHYREGS(0x08EC, 0x08E8, 0x08E4, 0x01CB, 0x01CC, 0x01CD),
   },
   {     .channel                = 142,
         .freq                   = 5710, /* MHz */
@@ -931,7 +931,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x3B, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xF008, 0xEC08, 0xE808, 0xCA01, 0xCB01, 0xCC01),
+        PHYREGS(0x08F0, 0x08EC, 0x08E8, 0x01CA, 0x01CB, 0x01CC),
   },
   {     .channel                = 144,
         .freq                   = 5720, /* MHz */
@@ -939,7 +939,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x3C, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xF408, 0xF008, 0xEC08, 0xC901, 0xCA01, 0xCB01),
+        PHYREGS(0x08F4, 0x08F0, 0x08EC, 0x01C9, 0x01CA, 0x01CB),
   },
   {     .channel                = 145,
         .freq                   = 5725, /* MHz */
@@ -947,7 +947,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x79, 0x02, 0x03, 0x01, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xF608, 0xF208, 0xEE08, 0xC901, 0xCA01, 0xCB01),
+        PHYREGS(0x08F6, 0x08F2, 0x08EE, 0x01C9, 0x01CA, 0x01CB),
   },
   {     .channel                = 146,
         .freq                   = 5730, /* MHz */
@@ -955,7 +955,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x3D, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xF808, 0xF408, 0xF008, 0xC901, 0xC901, 0xCA01),
+        PHYREGS(0x08F8, 0x08F4, 0x08F0, 0x01C9, 0x01C9, 0x01CA),
   },
   {     .channel                = 147,
         .freq                   = 5735, /* MHz */
@@ -963,7 +963,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x7B, 0x02, 0x03, 0x01, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xFA08, 0xF608, 0xF208, 0xC801, 0xC901, 0xCA01),
+        PHYREGS(0x08FA, 0x08F6, 0x08F2, 0x01C8, 0x01C9, 0x01CA),
   },
   {     .channel                = 148,
         .freq                   = 5740, /* MHz */
@@ -971,7 +971,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x3E, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xFC08, 0xF808, 0xF408, 0xC801, 0xC901, 0xC901),
+        PHYREGS(0x08FC, 0x08F8, 0x08F4, 0x01C8, 0x01C9, 0x01C9),
   },
   {     .channel                = 149,
         .freq                   = 5745, /* MHz */
@@ -979,7 +979,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x7D, 0x02, 0xFE, 0x00, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0xFE08, 0xFA08, 0xF608, 0xC801, 0xC801, 0xC901),
+        PHYREGS(0x08FE, 0x08FA, 0x08F6, 0x01C8, 0x01C8, 0x01C9),
   },
   {     .channel                = 150,
         .freq                   = 5750, /* MHz */
@@ -987,7 +987,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x3F, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x0009, 0xFC08, 0xF808, 0xC701, 0xC801, 0xC901),
+        PHYREGS(0x0900, 0x08FC, 0x08F8, 0x01C7, 0x01C8, 0x01C9),
   },
   {     .channel                = 151,
         .freq                   = 5755, /* MHz */
@@ -995,7 +995,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x7F, 0x02, 0xFE, 0x00, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x0209, 0xFE08, 0xFA08, 0xC701, 0xC801, 0xC801),
+        PHYREGS(0x0902, 0x08FE, 0x08FA, 0x01C7, 0x01C8, 0x01C8),
   },
   {     .channel                = 152,
         .freq                   = 5760, /* MHz */
@@ -1003,7 +1003,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x40, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x0409, 0x0009, 0xFC08, 0xC601, 0xC701, 0xC801),
+        PHYREGS(0x0904, 0x0900, 0x08FC, 0x01C6, 0x01C7, 0x01C8),
   },
   {     .channel                = 153,
         .freq                   = 5765, /* MHz */
@@ -1011,7 +1011,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x81, 0x02, 0xF8, 0x00, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x0609, 0x0209, 0xFE08, 0xC601, 0xC701, 0xC801),
+        PHYREGS(0x0906, 0x0902, 0x08FE, 0x01C6, 0x01C7, 0x01C8),
   },
   {     .channel                = 154,
         .freq                   = 5770, /* MHz */
@@ -1019,7 +1019,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x41, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x0809, 0x0409, 0x0009, 0xC601, 0xC601, 0xC701),
+        PHYREGS(0x0908, 0x0904, 0x0900, 0x01C6, 0x01C6, 0x01C7),
   },
   {     .channel                = 155,
         .freq                   = 5775, /* MHz */
@@ -1027,7 +1027,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x83, 0x02, 0xF8, 0x00, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x0A09, 0x0609, 0x0209, 0xC501, 0xC601, 0xC701),
+        PHYREGS(0x090A, 0x0906, 0x0902, 0x01C5, 0x01C6, 0x01C7),
   },
   {     .channel                = 156,
         .freq                   = 5780, /* MHz */
@@ -1035,7 +1035,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x42, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x0C09, 0x0809, 0x0409, 0xC501, 0xC601, 0xC601),
+        PHYREGS(0x090C, 0x0908, 0x0904, 0x01C5, 0x01C6, 0x01C6),
   },
   {     .channel                = 157,
         .freq                   = 5785, /* MHz */
@@ -1043,7 +1043,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x85, 0x02, 0xF2, 0x00, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x0E09, 0x0A09, 0x0609, 0xC401, 0xC501, 0xC601),
+        PHYREGS(0x090E, 0x090A, 0x0906, 0x01C4, 0x01C5, 0x01C6),
   },
   {     .channel                = 158,
         .freq                   = 5790, /* MHz */
@@ -1051,7 +1051,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x43, 0x02, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x1009, 0x0C09, 0x0809, 0xC401, 0xC501, 0xC601),
+        PHYREGS(0x0910, 0x090C, 0x0908, 0x01C4, 0x01C5, 0x01C6),
   },
   {     .channel                = 159,
         .freq                   = 5795, /* MHz */
@@ -1059,7 +1059,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x87, 0x02, 0xF2, 0x00, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x1209, 0x0E09, 0x0A09, 0xC401, 0xC401, 0xC501),
+        PHYREGS(0x0912, 0x090E, 0x090A, 0x01C4, 0x01C4, 0x01C5),
   },
   {     .channel                = 160,
         .freq                   = 5800, /* MHz */
@@ -1067,7 +1067,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x44, 0x01, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x1409, 0x1009, 0x0C09, 0xC301, 0xC401, 0xC501),
+        PHYREGS(0x0914, 0x0910, 0x090C, 0x01C3, 0x01C4, 0x01C5),
   },
   {     .channel                = 161,
         .freq                   = 5805, /* MHz */
@@ -1075,7 +1075,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x89, 0x01, 0xED, 0x00, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x1609, 0x1209, 0x0E09, 0xC301, 0xC401, 0xC401),
+        PHYREGS(0x0916, 0x0912, 0x090E, 0x01C3, 0x01C4, 0x01C4),
   },
   {     .channel                = 162,
         .freq                   = 5810, /* MHz */
@@ -1083,7 +1083,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x45, 0x01, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x1809, 0x1409, 0x1009, 0xC201, 0xC301, 0xC401),
+        PHYREGS(0x0918, 0x0914, 0x0910, 0x01C2, 0x01C3, 0x01C4),
   },
   {     .channel                = 163,
         .freq                   = 5815, /* MHz */
@@ -1091,7 +1091,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x8B, 0x01, 0xED, 0x00, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x1A09, 0x1609, 0x1209, 0xC201, 0xC301, 0xC401),
+        PHYREGS(0x091A, 0x0916, 0x0912, 0x01C2, 0x01C3, 0x01C4),
   },
   {     .channel                = 164,
         .freq                   = 5820, /* MHz */
@@ -1099,7 +1099,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x46, 0x01, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x1C09, 0x1809, 0x1409, 0xC201, 0xC201, 0xC301),
+        PHYREGS(0x091C, 0x0918, 0x0914, 0x01C2, 0x01C2, 0x01C3),
   },
   {     .channel                = 165,
         .freq                   = 5825, /* MHz */
@@ -1107,7 +1107,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x72, 0x04, 0x8D, 0x01, 0xED, 0x00, 0x03, 0x14,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x1E09, 0x1A09, 0x1609, 0xC101, 0xC201, 0xC301),
+        PHYREGS(0x091E, 0x091A, 0x0916, 0x01C1, 0x01C2, 0x01C3),
   },
   {     .channel                = 166,
         .freq                   = 5830, /* MHz */
@@ -1115,7 +1115,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x47, 0x01, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x2009, 0x1C09, 0x1809, 0xC101, 0xC201, 0xC201),
+        PHYREGS(0x0920, 0x091C, 0x0918, 0x01C1, 0x01C2, 0x01C2),
   },
   {     .channel                = 168,
         .freq                   = 5840, /* MHz */
@@ -1123,7 +1123,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x48, 0x01, 0x0A, 0x01, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x2409, 0x2009, 0x1C09, 0xC001, 0xC101, 0xC201),
+        PHYREGS(0x0924, 0x0920, 0x091C, 0x01C0, 0x01C1, 0x01C2),
   },
   {     .channel                = 170,
         .freq                   = 5850, /* MHz */
@@ -1131,7 +1131,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x49, 0x01, 0xE0, 0x00, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x2809, 0x2409, 0x2009, 0xBF01, 0xC001, 0xC101),
+        PHYREGS(0x0928, 0x0924, 0x0920, 0x01BF, 0x01C0, 0x01C1),
   },
   {     .channel                = 172,
         .freq                   = 5860, /* MHz */
@@ -1139,7 +1139,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x4A, 0x01, 0xDE, 0x00, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x2C09, 0x2809, 0x2409, 0xBF01, 0xBF01, 0xC001),
+        PHYREGS(0x092C, 0x0928, 0x0924, 0x01BF, 0x01BF, 0x01C0),
   },
   {     .channel                = 174,
         .freq                   = 5870, /* MHz */
@@ -1147,7 +1147,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x4B, 0x00, 0xDB, 0x00, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x3009, 0x2C09, 0x2809, 0xBE01, 0xBF01, 0xBF01),
+        PHYREGS(0x0930, 0x092C, 0x0928, 0x01BE, 0x01BF, 0x01BF),
   },
   {     .channel                = 176,
         .freq                   = 5880, /* MHz */
@@ -1155,7 +1155,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x4C, 0x00, 0xD8, 0x00, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x3409, 0x3009, 0x2C09, 0xBD01, 0xBE01, 0xBF01),
+        PHYREGS(0x0934, 0x0930, 0x092C, 0x01BD, 0x01BE, 0x01BF),
   },
   {     .channel                = 178,
         .freq                   = 5890, /* MHz */
@@ -1163,7 +1163,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x4D, 0x00, 0xD6, 0x00, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x3809, 0x3409, 0x3009, 0xBC01, 0xBD01, 0xBE01),
+        PHYREGS(0x0938, 0x0934, 0x0930, 0x01BC, 0x01BD, 0x01BE),
   },
   {     .channel                = 180,
         .freq                   = 5900, /* MHz */
@@ -1171,7 +1171,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x4E, 0x00, 0xD3, 0x00, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x3C09, 0x3809, 0x3409, 0xBC01, 0xBC01, 0xBD01),
+        PHYREGS(0x093C, 0x0938, 0x0934, 0x01BC, 0x01BC, 0x01BD),
   },
   {     .channel                = 182,
         .freq                   = 5910, /* MHz */
@@ -1179,7 +1179,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x71, 0x02, 0x4F, 0x00, 0xD6, 0x00, 0x04, 0x0A,
                   0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                   0x80, 0x00, 0x00, 0x00, 0x00, 0x80),
-        PHYREGS(0x4009, 0x3C09, 0x3809, 0xBB01, 0xBC01, 0xBC01),
+        PHYREGS(0x0940, 0x093C, 0x0938, 0x01BB, 0x01BC, 0x01BC),
   },
   {     .channel                = 1,
         .freq                   = 2412, /* MHz */
@@ -1187,7 +1187,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x6C, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x0D, 0x0C,
                   0x80, 0xFF, 0x88, 0x0D, 0x0C, 0x80),
-        PHYREGS(0xC903, 0xC503, 0xC103, 0x3A04, 0x3F04, 0x4304),
+        PHYREGS(0x03C9, 0x03C5, 0x03C1, 0x043A, 0x043F, 0x0443),
   },
   {     .channel                = 2,
         .freq                   = 2417, /* MHz */
@@ -1195,7 +1195,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x71, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x0C, 0x0B,
                   0x80, 0xFF, 0x88, 0x0C, 0x0B, 0x80),
-        PHYREGS(0xCB03, 0xC703, 0xC303, 0x3804, 0x3D04, 0x4104),
+        PHYREGS(0x03CB, 0x03C7, 0x03C3, 0x0438, 0x043D, 0x0441),
   },
   {     .channel                = 3,
         .freq                   = 2422, /* MHz */
@@ -1203,7 +1203,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x76, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x0C, 0x0A,
                   0x80, 0xFF, 0x88, 0x0C, 0x0A, 0x80),
-        PHYREGS(0xCD03, 0xC903, 0xC503, 0x3604, 0x3A04, 0x3F04),
+        PHYREGS(0x03CD, 0x03C9, 0x03C5, 0x0436, 0x043A, 0x043F),
   },
   {     .channel                = 4,
         .freq                   = 2427, /* MHz */
@@ -1211,7 +1211,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x7B, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x0C, 0x0A,
                   0x80, 0xFF, 0x88, 0x0C, 0x0A, 0x80),
-        PHYREGS(0xCF03, 0xCB03, 0xC703, 0x3404, 0x3804, 0x3D04),
+        PHYREGS(0x03CF, 0x03CB, 0x03C7, 0x0434, 0x0438, 0x043D),
   },
   {     .channel                = 5,
         .freq                   = 2432, /* MHz */
@@ -1219,7 +1219,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x80, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x0C, 0x09,
                   0x80, 0xFF, 0x88, 0x0C, 0x09, 0x80),
-        PHYREGS(0xD103, 0xCD03, 0xC903, 0x3104, 0x3604, 0x3A04),
+        PHYREGS(0x03D1, 0x03CD, 0x03C9, 0x0431, 0x0436, 0x043A),
   },
   {     .channel                = 6,
         .freq                   = 2437, /* MHz */
@@ -1227,7 +1227,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x85, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x0B, 0x08,
                   0x80, 0xFF, 0x88, 0x0B, 0x08, 0x80),
-        PHYREGS(0xD303, 0xCF03, 0xCB03, 0x2F04, 0x3404, 0x3804),
+        PHYREGS(0x03D3, 0x03CF, 0x03CB, 0x042F, 0x0434, 0x0438),
   },
   {     .channel                = 7,
         .freq                   = 2442, /* MHz */
@@ -1235,7 +1235,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x8A, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x0A, 0x07,
                   0x80, 0xFF, 0x88, 0x0A, 0x07, 0x80),
-        PHYREGS(0xD503, 0xD103, 0xCD03, 0x2D04, 0x3104, 0x3604),
+        PHYREGS(0x03D5, 0x03D1, 0x03CD, 0x042D, 0x0431, 0x0436),
   },
   {     .channel                = 8,
         .freq                   = 2447, /* MHz */
@@ -1243,7 +1243,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x8F, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x0A, 0x06,
                   0x80, 0xFF, 0x88, 0x0A, 0x06, 0x80),
-        PHYREGS(0xD703, 0xD303, 0xCF03, 0x2B04, 0x2F04, 0x3404),
+        PHYREGS(0x03D7, 0x03D3, 0x03CF, 0x042B, 0x042F, 0x0434),
   },
   {     .channel                = 9,
         .freq                   = 2452, /* MHz */
@@ -1251,7 +1251,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x94, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x09, 0x06,
                   0x80, 0xFF, 0x88, 0x09, 0x06, 0x80),
-        PHYREGS(0xD903, 0xD503, 0xD103, 0x2904, 0x2D04, 0x3104),
+        PHYREGS(0x03D9, 0x03D5, 0x03D1, 0x0429, 0x042D, 0x0431),
   },
   {     .channel                = 10,
         .freq                   = 2457, /* MHz */
@@ -1259,7 +1259,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x99, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x08, 0x05,
                   0x80, 0xFF, 0x88, 0x08, 0x05, 0x80),
-        PHYREGS(0xDB03, 0xD703, 0xD303, 0x2704, 0x2B04, 0x2F04),
+        PHYREGS(0x03DB, 0x03D7, 0x03D3, 0x0427, 0x042B, 0x042F),
   },
   {     .channel                = 11,
         .freq                   = 2462, /* MHz */
@@ -1267,7 +1267,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0x9E, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x08, 0x04,
                   0x80, 0xFF, 0x88, 0x08, 0x04, 0x80),
-        PHYREGS(0xDD03, 0xD903, 0xD503, 0x2404, 0x2904, 0x2D04),
+        PHYREGS(0x03DD, 0x03D9, 0x03D5, 0x0424, 0x0429, 0x042D),
   },
   {     .channel                = 12,
         .freq                   = 2467, /* MHz */
@@ -1275,7 +1275,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0xA3, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x08, 0x03,
                   0x80, 0xFF, 0x88, 0x08, 0x03, 0x80),
-        PHYREGS(0xDF03, 0xDB03, 0xD703, 0x2204, 0x2704, 0x2B04),
+        PHYREGS(0x03DF, 0x03DB, 0x03D7, 0x0422, 0x0427, 0x042B),
   },
   {     .channel                = 13,
         .freq                   = 2472, /* MHz */
@@ -1283,7 +1283,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0xA8, 0x0F, 0x00, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x07, 0x03,
                   0x80, 0xFF, 0x88, 0x07, 0x03, 0x80),
-        PHYREGS(0xE103, 0xDD03, 0xD903, 0x2004, 0x2404, 0x2904),
+        PHYREGS(0x03E1, 0x03DD, 0x03D9, 0x0420, 0x0424, 0x0429),
   },
   {     .channel                = 14,
         .freq                   = 2484, /* MHz */
@@ -1291,7 +1291,7 @@ static const struct b43_nphy_channeltab_entry_rev2 b43_nphy_channeltab_rev2[] =
         RADIOREGS(0x73, 0x09, 0xB4, 0x0F, 0xFF, 0x01, 0x07, 0x15,
                   0x01, 0x8F, 0xFF, 0xFF, 0xFF, 0x88, 0x07, 0x01,
                   0x80, 0xFF, 0x88, 0x07, 0x01, 0x80),
-        PHYREGS(0xE603, 0xE203, 0xDE03, 0x1B04, 0x1F04, 0x2404),
+        PHYREGS(0x03E6, 0x03E2, 0x03DE, 0x041B, 0x041F, 0x0424),
   },
 };
 
diff --git a/drivers/net/wireless/b43/radio_2056.c b/drivers/net/wireless/b43/radio_2056.c
index f710c01f2cc..0cdf6a46ba4 100644
--- a/drivers/net/wireless/b43/radio_2056.c
+++ b/drivers/net/wireless/b43/radio_2056.c
@@ -74,7 +74,5975 @@
         .phy_regs.phy_bw5       = r4,   \
         .phy_regs.phy_bw6       = r5
 
+/* http://bcm-v4.sipsolutions.net/802.11/Radio/2056/ChannelTable */
 static const struct b43_nphy_channeltab_entry_rev3 b43_nphy_channeltab_rev3[] = {
+  {     .freq                   = 4920,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07b4, 0x07b0, 0x07ac, 0x0214, 0x0215, 0x0216),
+  },
+  {     .freq                   = 4930,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xed, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07b8, 0x07b4, 0x07b0, 0x0213, 0x0214, 0x0215),
+  },
+  {     .freq                   = 4940,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xee, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07bc, 0x07b8, 0x07b4, 0x0212, 0x0213, 0x0214),
+  },
+  {     .freq                   = 4950,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xef, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07c0, 0x07bc, 0x07b8, 0x0211, 0x0212, 0x0213),
+  },
+  {     .freq                   = 4960,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf0, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07c4, 0x07c0, 0x07bc, 0x020f, 0x0211, 0x0212),
+  },
+  {     .freq                   = 4970,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf1, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07c8, 0x07c4, 0x07c0, 0x020e, 0x020f, 0x0211),
+  },
+  {     .freq                   = 4980,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf2, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07cc, 0x07c8, 0x07c4, 0x020d, 0x020e, 0x020f),
+  },
+  {     .freq                   = 4990,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf3, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07d0, 0x07cc, 0x07c8, 0x020c, 0x020d, 0x020e),
+  },
+  {     .freq                   = 5000,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf4, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07d4, 0x07d0, 0x07cc, 0x020b, 0x020c, 0x020d),
+  },
+  {     .freq                   = 5010,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf5, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07d8, 0x07d4, 0x07d0, 0x020a, 0x020b, 0x020c),
+  },
+  {     .freq                   = 5020,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf6, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07dc, 0x07d8, 0x07d4, 0x0209, 0x020a, 0x020b),
+  },
+  {     .freq                   = 5030,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf7, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07e0, 0x07dc, 0x07d8, 0x0208, 0x0209, 0x020a),
+  },
+  {     .freq                   = 5040,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf8, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07e4, 0x07e0, 0x07dc, 0x0207, 0x0208, 0x0209),
+  },
+  {     .freq                   = 5050,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf9, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07e8, 0x07e4, 0x07e0, 0x0206, 0x0207, 0x0208),
+  },
+  {     .freq                   = 5060,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfa, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07ec, 0x07e8, 0x07e4, 0x0205, 0x0206, 0x0207),
+  },
+  {     .freq                   = 5070,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfb, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07f0, 0x07ec, 0x07e8, 0x0204, 0x0205, 0x0206),
+  },
+  {     .freq                   = 5080,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfc, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07f4, 0x07f0, 0x07ec, 0x0203, 0x0204, 0x0205),
+  },
+  {     .freq                   = 5090,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfd, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07f8, 0x07f4, 0x07f0, 0x0202, 0x0203, 0x0204),
+  },
+  {     .freq                   = 5100,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xfe, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xff, 0x00),
+        PHYREGS(0x07fc, 0x07f8, 0x07f4, 0x0201, 0x0202, 0x0203),
+  },
+  {     .freq                   = 5110,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xff, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xfc, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0800, 0x07fc, 0x07f8, 0x0200, 0x0201, 0x0202),
+  },
+  {     .freq                   = 5120,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x00, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xfc, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0804, 0x0800, 0x07fc, 0x01ff, 0x0200, 0x0201),
+  },
+  {     .freq                   = 5130,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x01, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xfc, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0808, 0x0804, 0x0800, 0x01fe, 0x01ff, 0x0200),
+  },
+  {     .freq                   = 5140,
+        RADIOREGS3(0xc6, 0x01, 0x01, 0x02, 0x02, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xfc, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xfc, 0x00),
+        PHYREGS(0x080c, 0x0808, 0x0804, 0x01fd, 0x01fe, 0x01ff),
+  },
+  {     .freq                   = 5160,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x04, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xfc, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0814, 0x0810, 0x080c, 0x01fb, 0x01fc, 0x01fd),
+  },
+  {     .freq                   = 5170,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x05, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xfc, 0x00, 0xff, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0818, 0x0814, 0x0810, 0x01fa, 0x01fb, 0x01fc),
+  },
+  {     .freq                   = 5180,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x06, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xef, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xfc, 0x00, 0xef, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xfc, 0x00),
+        PHYREGS(0x081c, 0x0818, 0x0814, 0x01f9, 0x01fa, 0x01fb),
+  },
+  {     .freq                   = 5190,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x07, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xef, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xfc, 0x00, 0xef, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0820, 0x081c, 0x0818, 0x01f8, 0x01f9, 0x01fa),
+  },
+  {     .freq                   = 5200,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x08, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xef, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xef, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0824, 0x0820, 0x081c, 0x01f7, 0x01f8, 0x01f9),
+  },
+  {     .freq                   = 5210,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x09, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xdf, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xdf, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0828, 0x0824, 0x0820, 0x01f6, 0x01f7, 0x01f8),
+  },
+  {     .freq                   = 5220,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xdf, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xdf, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x082c, 0x0828, 0x0824, 0x01f5, 0x01f6, 0x01f7),
+  },
+  {     .freq                   = 5230,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xdf, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xdf, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0830, 0x082c, 0x0828, 0x01f4, 0x01f5, 0x01f6),
+  },
+  {     .freq                   = 5240,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xcf, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xcf, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0834, 0x0830, 0x082c, 0x01f3, 0x01f4, 0x01f5),
+  },
+  {     .freq                   = 5250,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xcf, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xcf, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0838, 0x0834, 0x0830, 0x01f2, 0x01f3, 0x01f4),
+  },
+  {     .freq                   = 5260,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xcf, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xcf, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x083c, 0x0838, 0x0834, 0x01f1, 0x01f2, 0x01f3),
+  },
+  {     .freq                   = 5270,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0f, 0x00,
+                   0xff, 0xcf, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xcf, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0840, 0x083c, 0x0838, 0x01f0, 0x01f1, 0x01f2),
+  },
+  {     .freq                   = 5280,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x10, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0f, 0x00,
+                   0xff, 0xbf, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xbf, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0844, 0x0840, 0x083c, 0x01f0, 0x01f0, 0x01f1),
+  },
+  {     .freq                   = 5290,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x11, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0f, 0x00,
+                   0xff, 0xbf, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xfc, 0x00, 0xbf, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0848, 0x0844, 0x0840, 0x01ef, 0x01f0, 0x01f0),
+  },
+  {     .freq                   = 5300,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x12, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xbf, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfc, 0x00, 0xbf, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfc, 0x00),
+        PHYREGS(0x084c, 0x0848, 0x0844, 0x01ee, 0x01ef, 0x01f0),
+  },
+  {     .freq                   = 5310,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x13, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xbf, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfa, 0x00, 0xbf, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0850, 0x084c, 0x0848, 0x01ed, 0x01ee, 0x01ef),
+  },
+  {     .freq                   = 5320,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x14, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xbf, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfa, 0x00, 0xbf, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0854, 0x0850, 0x084c, 0x01ec, 0x01ed, 0x01ee),
+  },
+  {     .freq                   = 5330,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x15, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xaf, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfa, 0x00, 0xaf, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0858, 0x0854, 0x0850, 0x01eb, 0x01ec, 0x01ed),
+  },
+  {     .freq                   = 5340,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x16, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xaf, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfa, 0x00, 0xaf, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfa, 0x00),
+        PHYREGS(0x085c, 0x0858, 0x0854, 0x01ea, 0x01eb, 0x01ec),
+  },
+  {     .freq                   = 5350,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x17, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x9f, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfa, 0x00, 0x9f, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0860, 0x085c, 0x0858, 0x01e9, 0x01ea, 0x01eb),
+  },
+  {     .freq                   = 5360,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x18, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x9f, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfa, 0x00, 0x9f, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0864, 0x0860, 0x085c, 0x01e8, 0x01e9, 0x01ea),
+  },
+  {     .freq                   = 5370,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x19, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x9f, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfa, 0x00, 0x9f, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0868, 0x0864, 0x0860, 0x01e7, 0x01e8, 0x01e9),
+  },
+  {     .freq                   = 5380,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x9f, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfa, 0x00, 0x9f, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfa, 0x00),
+        PHYREGS(0x086c, 0x0868, 0x0864, 0x01e6, 0x01e7, 0x01e8),
+  },
+  {     .freq                   = 5390,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x8f, 0x00, 0x05, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xfa, 0x00, 0x8f, 0x00, 0x05, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0870, 0x086c, 0x0868, 0x01e5, 0x01e6, 0x01e7),
+  },
+  {     .freq                   = 5400,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x8f, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xfa, 0x00, 0x8f, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0874, 0x0870, 0x086c, 0x01e5, 0x01e5, 0x01e6),
+  },
+  {     .freq                   = 5410,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x8f, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xfa, 0x00, 0x8f, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0878, 0x0874, 0x0870, 0x01e4, 0x01e5, 0x01e5),
+  },
+  {     .freq                   = 5420,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x8e, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xfa, 0x00, 0x8e, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xfa, 0x00),
+        PHYREGS(0x087c, 0x0878, 0x0874, 0x01e3, 0x01e4, 0x01e5),
+  },
+  {     .freq                   = 5430,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x8e, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xfa, 0x00, 0x8e, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0880, 0x087c, 0x0878, 0x01e2, 0x01e3, 0x01e4),
+  },
+  {     .freq                   = 5440,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x20, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x7e, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xfa, 0x00, 0x7e, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0884, 0x0880, 0x087c, 0x01e1, 0x01e2, 0x01e3),
+  },
+  {     .freq                   = 5450,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x21, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x7d, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xfa, 0x00, 0x7d, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0888, 0x0884, 0x0880, 0x01e0, 0x01e1, 0x01e2),
+  },
+  {     .freq                   = 5460,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x22, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x6d, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xf8, 0x00, 0x6d, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xf8, 0x00),
+        PHYREGS(0x088c, 0x0888, 0x0884, 0x01df, 0x01e0, 0x01e1),
+  },
+  {     .freq                   = 5470,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x23, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x6d, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xf8, 0x00, 0x6d, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0890, 0x088c, 0x0888, 0x01de, 0x01df, 0x01e0),
+  },
+  {     .freq                   = 5480,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x24, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x5d, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xf8, 0x00, 0x5d, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0894, 0x0890, 0x088c, 0x01dd, 0x01de, 0x01df),
+  },
+  {     .freq                   = 5490,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x25, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x5c, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x08,
+                   0x00, 0xf8, 0x00, 0x5c, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x08, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0898, 0x0894, 0x0890, 0x01dd, 0x01dd, 0x01de),
+  },
+  {     .freq                   = 5500,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x26, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x5c, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x5c, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x089c, 0x0898, 0x0894, 0x01dc, 0x01dd, 0x01dd),
+  },
+  {     .freq                   = 5510,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x27, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x4c, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x4c, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08a0, 0x089c, 0x0898, 0x01db, 0x01dc, 0x01dd),
+  },
+  {     .freq                   = 5520,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x28, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x4c, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x4c, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08a4, 0x08a0, 0x089c, 0x01da, 0x01db, 0x01dc),
+  },
+  {     .freq                   = 5530,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x29, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x3b, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x3b, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08a8, 0x08a4, 0x08a0, 0x01d9, 0x01da, 0x01db),
+  },
+  {     .freq                   = 5540,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x3b, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x3b, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08ac, 0x08a8, 0x08a4, 0x01d8, 0x01d9, 0x01da),
+  },
+  {     .freq                   = 5550,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x3b, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x3b, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08b0, 0x08ac, 0x08a8, 0x01d7, 0x01d8, 0x01d9),
+  },
+  {     .freq                   = 5560,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x2b, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x2b, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08b4, 0x08b0, 0x08ac, 0x01d7, 0x01d7, 0x01d8),
+  },
+  {     .freq                   = 5570,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x2a, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x2a, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08b8, 0x08b4, 0x08b0, 0x01d6, 0x01d7, 0x01d7),
+  },
+  {     .freq                   = 5580,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x1a, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x1a, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08bc, 0x08b8, 0x08b4, 0x01d5, 0x01d6, 0x01d7),
+  },
+  {     .freq                   = 5590,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x1a, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x1a, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08c0, 0x08bc, 0x08b8, 0x01d4, 0x01d5, 0x01d6),
+  },
+  {     .freq                   = 5600,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x30, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x1a, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x1a, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08c4, 0x08c0, 0x08bc, 0x01d3, 0x01d4, 0x01d5),
+  },
+  {     .freq                   = 5610,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x31, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x19, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x19, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08c8, 0x08c4, 0x08c0, 0x01d2, 0x01d3, 0x01d4),
+  },
+  {     .freq                   = 5620,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x32, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x19, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x19, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08cc, 0x08c8, 0x08c4, 0x01d2, 0x01d2, 0x01d3),
+  },
+  {     .freq                   = 5630,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x33, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x09, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x09, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08d0, 0x08cc, 0x08c8, 0x01d1, 0x01d2, 0x01d2),
+  },
+  {     .freq                   = 5640,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x34, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x09, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x09, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08d4, 0x08d0, 0x08cc, 0x01d0, 0x01d1, 0x01d2),
+  },
+  {     .freq                   = 5650,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x35, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x08, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf8, 0x00, 0x08, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf8, 0x00),
+        PHYREGS(0x08d8, 0x08d4, 0x08d0, 0x01cf, 0x01d0, 0x01d1),
+  },
+  {     .freq                   = 5660,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x36, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x08, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf6, 0x00, 0x08, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08dc, 0x08d8, 0x08d4, 0x01ce, 0x01cf, 0x01d0),
+  },
+  {     .freq                   = 5670,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x37, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x08, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf6, 0x00, 0x08, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08e0, 0x08dc, 0x08d8, 0x01ce, 0x01ce, 0x01cf),
+  },
+  {     .freq                   = 5680,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x38, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x08, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf6, 0x00, 0x08, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08e4, 0x08e0, 0x08dc, 0x01cd, 0x01ce, 0x01ce),
+  },
+  {     .freq                   = 5690,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x39, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x07, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf6, 0x00, 0x07, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08e8, 0x08e4, 0x08e0, 0x01cc, 0x01cd, 0x01ce),
+  },
+  {     .freq                   = 5700,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x07, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf6, 0x00, 0x07, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08ec, 0x08e8, 0x08e4, 0x01cb, 0x01cc, 0x01cd),
+  },
+  {     .freq                   = 5710,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x07, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x07, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08f0, 0x08ec, 0x08e8, 0x01ca, 0x01cb, 0x01cc),
+  },
+  {     .freq                   = 5720,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x07, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x07, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08f4, 0x08f0, 0x08ec, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5725,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x79, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x06, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08f6, 0x08f2, 0x08ee, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5730,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x06, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08f8, 0x08f4, 0x08f0, 0x01c9, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5735,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x7b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x06, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08fa, 0x08f6, 0x08f2, 0x01c8, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5740,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x06, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08fc, 0x08f8, 0x08f4, 0x01c8, 0x01c9, 0x01c9),
+  },
+  {     .freq                   = 5745,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x06, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08fe, 0x08fa, 0x08f6, 0x01c8, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5750,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x06, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0900, 0x08fc, 0x08f8, 0x01c7, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5755,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7f, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x05, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0902, 0x08fe, 0x08fa, 0x01c7, 0x01c8, 0x01c8),
+  },
+  {     .freq                   = 5760,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x40, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x05, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0904, 0x0900, 0x08fc, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5765,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x81, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x05, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0906, 0x0902, 0x08fe, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5770,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x41, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x05, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0908, 0x0904, 0x0900, 0x01c6, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5775,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x83, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x05, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x090a, 0x0906, 0x0902, 0x01c5, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5780,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x42, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x05, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x090c, 0x0908, 0x0904, 0x01c5, 0x01c6, 0x01c6),
+  },
+  {     .freq                   = 5785,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x85, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x8a, 0x06, 0x00,
+                   0x40, 0x04, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x04, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x090e, 0x090a, 0x0906, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5790,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x43, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x8a, 0x06, 0x00,
+                   0x40, 0x04, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x04, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0910, 0x090c, 0x0908, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5795,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x87, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x8a, 0x06, 0x00,
+                   0x40, 0x04, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x04, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0912, 0x090e, 0x090a, 0x01c4, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5800,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x44, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x04, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x04, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0914, 0x0910, 0x090c, 0x01c3, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5805,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x89, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x04, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x04, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0916, 0x0912, 0x090e, 0x01c3, 0x01c4, 0x01c4),
+  },
+  {     .freq                   = 5810,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x45, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x04, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x04, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0918, 0x0914, 0x0910, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5815,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x04, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x04, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x091a, 0x0916, 0x0912, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5820,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x46, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x091c, 0x0918, 0x0914, 0x01c2, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5825,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x091e, 0x091a, 0x0916, 0x01c1, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5830,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x47, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0920, 0x091c, 0x0918, 0x01c1, 0x01c2, 0x01c2),
+  },
+  {     .freq                   = 5840,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x48, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0924, 0x0920, 0x091c, 0x01c0, 0x01c1, 0x01c2),
+  },
+  {     .freq                   = 5850,
+        RADIOREGS3(0xe0, 0x00, 0x01, 0x02, 0x49, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf4, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf4, 0x00),
+        PHYREGS(0x0928, 0x0924, 0x0920, 0x01bf, 0x01c0, 0x01c1),
+  },
+  {     .freq                   = 5860,
+        RADIOREGS3(0xde, 0x00, 0x01, 0x02, 0x4a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf2, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf2, 0x00),
+        PHYREGS(0x092c, 0x0928, 0x0924, 0x01bf, 0x01bf, 0x01c0),
+  },
+  {     .freq                   = 5870,
+        RADIOREGS3(0xdb, 0x00, 0x01, 0x02, 0x4b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x02, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf2, 0x00, 0x02, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0930, 0x092c, 0x0928, 0x01be, 0x01bf, 0x01bf),
+  },
+  {     .freq                   = 5880,
+        RADIOREGS3(0xd8, 0x00, 0x01, 0x02, 0x4c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x02, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf2, 0x00, 0x02, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0934, 0x0930, 0x092c, 0x01bd, 0x01be, 0x01bf),
+  },
+  {     .freq                   = 5890,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x02, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x06,
+                   0x00, 0xf2, 0x00, 0x02, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x06, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0938, 0x0934, 0x0930, 0x01bc, 0x01bd, 0x01be),
+  },
+  {     .freq                   = 5900,
+        RADIOREGS3(0xd3, 0x00, 0x01, 0x02, 0x4e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x87, 0x03, 0x00,
+                   0x00, 0x02, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x05,
+                   0x00, 0xf2, 0x00, 0x02, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x05, 0x00, 0xf2, 0x00),
+        PHYREGS(0x093c, 0x0938, 0x0934, 0x01bc, 0x01bc, 0x01bd),
+  },
+  {     .freq                   = 5910,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x87, 0x03, 0x00,
+                   0x00, 0x01, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x05,
+                   0x00, 0xf2, 0x00, 0x01, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x05, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0940, 0x093c, 0x0938, 0x01bb, 0x01bc, 0x01bc),
+  },
+  {     .freq                   = 2412,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x6c, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x04, 0x04, 0x04, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xff, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0f, 0x00, 0xff, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0f),
+        PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443),
+  },
+  {     .freq                   = 2417,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x71, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xff, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0f, 0x00, 0xff, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0f),
+        PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441),
+  },
+  {     .freq                   = 2422,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x76, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xff, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0f, 0x00, 0xff, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0f),
+        PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f),
+  },
+  {     .freq                   = 2427,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x7b, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xfd, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0f, 0x00, 0xfd, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0f),
+        PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d),
+  },
+  {     .freq                   = 2432,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x80, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xfb, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0f, 0x00, 0xfb, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0f),
+        PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a),
+  },
+  {     .freq                   = 2437,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x85, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xfa, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0f, 0x00, 0xfa, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0f),
+        PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438),
+  },
+  {     .freq                   = 2442,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8a, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf8, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0f, 0x00, 0xf8, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0f),
+        PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436),
+  },
+  {     .freq                   = 2447,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8f, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf7, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0f, 0x00, 0xf7, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0f),
+        PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434),
+  },
+  {     .freq                   = 2452,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x94, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf6, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0f, 0x00, 0xf6, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0f),
+        PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431),
+  },
+  {     .freq                   = 2457,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x99, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf5, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0d, 0x00, 0xf5, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0d),
+        PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f),
+  },
+  {     .freq                   = 2462,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x9e, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf4, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0d, 0x00, 0xf4, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0d),
+        PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d),
+  },
+  {     .freq                   = 2467,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa3, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf3, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0d, 0x00, 0xf3, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0d),
+        PHYREGS(0x03df, 0x03db, 0x03d7, 0x0422, 0x0427, 0x042b),
+  },
+  {     .freq                   = 2472,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa8, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf2, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0d, 0x00, 0xf2, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0d),
+        PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429),
+  },
+  {     .freq                   = 2484,
+        RADIOREGS3(0xff, 0x01, 0x03, 0x09, 0xb4, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf0, 0x00, 0x05, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0d, 0x00, 0xf0, 0x00, 0x05, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0d),
+        PHYREGS(0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424),
+  },
+};
+
+static const struct b43_nphy_channeltab_entry_rev3 b43_nphy_channeltab_rev4[] = {
+  {     .freq                   = 4920,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0e, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07b4, 0x07b0, 0x07ac, 0x0214, 0x0215, 0x0216),
+  },
+  {     .freq                   = 4930,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xed, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0e, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07b8, 0x07b4, 0x07b0, 0x0213, 0x0214, 0x0215),
+  },
+  {     .freq                   = 4940,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xee, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0e, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07bc, 0x07b8, 0x07b4, 0x0212, 0x0213, 0x0214),
+  },
+  {     .freq                   = 4950,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xef, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0e, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07c0, 0x07bc, 0x07b8, 0x0211, 0x0212, 0x0213),
+  },
+  {     .freq                   = 4960,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf0, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0e, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07c4, 0x07c0, 0x07bc, 0x020f, 0x0211, 0x0212),
+  },
+  {     .freq                   = 4970,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf1, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0e, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07c8, 0x07c4, 0x07c0, 0x020e, 0x020f, 0x0211),
+  },
+  {     .freq                   = 4980,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf2, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0e, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07cc, 0x07c8, 0x07c4, 0x020d, 0x020e, 0x020f),
+  },
+  {     .freq                   = 4990,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf3, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0e, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0e, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07d0, 0x07cc, 0x07c8, 0x020c, 0x020d, 0x020e),
+  },
+  {     .freq                   = 5000,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf4, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07d4, 0x07d0, 0x07cc, 0x020b, 0x020c, 0x020d),
+  },
+  {     .freq                   = 5010,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf5, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07d8, 0x07d4, 0x07d0, 0x020a, 0x020b, 0x020c),
+  },
+  {     .freq                   = 5020,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf6, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07dc, 0x07d8, 0x07d4, 0x0209, 0x020a, 0x020b),
+  },
+  {     .freq                   = 5030,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf7, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07e0, 0x07dc, 0x07d8, 0x0208, 0x0209, 0x020a),
+  },
+  {     .freq                   = 5040,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf8, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07e4, 0x07e0, 0x07dc, 0x0207, 0x0208, 0x0209),
+  },
+  {     .freq                   = 5050,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf9, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07e8, 0x07e4, 0x07e0, 0x0206, 0x0207, 0x0208),
+  },
+  {     .freq                   = 5060,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfa, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07ec, 0x07e8, 0x07e4, 0x0205, 0x0206, 0x0207),
+  },
+  {     .freq                   = 5070,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfb, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07f0, 0x07ec, 0x07e8, 0x0204, 0x0205, 0x0206),
+  },
+  {     .freq                   = 5080,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfc, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07f4, 0x07f0, 0x07ec, 0x0203, 0x0204, 0x0205),
+  },
+  {     .freq                   = 5090,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfd, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0d, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xff, 0x00, 0xff, 0x00, 0x0d, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xff, 0x00),
+        PHYREGS(0x07f8, 0x07f4, 0x07f0, 0x0202, 0x0203, 0x0204),
+  },
+  {     .freq                   = 5100,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xfe, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0c, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfe, 0x00, 0xff, 0x00, 0x0c, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfe, 0x00),
+        PHYREGS(0x07fc, 0x07f8, 0x07f4, 0x0201, 0x0202, 0x0203),
+  },
+  {     .freq                   = 5110,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xff, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0c, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfe, 0x00, 0xff, 0x00, 0x0c, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfe, 0x00),
+        PHYREGS(0x0800, 0x07fc, 0x07f8, 0x0200, 0x0201, 0x0202),
+  },
+  {     .freq                   = 5120,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x00, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0c, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfe, 0x00, 0xff, 0x00, 0x0c, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfe, 0x00),
+        PHYREGS(0x0804, 0x0800, 0x07fc, 0x01ff, 0x0200, 0x0201),
+  },
+  {     .freq                   = 5130,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x01, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0c, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfe, 0x00, 0xff, 0x00, 0x0c, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfe, 0x00),
+        PHYREGS(0x0808, 0x0804, 0x0800, 0x01fe, 0x01ff, 0x0200),
+  },
+  {     .freq                   = 5140,
+        RADIOREGS3(0xc6, 0x01, 0x01, 0x02, 0x02, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0c, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfe, 0x00, 0xff, 0x00, 0x0c, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfe, 0x00),
+        PHYREGS(0x080c, 0x0808, 0x0804, 0x01fd, 0x01fe, 0x01ff),
+  },
+  {     .freq                   = 5160,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x04, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0c, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfe, 0x00, 0xff, 0x00, 0x0c, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfe, 0x00),
+        PHYREGS(0x0814, 0x0810, 0x080c, 0x01fb, 0x01fc, 0x01fd),
+  },
+  {     .freq                   = 5170,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x05, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0c, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfe, 0x00, 0xff, 0x00, 0x0c, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfe, 0x00),
+        PHYREGS(0x0818, 0x0814, 0x0810, 0x01fa, 0x01fb, 0x01fc),
+  },
+  {     .freq                   = 5180,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x06, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xef, 0x00, 0x0c, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfe, 0x00, 0xef, 0x00, 0x0c, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfe, 0x00),
+        PHYREGS(0x081c, 0x0818, 0x0814, 0x01f9, 0x01fa, 0x01fb),
+  },
+  {     .freq                   = 5190,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x07, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xef, 0x00, 0x0c, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfe, 0x00, 0xef, 0x00, 0x0c, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfe, 0x00),
+        PHYREGS(0x0820, 0x081c, 0x0818, 0x01f8, 0x01f9, 0x01fa),
+  },
+  {     .freq                   = 5200,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x08, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xef, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xef, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0824, 0x0820, 0x081c, 0x01f7, 0x01f8, 0x01f9),
+  },
+  {     .freq                   = 5210,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x09, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xdf, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xdf, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0828, 0x0824, 0x0820, 0x01f6, 0x01f7, 0x01f8),
+  },
+  {     .freq                   = 5220,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xdf, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xdf, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x082c, 0x0828, 0x0824, 0x01f5, 0x01f6, 0x01f7),
+  },
+  {     .freq                   = 5230,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xdf, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xdf, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0830, 0x082c, 0x0828, 0x01f4, 0x01f5, 0x01f6),
+  },
+  {     .freq                   = 5240,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xcf, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xcf, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0834, 0x0830, 0x082c, 0x01f3, 0x01f4, 0x01f5),
+  },
+  {     .freq                   = 5250,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xcf, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xcf, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0838, 0x0834, 0x0830, 0x01f2, 0x01f3, 0x01f4),
+  },
+  {     .freq                   = 5260,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xcf, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xcf, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x083c, 0x0838, 0x0834, 0x01f1, 0x01f2, 0x01f3),
+  },
+  {     .freq                   = 5270,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0f, 0x00,
+                   0xff, 0xcf, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xcf, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0840, 0x083c, 0x0838, 0x01f0, 0x01f1, 0x01f2),
+  },
+  {     .freq                   = 5280,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x10, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0f, 0x00,
+                   0xff, 0xbf, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xbf, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0844, 0x0840, 0x083c, 0x01f0, 0x01f0, 0x01f1),
+  },
+  {     .freq                   = 5290,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x11, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0f, 0x00,
+                   0xff, 0xbf, 0x00, 0x0a, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfc, 0x00, 0xbf, 0x00, 0x0a, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfc, 0x00),
+        PHYREGS(0x0848, 0x0844, 0x0840, 0x01ef, 0x01f0, 0x01f0),
+  },
+  {     .freq                   = 5300,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x12, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xbf, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0xbf, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x084c, 0x0848, 0x0844, 0x01ee, 0x01ef, 0x01f0),
+  },
+  {     .freq                   = 5310,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x13, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xbf, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0xbf, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0850, 0x084c, 0x0848, 0x01ed, 0x01ee, 0x01ef),
+  },
+  {     .freq                   = 5320,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x14, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xbf, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0xbf, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0854, 0x0850, 0x084c, 0x01ec, 0x01ed, 0x01ee),
+  },
+  {     .freq                   = 5330,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x15, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xaf, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0xaf, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0858, 0x0854, 0x0850, 0x01eb, 0x01ec, 0x01ed),
+  },
+  {     .freq                   = 5340,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x16, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xaf, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0xaf, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x085c, 0x0858, 0x0854, 0x01ea, 0x01eb, 0x01ec),
+  },
+  {     .freq                   = 5350,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x17, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x9f, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0x9f, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0860, 0x085c, 0x0858, 0x01e9, 0x01ea, 0x01eb),
+  },
+  {     .freq                   = 5360,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x18, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x9f, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0x9f, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0864, 0x0860, 0x085c, 0x01e8, 0x01e9, 0x01ea),
+  },
+  {     .freq                   = 5370,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x19, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x9f, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0x9f, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0868, 0x0864, 0x0860, 0x01e7, 0x01e8, 0x01e9),
+  },
+  {     .freq                   = 5380,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x9f, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0x9f, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x086c, 0x0868, 0x0864, 0x01e6, 0x01e7, 0x01e8),
+  },
+  {     .freq                   = 5390,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x8f, 0x00, 0x08, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xfa, 0x00, 0x8f, 0x00, 0x08, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xfa, 0x00),
+        PHYREGS(0x0870, 0x086c, 0x0868, 0x01e5, 0x01e6, 0x01e7),
+  },
+  {     .freq                   = 5400,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x8f, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x8f, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0874, 0x0870, 0x086c, 0x01e5, 0x01e5, 0x01e6),
+  },
+  {     .freq                   = 5410,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x8f, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x8f, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0878, 0x0874, 0x0870, 0x01e4, 0x01e5, 0x01e5),
+  },
+  {     .freq                   = 5420,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x8e, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x8e, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x087c, 0x0878, 0x0874, 0x01e3, 0x01e4, 0x01e5),
+  },
+  {     .freq                   = 5430,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x8e, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x8e, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0880, 0x087c, 0x0878, 0x01e2, 0x01e3, 0x01e4),
+  },
+  {     .freq                   = 5440,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x20, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x7e, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x7e, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0884, 0x0880, 0x087c, 0x01e1, 0x01e2, 0x01e3),
+  },
+  {     .freq                   = 5450,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x21, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x7d, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x7d, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0888, 0x0884, 0x0880, 0x01e0, 0x01e1, 0x01e2),
+  },
+  {     .freq                   = 5460,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x22, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x6d, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x6d, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x088c, 0x0888, 0x0884, 0x01df, 0x01e0, 0x01e1),
+  },
+  {     .freq                   = 5470,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x23, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x6d, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x6d, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0890, 0x088c, 0x0888, 0x01de, 0x01df, 0x01e0),
+  },
+  {     .freq                   = 5480,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x24, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x5d, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x5d, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0894, 0x0890, 0x088c, 0x01dd, 0x01de, 0x01df),
+  },
+  {     .freq                   = 5490,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x25, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x5c, 0x00, 0x07, 0x00, 0x7f, 0x00, 0x0f,
+                   0x00, 0xf8, 0x00, 0x5c, 0x00, 0x07, 0x00, 0x7f,
+                   0x00, 0x0f, 0x00, 0xf8, 0x00),
+        PHYREGS(0x0898, 0x0894, 0x0890, 0x01dd, 0x01dd, 0x01de),
+  },
+  {     .freq                   = 5500,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x26, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x5c, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x5c, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x089c, 0x0898, 0x0894, 0x01dc, 0x01dd, 0x01dd),
+  },
+  {     .freq                   = 5510,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x27, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x4c, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x4c, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08a0, 0x089c, 0x0898, 0x01db, 0x01dc, 0x01dd),
+  },
+  {     .freq                   = 5520,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x28, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x4c, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x4c, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08a4, 0x08a0, 0x089c, 0x01da, 0x01db, 0x01dc),
+  },
+  {     .freq                   = 5530,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x29, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x3b, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x3b, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08a8, 0x08a4, 0x08a0, 0x01d9, 0x01da, 0x01db),
+  },
+  {     .freq                   = 5540,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x3b, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x3b, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08ac, 0x08a8, 0x08a4, 0x01d8, 0x01d9, 0x01da),
+  },
+  {     .freq                   = 5550,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x3b, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x3b, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08b0, 0x08ac, 0x08a8, 0x01d7, 0x01d8, 0x01d9),
+  },
+  {     .freq                   = 5560,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x2b, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x2b, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08b4, 0x08b0, 0x08ac, 0x01d7, 0x01d7, 0x01d8),
+  },
+  {     .freq                   = 5570,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x2a, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x2a, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08b8, 0x08b4, 0x08b0, 0x01d6, 0x01d7, 0x01d7),
+  },
+  {     .freq                   = 5580,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x1a, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x1a, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08bc, 0x08b8, 0x08b4, 0x01d5, 0x01d6, 0x01d7),
+  },
+  {     .freq                   = 5590,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x1a, 0x00, 0x06, 0x00, 0x7f, 0x00, 0x0d,
+                   0x00, 0xf6, 0x00, 0x1a, 0x00, 0x06, 0x00, 0x7f,
+                   0x00, 0x0d, 0x00, 0xf6, 0x00),
+        PHYREGS(0x08c0, 0x08bc, 0x08b8, 0x01d4, 0x01d5, 0x01d6),
+  },
+  {     .freq                   = 5600,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x30, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x1a, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x1a, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08c4, 0x08c0, 0x08bc, 0x01d3, 0x01d4, 0x01d5),
+  },
+  {     .freq                   = 5610,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x31, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x19, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x19, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08c8, 0x08c4, 0x08c0, 0x01d2, 0x01d3, 0x01d4),
+  },
+  {     .freq                   = 5620,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x32, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x19, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x19, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08cc, 0x08c8, 0x08c4, 0x01d2, 0x01d2, 0x01d3),
+  },
+  {     .freq                   = 5630,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x33, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x09, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x09, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08d0, 0x08cc, 0x08c8, 0x01d1, 0x01d2, 0x01d2),
+  },
+  {     .freq                   = 5640,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x34, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x09, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x09, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08d4, 0x08d0, 0x08cc, 0x01d0, 0x01d1, 0x01d2),
+  },
+  {     .freq                   = 5650,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x35, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x08, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x08, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08d8, 0x08d4, 0x08d0, 0x01cf, 0x01d0, 0x01d1),
+  },
+  {     .freq                   = 5660,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x36, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x08, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x08, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08dc, 0x08d8, 0x08d4, 0x01ce, 0x01cf, 0x01d0),
+  },
+  {     .freq                   = 5670,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x37, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x08, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x08, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08e0, 0x08dc, 0x08d8, 0x01ce, 0x01ce, 0x01cf),
+  },
+  {     .freq                   = 5680,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x38, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x08, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x08, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08e4, 0x08e0, 0x08dc, 0x01cd, 0x01ce, 0x01ce),
+  },
+  {     .freq                   = 5690,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x39, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x07, 0x00, 0x04, 0x00, 0x7f, 0x00, 0x0b,
+                   0x00, 0xf4, 0x00, 0x07, 0x00, 0x04, 0x00, 0x7f,
+                   0x00, 0x0b, 0x00, 0xf4, 0x00),
+        PHYREGS(0x08e8, 0x08e4, 0x08e0, 0x01cc, 0x01cd, 0x01ce),
+  },
+  {     .freq                   = 5700,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x07, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x07, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x08ec, 0x08e8, 0x08e4, 0x01cb, 0x01cc, 0x01cd),
+  },
+  {     .freq                   = 5710,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x07, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x07, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x08f0, 0x08ec, 0x08e8, 0x01ca, 0x01cb, 0x01cc),
+  },
+  {     .freq                   = 5720,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x07, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x07, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x08f4, 0x08f0, 0x08ec, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5725,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x79, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x06, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x08f6, 0x08f2, 0x08ee, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5730,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x06, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x08f8, 0x08f4, 0x08f0, 0x01c9, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5735,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x7b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x06, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x08fa, 0x08f6, 0x08f2, 0x01c8, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5740,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x06, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x08fc, 0x08f8, 0x08f4, 0x01c8, 0x01c9, 0x01c9),
+  },
+  {     .freq                   = 5745,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x06, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x08fe, 0x08fa, 0x08f6, 0x01c8, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5750,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x06, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x06, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0900, 0x08fc, 0x08f8, 0x01c7, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5755,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7f, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x05, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0902, 0x08fe, 0x08fa, 0x01c7, 0x01c8, 0x01c8),
+  },
+  {     .freq                   = 5760,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x40, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x05, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0904, 0x0900, 0x08fc, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5765,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x81, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x05, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0906, 0x0902, 0x08fe, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5770,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x41, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x05, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0908, 0x0904, 0x0900, 0x01c6, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5775,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x83, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x05, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x090a, 0x0906, 0x0902, 0x01c5, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5780,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x42, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x05, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x05, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x090c, 0x0908, 0x0904, 0x01c5, 0x01c6, 0x01c6),
+  },
+  {     .freq                   = 5785,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x85, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x8a, 0x06, 0x00,
+                   0x40, 0x04, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x04, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x090e, 0x090a, 0x0906, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5790,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x43, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x8a, 0x06, 0x00,
+                   0x40, 0x04, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x04, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0910, 0x090c, 0x0908, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5795,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x87, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x8a, 0x06, 0x00,
+                   0x40, 0x04, 0x00, 0x03, 0x00, 0x7f, 0x00, 0x0a,
+                   0x00, 0xf2, 0x00, 0x04, 0x00, 0x03, 0x00, 0x7f,
+                   0x00, 0x0a, 0x00, 0xf2, 0x00),
+        PHYREGS(0x0912, 0x090e, 0x090a, 0x01c4, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5800,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x44, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x04, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x04, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0914, 0x0910, 0x090c, 0x01c3, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5805,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x89, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x04, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x04, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0916, 0x0912, 0x090e, 0x01c3, 0x01c4, 0x01c4),
+  },
+  {     .freq                   = 5810,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x45, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x04, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x04, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0918, 0x0914, 0x0910, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5815,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x04, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x04, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x091a, 0x0916, 0x0912, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5820,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x46, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x03, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x091c, 0x0918, 0x0914, 0x01c2, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5825,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x03, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x091e, 0x091a, 0x0916, 0x01c1, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5830,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x47, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x03, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0920, 0x091c, 0x0918, 0x01c1, 0x01c2, 0x01c2),
+  },
+  {     .freq                   = 5840,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x48, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x03, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0924, 0x0920, 0x091c, 0x01c0, 0x01c1, 0x01c2),
+  },
+  {     .freq                   = 5850,
+        RADIOREGS3(0xe0, 0x00, 0x01, 0x02, 0x49, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x03, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0928, 0x0924, 0x0920, 0x01bf, 0x01c0, 0x01c1),
+  },
+  {     .freq                   = 5860,
+        RADIOREGS3(0xde, 0x00, 0x01, 0x02, 0x4a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x03, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x03, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x092c, 0x0928, 0x0924, 0x01bf, 0x01bf, 0x01c0),
+  },
+  {     .freq                   = 5870,
+        RADIOREGS3(0xdb, 0x00, 0x01, 0x02, 0x4b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x02, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x02, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0930, 0x092c, 0x0928, 0x01be, 0x01bf, 0x01bf),
+  },
+  {     .freq                   = 5880,
+        RADIOREGS3(0xd8, 0x00, 0x01, 0x02, 0x4c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x02, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x02, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0934, 0x0930, 0x092c, 0x01bd, 0x01be, 0x01bf),
+  },
+  {     .freq                   = 5890,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x02, 0x00, 0x02, 0x00, 0x7f, 0x00, 0x09,
+                   0x00, 0xf0, 0x00, 0x02, 0x00, 0x02, 0x00, 0x7f,
+                   0x00, 0x09, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0938, 0x0934, 0x0930, 0x01bc, 0x01bd, 0x01be),
+  },
+  {     .freq                   = 5900,
+        RADIOREGS3(0xd3, 0x00, 0x01, 0x02, 0x4e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x87, 0x03, 0x00,
+                   0x00, 0x02, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf0, 0x00, 0x02, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf0, 0x00),
+        PHYREGS(0x093c, 0x0938, 0x0934, 0x01bc, 0x01bc, 0x01bd),
+  },
+  {     .freq                   = 5910,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x87, 0x03, 0x00,
+                   0x00, 0x01, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x07,
+                   0x00, 0xf0, 0x00, 0x01, 0x00, 0x00, 0x00, 0x7f,
+                   0x00, 0x07, 0x00, 0xf0, 0x00),
+        PHYREGS(0x0940, 0x093c, 0x0938, 0x01bb, 0x01bc, 0x01bc),
+  },
+  {     .freq                   = 2412,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x6c, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x04, 0x04, 0x04, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xff, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xff, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443),
+  },
+  {     .freq                   = 2417,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x71, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xff, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xff, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441),
+  },
+  {     .freq                   = 2422,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x76, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xff, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xff, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f),
+  },
+  {     .freq                   = 2427,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x7b, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xfd, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xfd, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d),
+  },
+  {     .freq                   = 2432,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x80, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xfb, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xfb, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a),
+  },
+  {     .freq                   = 2437,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x85, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xfa, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xfa, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438),
+  },
+  {     .freq                   = 2442,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8a, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf8, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xf8, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436),
+  },
+  {     .freq                   = 2447,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8f, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf7, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xf7, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434),
+  },
+  {     .freq                   = 2452,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x94, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf6, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xf6, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431),
+  },
+  {     .freq                   = 2457,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x99, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf5, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xf5, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f),
+  },
+  {     .freq                   = 2462,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x9e, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf4, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xf4, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d),
+  },
+  {     .freq                   = 2467,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa3, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf3, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xf3, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03df, 0x03db, 0x03d7, 0x0422, 0x0427, 0x042b),
+  },
+  {     .freq                   = 2472,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa8, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf2, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xf2, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429),
+  },
+  {     .freq                   = 2484,
+        RADIOREGS3(0xff, 0x01, 0x03, 0x09, 0xb4, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0xf0, 0x00, 0x04, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0e, 0x00, 0xf0, 0x00, 0x04, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0e),
+        PHYREGS(0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424),
+  },
+};
+
+static const struct b43_nphy_channeltab_entry_rev3 b43_nphy_channeltab_rev5[] = {
+  {     .freq                   = 4920,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, 0x00, 0x0f,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0b, 0x00, 0x70,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07b4, 0x07b0, 0x07ac, 0x0214, 0x0215, 0x0216),
+  },
+  {     .freq                   = 4930,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xed, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, 0x00, 0x0e,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0b, 0x00, 0x70,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07b8, 0x07b4, 0x07b0, 0x0213, 0x0214, 0x0215),
+  },
+  {     .freq                   = 4940,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xee, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, 0x00, 0x0e,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0b, 0x00, 0x70,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07bc, 0x07b8, 0x07b4, 0x0212, 0x0213, 0x0214),
+  },
+  {     .freq                   = 4950,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xef, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, 0x00, 0x0e,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0b, 0x00, 0x70,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c0, 0x07bc, 0x07b8, 0x0211, 0x0212, 0x0213),
+  },
+  {     .freq                   = 4960,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf0, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0e,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c4, 0x07c0, 0x07bc, 0x020f, 0x0211, 0x0212),
+  },
+  {     .freq                   = 4970,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf1, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c8, 0x07c4, 0x07c0, 0x020e, 0x020f, 0x0211),
+  },
+  {     .freq                   = 4980,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf2, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07cc, 0x07c8, 0x07c4, 0x020d, 0x020e, 0x020f),
+  },
+  {     .freq                   = 4990,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf3, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d0, 0x07cc, 0x07c8, 0x020c, 0x020d, 0x020e),
+  },
+  {     .freq                   = 5000,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf4, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d4, 0x07d0, 0x07cc, 0x020b, 0x020c, 0x020d),
+  },
+  {     .freq                   = 5010,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf5, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d8, 0x07d4, 0x07d0, 0x020a, 0x020b, 0x020c),
+  },
+  {     .freq                   = 5020,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf6, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07dc, 0x07d8, 0x07d4, 0x0209, 0x020a, 0x020b),
+  },
+  {     .freq                   = 5030,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf7, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0c,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e0, 0x07dc, 0x07d8, 0x0208, 0x0209, 0x020a),
+  },
+  {     .freq                   = 5040,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf8, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0c,
+                   0x00, 0x9f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e4, 0x07e0, 0x07dc, 0x0207, 0x0208, 0x0209),
+  },
+  {     .freq                   = 5050,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf9, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0c,
+                   0x00, 0x9f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e8, 0x07e4, 0x07e0, 0x0206, 0x0207, 0x0208),
+  },
+  {     .freq                   = 5060,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfa, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0c,
+                   0x00, 0x9f, 0x00, 0xfd, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07ec, 0x07e8, 0x07e4, 0x0205, 0x0206, 0x0207),
+  },
+  {     .freq                   = 5070,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfb, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfd, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f0, 0x07ec, 0x07e8, 0x0204, 0x0205, 0x0206),
+  },
+  {     .freq                   = 5080,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfc, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f4, 0x07f0, 0x07ec, 0x0203, 0x0204, 0x0205),
+  },
+  {     .freq                   = 5090,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfd, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f8, 0x07f4, 0x07f0, 0x0202, 0x0203, 0x0204),
+  },
+  {     .freq                   = 5100,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xfe, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07fc, 0x07f8, 0x07f4, 0x0201, 0x0202, 0x0203),
+  },
+  {     .freq                   = 5110,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xff, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0800, 0x07fc, 0x07f8, 0x0200, 0x0201, 0x0202),
+  },
+  {     .freq                   = 5120,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x00, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0804, 0x0800, 0x07fc, 0x01ff, 0x0200, 0x0201),
+  },
+  {     .freq                   = 5130,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x01, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0a,
+                   0x00, 0x9f, 0x00, 0xfb, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0808, 0x0804, 0x0800, 0x01fe, 0x01ff, 0x0200),
+  },
+  {     .freq                   = 5140,
+        RADIOREGS3(0xc6, 0x01, 0x01, 0x02, 0x02, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x07, 0x00, 0x70, 0x00, 0x0a,
+                   0x00, 0x9f, 0x00, 0xfb, 0x00, 0x07, 0x00, 0x70,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x080c, 0x0808, 0x0804, 0x01fd, 0x01fe, 0x01ff),
+  },
+  {     .freq                   = 5160,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x04, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x07, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfb, 0x00, 0x07, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0814, 0x0810, 0x080c, 0x01fb, 0x01fc, 0x01fd),
+  },
+  {     .freq                   = 5170,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x05, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfb, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0818, 0x0814, 0x0810, 0x01fa, 0x01fb, 0x01fc),
+  },
+  {     .freq                   = 5180,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x06, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x081c, 0x0818, 0x0814, 0x01f9, 0x01fa, 0x01fb),
+  },
+  {     .freq                   = 5190,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x07, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0820, 0x081c, 0x0818, 0x01f8, 0x01f9, 0x01fa),
+  },
+  {     .freq                   = 5200,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x08, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0824, 0x0820, 0x081c, 0x01f7, 0x01f8, 0x01f9),
+  },
+  {     .freq                   = 5210,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x09, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0828, 0x0824, 0x0820, 0x01f6, 0x01f7, 0x01f8),
+  },
+  {     .freq                   = 5220,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x082c, 0x0828, 0x0824, 0x01f5, 0x01f6, 0x01f7),
+  },
+  {     .freq                   = 5230,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xea, 0x00, 0x06, 0x00, 0x70, 0x00, 0x08,
+                   0x00, 0x9e, 0x00, 0xea, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x08, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0830, 0x082c, 0x0828, 0x01f4, 0x01f5, 0x01f6),
+  },
+  {     .freq                   = 5240,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xe9, 0x00, 0x05, 0x00, 0x70, 0x00, 0x08,
+                   0x00, 0x9d, 0x00, 0xe9, 0x00, 0x05, 0x00, 0x70,
+                   0x00, 0x08, 0x00, 0x6d, 0x00),
+        PHYREGS(0x0834, 0x0830, 0x082c, 0x01f3, 0x01f4, 0x01f5),
+  },
+  {     .freq                   = 5250,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xe9, 0x00, 0x05, 0x00, 0x70, 0x00, 0x08,
+                   0x00, 0x9d, 0x00, 0xe9, 0x00, 0x05, 0x00, 0x70,
+                   0x00, 0x08, 0x00, 0x6d, 0x00),
+        PHYREGS(0x0838, 0x0834, 0x0830, 0x01f2, 0x01f3, 0x01f4),
+  },
+  {     .freq                   = 5260,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xd9, 0x00, 0x05, 0x00, 0x70, 0x00, 0x08,
+                   0x00, 0x9d, 0x00, 0xd9, 0x00, 0x05, 0x00, 0x70,
+                   0x00, 0x08, 0x00, 0x6d, 0x00),
+        PHYREGS(0x083c, 0x0838, 0x0834, 0x01f1, 0x01f2, 0x01f3),
+  },
+  {     .freq                   = 5270,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0f, 0x00,
+                   0xff, 0xd8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xd8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0840, 0x083c, 0x0838, 0x01f0, 0x01f1, 0x01f2),
+  },
+  {     .freq                   = 5280,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x10, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0f, 0x00,
+                   0xff, 0xc8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xc8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0844, 0x0840, 0x083c, 0x01f0, 0x01f0, 0x01f1),
+  },
+  {     .freq                   = 5290,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x11, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0f, 0x00,
+                   0xff, 0xc8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xc8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0848, 0x0844, 0x0840, 0x01ef, 0x01f0, 0x01f0),
+  },
+  {     .freq                   = 5300,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x12, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xc8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xc8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x084c, 0x0848, 0x0844, 0x01ee, 0x01ef, 0x01f0),
+  },
+  {     .freq                   = 5310,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x13, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xc8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xc8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0850, 0x084c, 0x0848, 0x01ed, 0x01ee, 0x01ef),
+  },
+  {     .freq                   = 5320,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x14, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xb8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xb8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0854, 0x0850, 0x084c, 0x01ec, 0x01ed, 0x01ee),
+  },
+  {     .freq                   = 5330,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x15, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xb7, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9b, 0x00, 0xb7, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0858, 0x0854, 0x0850, 0x01eb, 0x01ec, 0x01ed),
+  },
+  {     .freq                   = 5340,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x16, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xb7, 0x00, 0x03, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9b, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6b, 0x00),
+        PHYREGS(0x085c, 0x0858, 0x0854, 0x01ea, 0x01eb, 0x01ec),
+  },
+  {     .freq                   = 5350,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x17, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xa7, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9b, 0x00, 0xa7, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0860, 0x085c, 0x0858, 0x01e9, 0x01ea, 0x01eb),
+  },
+  {     .freq                   = 5360,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x18, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xa6, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9b, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0864, 0x0860, 0x085c, 0x01e8, 0x01e9, 0x01ea),
+  },
+  {     .freq                   = 5370,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x19, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0xa6, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9b, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x5b, 0x00),
+        PHYREGS(0x0868, 0x0864, 0x0860, 0x01e7, 0x01e8, 0x01e9),
+  },
+  {     .freq                   = 5380,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x96, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9a, 0x00, 0x96, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x5a, 0x00),
+        PHYREGS(0x086c, 0x0868, 0x0864, 0x01e6, 0x01e7, 0x01e8),
+  },
+  {     .freq                   = 5390,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8f, 0x0e, 0x00,
+                   0xff, 0x95, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9a, 0x00, 0x95, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x5a, 0x00),
+        PHYREGS(0x0870, 0x086c, 0x0868, 0x01e5, 0x01e6, 0x01e7),
+  },
+  {     .freq                   = 5400,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x95, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9a, 0x00, 0x95, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x5a, 0x00),
+        PHYREGS(0x0874, 0x0870, 0x086c, 0x01e5, 0x01e5, 0x01e6),
+  },
+  {     .freq                   = 5410,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x95, 0x00, 0x03, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x9a, 0x00, 0x95, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x5a, 0x00),
+        PHYREGS(0x0878, 0x0874, 0x0870, 0x01e4, 0x01e5, 0x01e5),
+  },
+  {     .freq                   = 5420,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x95, 0x00, 0x03, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x9a, 0x00, 0x95, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x5a, 0x00),
+        PHYREGS(0x087c, 0x0878, 0x0874, 0x01e3, 0x01e4, 0x01e5),
+  },
+  {     .freq                   = 5430,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x85, 0x00, 0x02, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x99, 0x00, 0x85, 0x00, 0x02, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x59, 0x00),
+        PHYREGS(0x0880, 0x087c, 0x0878, 0x01e2, 0x01e3, 0x01e4),
+  },
+  {     .freq                   = 5440,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x20, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x84, 0x00, 0x02, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x99, 0x00, 0x84, 0x00, 0x02, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x59, 0x00),
+        PHYREGS(0x0884, 0x0880, 0x087c, 0x01e1, 0x01e2, 0x01e3),
+  },
+  {     .freq                   = 5450,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x21, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x84, 0x00, 0x02, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x99, 0x00, 0x84, 0x00, 0x02, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x59, 0x00),
+        PHYREGS(0x0888, 0x0884, 0x0880, 0x01e0, 0x01e1, 0x01e2),
+  },
+  {     .freq                   = 5460,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x22, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x84, 0x00, 0x02, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x99, 0x00, 0x84, 0x00, 0x02, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x69, 0x00),
+        PHYREGS(0x088c, 0x0888, 0x0884, 0x01df, 0x01e0, 0x01e1),
+  },
+  {     .freq                   = 5470,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x23, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x74, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x99, 0x00, 0x74, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x69, 0x00),
+        PHYREGS(0x0890, 0x088c, 0x0888, 0x01de, 0x01df, 0x01e0),
+  },
+  {     .freq                   = 5480,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x24, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0894, 0x0890, 0x088c, 0x01dd, 0x01de, 0x01df),
+  },
+  {     .freq                   = 5490,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x25, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0d, 0x00,
+                   0xc8, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0898, 0x0894, 0x0890, 0x01dd, 0x01dd, 0x01de),
+  },
+  {     .freq                   = 5500,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x26, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x78, 0x00),
+        PHYREGS(0x089c, 0x0898, 0x0894, 0x01dc, 0x01dd, 0x01dd),
+  },
+  {     .freq                   = 5510,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x27, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x78, 0x00),
+        PHYREGS(0x08a0, 0x089c, 0x0898, 0x01db, 0x01dc, 0x01dd),
+  },
+  {     .freq                   = 5520,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x28, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x78, 0x00),
+        PHYREGS(0x08a4, 0x08a0, 0x089c, 0x01da, 0x01db, 0x01dc),
+  },
+  {     .freq                   = 5530,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x29, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x63, 0x00, 0x01, 0x00, 0x70, 0x00, 0x03,
+                   0x00, 0x98, 0x00, 0x63, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x03, 0x00, 0x78, 0x00),
+        PHYREGS(0x08a8, 0x08a4, 0x08a0, 0x01d9, 0x01da, 0x01db),
+  },
+  {     .freq                   = 5540,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x62, 0x00, 0x00, 0x00, 0x70, 0x00, 0x03,
+                   0x00, 0x97, 0x00, 0x62, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x03, 0x00, 0x77, 0x00),
+        PHYREGS(0x08ac, 0x08a8, 0x08a4, 0x01d8, 0x01d9, 0x01da),
+  },
+  {     .freq                   = 5550,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x62, 0x00, 0x00, 0x00, 0x70, 0x00, 0x03,
+                   0x00, 0x97, 0x00, 0x62, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x03, 0x00, 0x77, 0x00),
+        PHYREGS(0x08b0, 0x08ac, 0x08a8, 0x01d7, 0x01d8, 0x01d9),
+  },
+  {     .freq                   = 5560,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x62, 0x00, 0x00, 0x00, 0x70, 0x00, 0x03,
+                   0x00, 0x97, 0x00, 0x62, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x03, 0x00, 0x77, 0x00),
+        PHYREGS(0x08b4, 0x08b0, 0x08ac, 0x01d7, 0x01d7, 0x01d8),
+  },
+  {     .freq                   = 5570,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x52, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x52, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x76, 0x00),
+        PHYREGS(0x08b8, 0x08b4, 0x08b0, 0x01d6, 0x01d7, 0x01d7),
+  },
+  {     .freq                   = 5580,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x52, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x52, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x76, 0x00),
+        PHYREGS(0x08bc, 0x08b8, 0x08b4, 0x01d5, 0x01d6, 0x01d7),
+  },
+  {     .freq                   = 5590,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8d, 0x0b, 0x00,
+                   0x84, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x76, 0x00),
+        PHYREGS(0x08c0, 0x08bc, 0x08b8, 0x01d4, 0x01d5, 0x01d6),
+  },
+  {     .freq                   = 5600,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x30, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x76, 0x00),
+        PHYREGS(0x08c4, 0x08c0, 0x08bc, 0x01d3, 0x01d4, 0x01d5),
+  },
+  {     .freq                   = 5610,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x31, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x76, 0x00),
+        PHYREGS(0x08c8, 0x08c4, 0x08c0, 0x01d2, 0x01d3, 0x01d4),
+  },
+  {     .freq                   = 5620,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x32, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x76, 0x00),
+        PHYREGS(0x08cc, 0x08c8, 0x08c4, 0x01d2, 0x01d2, 0x01d3),
+  },
+  {     .freq                   = 5630,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x33, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x76, 0x00),
+        PHYREGS(0x08d0, 0x08cc, 0x08c8, 0x01d1, 0x01d2, 0x01d2),
+  },
+  {     .freq                   = 5640,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x34, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x95, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x75, 0x00),
+        PHYREGS(0x08d4, 0x08d0, 0x08cc, 0x01d0, 0x01d1, 0x01d2),
+  },
+  {     .freq                   = 5650,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x35, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x50, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x95, 0x00, 0x50, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x75, 0x00),
+        PHYREGS(0x08d8, 0x08d4, 0x08d0, 0x01cf, 0x01d0, 0x01d1),
+  },
+  {     .freq                   = 5660,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x36, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x50, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x95, 0x00, 0x50, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x75, 0x00),
+        PHYREGS(0x08dc, 0x08d8, 0x08d4, 0x01ce, 0x01cf, 0x01d0),
+  },
+  {     .freq                   = 5670,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x37, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x74, 0x00),
+        PHYREGS(0x08e0, 0x08dc, 0x08d8, 0x01ce, 0x01ce, 0x01cf),
+  },
+  {     .freq                   = 5680,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x38, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x74, 0x00),
+        PHYREGS(0x08e4, 0x08e0, 0x08dc, 0x01cd, 0x01ce, 0x01ce),
+  },
+  {     .freq                   = 5690,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x39, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8b, 0x09, 0x00,
+                   0x70, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x74, 0x00),
+        PHYREGS(0x08e8, 0x08e4, 0x08e0, 0x01cc, 0x01cd, 0x01ce),
+  },
+  {     .freq                   = 5700,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x74, 0x00),
+        PHYREGS(0x08ec, 0x08e8, 0x08e4, 0x01cb, 0x01cc, 0x01cd),
+  },
+  {     .freq                   = 5710,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x74, 0x00),
+        PHYREGS(0x08f0, 0x08ec, 0x08e8, 0x01ca, 0x01cb, 0x01cc),
+  },
+  {     .freq                   = 5720,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x74, 0x00),
+        PHYREGS(0x08f4, 0x08f0, 0x08ec, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5725,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x79, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x74, 0x00),
+        PHYREGS(0x08f6, 0x08f2, 0x08ee, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5730,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x84, 0x00),
+        PHYREGS(0x08f8, 0x08f4, 0x08f0, 0x01c9, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5735,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x7b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x83, 0x00),
+        PHYREGS(0x08fa, 0x08f6, 0x08f2, 0x01c8, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5740,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x83, 0x00),
+        PHYREGS(0x08fc, 0x08f8, 0x08f4, 0x01c8, 0x01c9, 0x01c9),
+  },
+  {     .freq                   = 5745,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x83, 0x00),
+        PHYREGS(0x08fe, 0x08fa, 0x08f6, 0x01c8, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5750,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x83, 0x00),
+        PHYREGS(0x0900, 0x08fc, 0x08f8, 0x01c7, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5755,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7f, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x83, 0x00),
+        PHYREGS(0x0902, 0x08fe, 0x08fa, 0x01c7, 0x01c8, 0x01c8),
+  },
+  {     .freq                   = 5760,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x40, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x20, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x20, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x83, 0x00),
+        PHYREGS(0x0904, 0x0900, 0x08fc, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5765,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x81, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x20, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x20, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x0906, 0x0902, 0x08fe, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5770,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x41, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x20, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x20, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x0908, 0x0904, 0x0900, 0x01c6, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5775,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x83, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x20, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x20, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x090a, 0x0906, 0x0902, 0x01c5, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5780,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x42, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x8a, 0x06, 0x00,
+                   0x40, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x090c, 0x0908, 0x0904, 0x01c5, 0x01c6, 0x01c6),
+  },
+  {     .freq                   = 5785,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x85, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x8a, 0x06, 0x00,
+                   0x40, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x090e, 0x090a, 0x0906, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5790,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x43, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x8a, 0x06, 0x00,
+                   0x40, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x0910, 0x090c, 0x0908, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5795,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x87, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x8a, 0x06, 0x00,
+                   0x40, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x0912, 0x090e, 0x090a, 0x01c4, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5800,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x44, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x0914, 0x0910, 0x090c, 0x01c3, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5805,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x89, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x0916, 0x0912, 0x090e, 0x01c3, 0x01c4, 0x01c4),
+  },
+  {     .freq                   = 5810,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x45, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x0918, 0x0914, 0x0910, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5815,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x091a, 0x0916, 0x0912, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5820,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x46, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x091c, 0x0918, 0x0914, 0x01c2, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5825,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x82, 0x00),
+        PHYREGS(0x091e, 0x091a, 0x0916, 0x01c1, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5830,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x47, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x72, 0x00),
+        PHYREGS(0x0920, 0x091c, 0x0918, 0x01c1, 0x01c2, 0x01c2),
+  },
+  {     .freq                   = 5840,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x48, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x72, 0x00),
+        PHYREGS(0x0924, 0x0920, 0x091c, 0x01c0, 0x01c1, 0x01c2),
+  },
+  {     .freq                   = 5850,
+        RADIOREGS3(0xe0, 0x00, 0x01, 0x02, 0x49, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x72, 0x00),
+        PHYREGS(0x0928, 0x0924, 0x0920, 0x01bf, 0x01c0, 0x01c1),
+  },
+  {     .freq                   = 5860,
+        RADIOREGS3(0xde, 0x00, 0x01, 0x02, 0x4a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x72, 0x00),
+        PHYREGS(0x092c, 0x0928, 0x0924, 0x01bf, 0x01bf, 0x01c0),
+  },
+  {     .freq                   = 5870,
+        RADIOREGS3(0xdb, 0x00, 0x01, 0x02, 0x4b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x71, 0x00),
+        PHYREGS(0x0930, 0x092c, 0x0928, 0x01be, 0x01bf, 0x01bf),
+  },
+  {     .freq                   = 5880,
+        RADIOREGS3(0xd8, 0x00, 0x01, 0x02, 0x4c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x71, 0x00),
+        PHYREGS(0x0934, 0x0930, 0x092c, 0x01bd, 0x01be, 0x01bf),
+  },
+  {     .freq                   = 5890,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x88, 0x04, 0x00,
+                   0x20, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x71, 0x00),
+        PHYREGS(0x0938, 0x0934, 0x0930, 0x01bc, 0x01bd, 0x01be),
+  },
+  {     .freq                   = 5900,
+        RADIOREGS3(0xd3, 0x00, 0x01, 0x02, 0x4e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x87, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x71, 0x00),
+        PHYREGS(0x093c, 0x0938, 0x0934, 0x01bc, 0x01bc, 0x01bd),
+  },
+  {     .freq                   = 5910,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x87, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x71, 0x00),
+        PHYREGS(0x0940, 0x093c, 0x0938, 0x01bb, 0x01bc, 0x01bc),
+  },
+  {     .freq                   = 2412,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x6c, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x04, 0x04, 0x04, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x1f, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0b, 0x00, 0x1f, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0b),
+        PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443),
+  },
+  {     .freq                   = 2417,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x71, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x1f, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0a, 0x00, 0x1f, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0a),
+        PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441),
+  },
+  {     .freq                   = 2422,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x76, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x0e, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0a, 0x00, 0x0e, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0a),
+        PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f),
+  },
+  {     .freq                   = 2427,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x7b, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x0d, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x0a, 0x00, 0x0d, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x0a),
+        PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d),
+  },
+  {     .freq                   = 2432,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x80, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x0a, 0x00, 0x0c, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x0a),
+        PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a),
+  },
+  {     .freq                   = 2437,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x85, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x0b, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x0a, 0x00, 0x0b, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x0a),
+        PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438),
+  },
+  {     .freq                   = 2442,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8a, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x09, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x0a, 0x00, 0x09, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x0a),
+        PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436),
+  },
+  {     .freq                   = 2447,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8f, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x09, 0x00, 0x08, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x09),
+        PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434),
+  },
+  {     .freq                   = 2452,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x94, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x07, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x09, 0x00, 0x07, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x09),
+        PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431),
+  },
+  {     .freq                   = 2457,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x99, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x06, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x09, 0x00, 0x06, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x09),
+        PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f),
+  },
+  {     .freq                   = 2462,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x9e, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x05, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x09, 0x00, 0x05, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x09),
+        PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d),
+  },
+  {     .freq                   = 2467,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa3, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x08, 0x00, 0x04, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x08),
+        PHYREGS(0x03df, 0x03db, 0x03d7, 0x0422, 0x0427, 0x042b),
+  },
+  {     .freq                   = 2472,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa8, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x03, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x08, 0x00, 0x03, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x08),
+        PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429),
+  },
+  {     .freq                   = 2484,
+        RADIOREGS3(0xff, 0x01, 0x03, 0x09, 0xb4, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x08),
+        PHYREGS(0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424),
+  },
+};
+
+static const struct b43_nphy_channeltab_entry_rev3 b43_nphy_channeltab_rev6[] = {
+  {     .freq                   = 4920,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07b4, 0x07b0, 0x07ac, 0x0214, 0x0215, 0x0216),
+  },
+  {     .freq                   = 4930,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xed, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07b8, 0x07b4, 0x07b0, 0x0213, 0x0214, 0x0215),
+  },
+  {     .freq                   = 4940,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xee, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07bc, 0x07b8, 0x07b4, 0x0212, 0x0213, 0x0214),
+  },
+  {     .freq                   = 4950,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xef, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c0, 0x07bc, 0x07b8, 0x0211, 0x0212, 0x0213),
+  },
+  {     .freq                   = 4960,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf0, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c4, 0x07c0, 0x07bc, 0x020f, 0x0211, 0x0212),
+  },
+  {     .freq                   = 4970,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf1, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c8, 0x07c4, 0x07c0, 0x020e, 0x020f, 0x0211),
+  },
+  {     .freq                   = 4980,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf2, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07cc, 0x07c8, 0x07c4, 0x020d, 0x020e, 0x020f),
+  },
+  {     .freq                   = 4990,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf3, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d0, 0x07cc, 0x07c8, 0x020c, 0x020d, 0x020e),
+  },
+  {     .freq                   = 5000,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf4, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d4, 0x07d0, 0x07cc, 0x020b, 0x020c, 0x020d),
+  },
+  {     .freq                   = 5010,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf5, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d8, 0x07d4, 0x07d0, 0x020a, 0x020b, 0x020c),
+  },
+  {     .freq                   = 5020,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf6, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07dc, 0x07d8, 0x07d4, 0x0209, 0x020a, 0x020b),
+  },
+  {     .freq                   = 5030,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf7, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e0, 0x07dc, 0x07d8, 0x0208, 0x0209, 0x020a),
+  },
+  {     .freq                   = 5040,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf8, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e4, 0x07e0, 0x07dc, 0x0207, 0x0208, 0x0209),
+  },
+  {     .freq                   = 5050,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf9, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e8, 0x07e4, 0x07e0, 0x0206, 0x0207, 0x0208),
+  },
+  {     .freq                   = 5060,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfa, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07ec, 0x07e8, 0x07e4, 0x0205, 0x0206, 0x0207),
+  },
+  {     .freq                   = 5070,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfb, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfd, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f0, 0x07ec, 0x07e8, 0x0204, 0x0205, 0x0206),
+  },
+  {     .freq                   = 5080,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfc, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfd, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f4, 0x07f0, 0x07ec, 0x0203, 0x0204, 0x0205),
+  },
+  {     .freq                   = 5090,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfd, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfd, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f8, 0x07f4, 0x07f0, 0x0202, 0x0203, 0x0204),
+  },
+  {     .freq                   = 5100,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xfe, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfd, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07fc, 0x07f8, 0x07f4, 0x0201, 0x0202, 0x0203),
+  },
+  {     .freq                   = 5110,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xff, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0800, 0x07fc, 0x07f8, 0x0200, 0x0201, 0x0202),
+  },
+  {     .freq                   = 5120,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x00, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0804, 0x0800, 0x07fc, 0x01ff, 0x0200, 0x0201),
+  },
+  {     .freq                   = 5130,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x01, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0808, 0x0804, 0x0800, 0x01fe, 0x01ff, 0x0200),
+  },
+  {     .freq                   = 5140,
+        RADIOREGS3(0xc6, 0x01, 0x01, 0x02, 0x02, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfb, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x080c, 0x0808, 0x0804, 0x01fd, 0x01fe, 0x01ff),
+  },
+  {     .freq                   = 5160,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x04, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x07, 0x00, 0x77, 0x00, 0x0e,
+                   0x00, 0x6f, 0x00, 0xfa, 0x00, 0x07, 0x00, 0x77,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0814, 0x0810, 0x080c, 0x01fb, 0x01fc, 0x01fd),
+  },
+  {     .freq                   = 5170,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x05, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x07, 0x00, 0x77, 0x00, 0x0e,
+                   0x00, 0x6f, 0x00, 0xfa, 0x00, 0x07, 0x00, 0x77,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0818, 0x0814, 0x0810, 0x01fa, 0x01fb, 0x01fc),
+  },
+  {     .freq                   = 5180,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x06, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xf9, 0x00, 0x06, 0x00, 0x77, 0x00, 0x0e,
+                   0x00, 0x6f, 0x00, 0xf9, 0x00, 0x06, 0x00, 0x77,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x081c, 0x0818, 0x0814, 0x01f9, 0x01fa, 0x01fb),
+  },
+  {     .freq                   = 5190,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x07, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xf9, 0x00, 0x06, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xf9, 0x00, 0x06, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0820, 0x081c, 0x0818, 0x01f8, 0x01f9, 0x01fa),
+  },
+  {     .freq                   = 5200,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x08, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xf9, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xf9, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0824, 0x0820, 0x081c, 0x01f7, 0x01f8, 0x01f9),
+  },
+  {     .freq                   = 5210,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x09, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xf9, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xf9, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0828, 0x0824, 0x0820, 0x01f6, 0x01f7, 0x01f8),
+  },
+  {     .freq                   = 5220,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xfe, 0xd8, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xd8, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x082c, 0x0828, 0x0824, 0x01f5, 0x01f6, 0x01f7),
+  },
+  {     .freq                   = 5230,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xee, 0xd8, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xd8, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0830, 0x082c, 0x0828, 0x01f4, 0x01f5, 0x01f6),
+  },
+  {     .freq                   = 5240,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xee, 0xc8, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xc8, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0834, 0x0830, 0x082c, 0x01f3, 0x01f4, 0x01f5),
+  },
+  {     .freq                   = 5250,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xed, 0xc7, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xc7, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0838, 0x0834, 0x0830, 0x01f2, 0x01f3, 0x01f4),
+  },
+  {     .freq                   = 5260,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0e, 0x00,
+                   0xed, 0xc7, 0x00, 0x04, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xc7, 0x00, 0x04, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x083c, 0x0838, 0x0834, 0x01f1, 0x01f2, 0x01f3),
+  },
+  {     .freq                   = 5270,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8e, 0x0e, 0x00,
+                   0xed, 0xc7, 0x00, 0x04, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xc7, 0x00, 0x04, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0840, 0x083c, 0x0838, 0x01f0, 0x01f1, 0x01f2),
+  },
+  {     .freq                   = 5280,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x10, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0844, 0x0840, 0x083c, 0x01f0, 0x01f0, 0x01f1),
+  },
+  {     .freq                   = 5290,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x11, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0848, 0x0844, 0x0840, 0x01ef, 0x01f0, 0x01f0),
+  },
+  {     .freq                   = 5300,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x12, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x084c, 0x0848, 0x0844, 0x01ee, 0x01ef, 0x01f0),
+  },
+  {     .freq                   = 5310,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x13, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0850, 0x084c, 0x0848, 0x01ed, 0x01ee, 0x01ef),
+  },
+  {     .freq                   = 5320,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x14, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdb, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0854, 0x0850, 0x084c, 0x01ec, 0x01ed, 0x01ee),
+  },
+  {     .freq                   = 5330,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x15, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xcb, 0xa6, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0b,
+                   0x00, 0x6f, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0858, 0x0854, 0x0850, 0x01eb, 0x01ec, 0x01ed),
+  },
+  {     .freq                   = 5340,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x16, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xca, 0xa6, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0b,
+                   0x00, 0x6f, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x085c, 0x0858, 0x0854, 0x01ea, 0x01eb, 0x01ec),
+  },
+  {     .freq                   = 5350,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x17, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0d, 0x00,
+                   0xca, 0xa6, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0b,
+                   0x00, 0x6f, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0860, 0x085c, 0x0858, 0x01e9, 0x01ea, 0x01eb),
+  },
+  {     .freq                   = 5360,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x18, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0d, 0x00,
+                   0xc9, 0x95, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x95, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0864, 0x0860, 0x085c, 0x01e8, 0x01e9, 0x01ea),
+  },
+  {     .freq                   = 5370,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x19, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0d, 0x00,
+                   0xc9, 0x95, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x95, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0868, 0x0864, 0x0860, 0x01e7, 0x01e8, 0x01e9),
+  },
+  {     .freq                   = 5380,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb8, 0x95, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x95, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x086c, 0x0868, 0x0864, 0x01e6, 0x01e7, 0x01e8),
+  },
+  {     .freq                   = 5390,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb8, 0x84, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0870, 0x086c, 0x0868, 0x01e5, 0x01e6, 0x01e7),
+  },
+  {     .freq                   = 5400,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb8, 0x84, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0874, 0x0870, 0x086c, 0x01e5, 0x01e5, 0x01e6),
+  },
+  {     .freq                   = 5410,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb7, 0x84, 0x00, 0x02, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x02, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0878, 0x0874, 0x0870, 0x01e4, 0x01e5, 0x01e5),
+  },
+  {     .freq                   = 5420,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xa7, 0x84, 0x00, 0x02, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x02, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x087c, 0x0878, 0x0874, 0x01e3, 0x01e4, 0x01e5),
+  },
+  {     .freq                   = 5430,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0b, 0x00,
+                   0xa6, 0x84, 0x00, 0x02, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x02, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0880, 0x087c, 0x0878, 0x01e2, 0x01e3, 0x01e4),
+  },
+  {     .freq                   = 5440,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x20, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0xa6, 0x84, 0x00, 0x02, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x02, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0884, 0x0880, 0x087c, 0x01e1, 0x01e2, 0x01e3),
+  },
+  {     .freq                   = 5450,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x21, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0x95, 0x84, 0x00, 0x01, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x01, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0888, 0x0884, 0x0880, 0x01e0, 0x01e1, 0x01e2),
+  },
+  {     .freq                   = 5460,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x22, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0x95, 0x84, 0x00, 0x01, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x01, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x088c, 0x0888, 0x0884, 0x01df, 0x01e0, 0x01e1),
+  },
+  {     .freq                   = 5470,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x23, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0x94, 0x73, 0x00, 0x01, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x01, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0890, 0x088c, 0x0888, 0x01de, 0x01df, 0x01e0),
+  },
+  {     .freq                   = 5480,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x24, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x84, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0894, 0x0890, 0x088c, 0x01dd, 0x01de, 0x01df),
+  },
+  {     .freq                   = 5490,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x25, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x83, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0898, 0x0894, 0x0890, 0x01dd, 0x01dd, 0x01de),
+  },
+  {     .freq                   = 5500,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x26, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x82, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x089c, 0x0898, 0x0894, 0x01dc, 0x01dd, 0x01dd),
+  },
+  {     .freq                   = 5510,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x27, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x82, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08a0, 0x089c, 0x0898, 0x01db, 0x01dc, 0x01dd),
+  },
+  {     .freq                   = 5520,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x28, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x72, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08a4, 0x08a0, 0x089c, 0x01da, 0x01db, 0x01dc),
+  },
+  {     .freq                   = 5530,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x29, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x09, 0x00,
+                   0x72, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08a8, 0x08a4, 0x08a0, 0x01d9, 0x01da, 0x01db),
+  },
+  {     .freq                   = 5540,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x09, 0x00,
+                   0x71, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08ac, 0x08a8, 0x08a4, 0x01d8, 0x01d9, 0x01da),
+  },
+  {     .freq                   = 5550,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x09, 0x00,
+                   0x61, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08b0, 0x08ac, 0x08a8, 0x01d7, 0x01d8, 0x01d9),
+  },
+  {     .freq                   = 5560,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x09, 0x00,
+                   0x61, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08b4, 0x08b0, 0x08ac, 0x01d7, 0x01d7, 0x01d8),
+  },
+  {     .freq                   = 5570,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x09, 0x00,
+                   0x61, 0x62, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x62, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08b8, 0x08b4, 0x08b0, 0x01d6, 0x01d7, 0x01d7),
+  },
+  {     .freq                   = 5580,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x08, 0x00,
+                   0x60, 0x62, 0x00, 0x00, 0x00, 0x77, 0x00, 0x08,
+                   0x00, 0x6f, 0x00, 0x62, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x08, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08bc, 0x08b8, 0x08b4, 0x01d5, 0x01d6, 0x01d7),
+  },
+  {     .freq                   = 5590,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x08, 0x00,
+                   0x50, 0x61, 0x00, 0x00, 0x00, 0x77, 0x00, 0x08,
+                   0x00, 0x6f, 0x00, 0x61, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x08, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08c0, 0x08bc, 0x08b8, 0x01d4, 0x01d5, 0x01d6),
+  },
+  {     .freq                   = 5600,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x30, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x89, 0x08, 0x00,
+                   0x50, 0x51, 0x00, 0x00, 0x00, 0x77, 0x00, 0x08,
+                   0x00, 0x6f, 0x00, 0x51, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x08, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08c4, 0x08c0, 0x08bc, 0x01d3, 0x01d4, 0x01d5),
+  },
+  {     .freq                   = 5610,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x31, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x89, 0x08, 0x00,
+                   0x50, 0x51, 0x00, 0x00, 0x00, 0x77, 0x00, 0x08,
+                   0x00, 0x6f, 0x00, 0x51, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x08, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08c8, 0x08c4, 0x08c0, 0x01d2, 0x01d3, 0x01d4),
+  },
+  {     .freq                   = 5620,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x32, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x89, 0x08, 0x00,
+                   0x50, 0x50, 0x00, 0x00, 0x00, 0x77, 0x00, 0x07,
+                   0x00, 0x6f, 0x00, 0x50, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x07, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08cc, 0x08c8, 0x08c4, 0x01d2, 0x01d2, 0x01d3),
+  },
+  {     .freq                   = 5630,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x33, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x50, 0x50, 0x00, 0x00, 0x00, 0x77, 0x00, 0x07,
+                   0x00, 0x6f, 0x00, 0x50, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x07, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08d0, 0x08cc, 0x08c8, 0x01d1, 0x01d2, 0x01d2),
+  },
+  {     .freq                   = 5640,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x34, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x50, 0x00, 0x00, 0x00, 0x77, 0x00, 0x07,
+                   0x00, 0x6f, 0x00, 0x50, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x07, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08d4, 0x08d0, 0x08cc, 0x01d0, 0x01d1, 0x01d2),
+  },
+  {     .freq                   = 5650,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x35, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x40, 0x00, 0x00, 0x00, 0x77, 0x00, 0x07,
+                   0x00, 0x6f, 0x00, 0x40, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x07, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08d8, 0x08d4, 0x08d0, 0x01cf, 0x01d0, 0x01d1),
+  },
+  {     .freq                   = 5660,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x36, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x40, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6f, 0x00, 0x40, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08dc, 0x08d8, 0x08d4, 0x01ce, 0x01cf, 0x01d0),
+  },
+  {     .freq                   = 5670,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x37, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6f, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08e0, 0x08dc, 0x08d8, 0x01ce, 0x01ce, 0x01cf),
+  },
+  {     .freq                   = 5680,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x38, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6f, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08e4, 0x08e0, 0x08dc, 0x01cd, 0x01ce, 0x01ce),
+  },
+  {     .freq                   = 5690,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x39, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6f, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08e8, 0x08e4, 0x08e0, 0x01cc, 0x01cd, 0x01ce),
+  },
+  {     .freq                   = 5700,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08ec, 0x08e8, 0x08e4, 0x01cb, 0x01cc, 0x01cd),
+  },
+  {     .freq                   = 5710,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08f0, 0x08ec, 0x08e8, 0x01ca, 0x01cb, 0x01cc),
+  },
+  {     .freq                   = 5720,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08f4, 0x08f0, 0x08ec, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5725,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x79, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08f6, 0x08f2, 0x08ee, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5730,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08f8, 0x08f4, 0x08f0, 0x01c9, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5735,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x7b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6d, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6d, 0x00),
+        PHYREGS(0x08fa, 0x08f6, 0x08f2, 0x01c8, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5740,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6d, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6d, 0x00),
+        PHYREGS(0x08fc, 0x08f8, 0x08f4, 0x01c8, 0x01c9, 0x01c9),
+  },
+  {     .freq                   = 5745,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6d, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6d, 0x00),
+        PHYREGS(0x08fe, 0x08fa, 0x08f6, 0x01c8, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5750,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x20, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6d, 0x00, 0x20, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6d, 0x00),
+        PHYREGS(0x0900, 0x08fc, 0x08f8, 0x01c7, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5755,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7f, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x10, 0x20, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6c, 0x00, 0x20, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0902, 0x08fe, 0x08fa, 0x01c7, 0x01c8, 0x01c8),
+  },
+  {     .freq                   = 5760,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x40, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x86, 0x05, 0x00,
+                   0x10, 0x20, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6c, 0x00, 0x20, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0904, 0x0900, 0x08fc, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5765,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x81, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x86, 0x05, 0x00,
+                   0x10, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6c, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0906, 0x0902, 0x08fe, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5770,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x41, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x86, 0x04, 0x00,
+                   0x10, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0908, 0x0904, 0x0900, 0x01c6, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5775,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x83, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x86, 0x04, 0x00,
+                   0x10, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x090a, 0x0906, 0x0902, 0x01c5, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5780,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x42, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x86, 0x04, 0x00,
+                   0x10, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x090c, 0x0908, 0x0904, 0x01c5, 0x01c6, 0x01c6),
+  },
+  {     .freq                   = 5785,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x85, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x090e, 0x090a, 0x0906, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5790,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x43, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0910, 0x090c, 0x0908, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5795,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x87, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0912, 0x090e, 0x090a, 0x01c4, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5800,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x44, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0914, 0x0910, 0x090c, 0x01c3, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5805,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x89, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6a, 0x00),
+        PHYREGS(0x0916, 0x0912, 0x090e, 0x01c3, 0x01c4, 0x01c4),
+  },
+  {     .freq                   = 5810,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x45, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6a, 0x00),
+        PHYREGS(0x0918, 0x0914, 0x0910, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5815,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6a, 0x00),
+        PHYREGS(0x091a, 0x0916, 0x0912, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5820,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x46, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6a, 0x00),
+        PHYREGS(0x091c, 0x0918, 0x0914, 0x01c2, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5825,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x69, 0x00),
+        PHYREGS(0x091e, 0x091a, 0x0916, 0x01c1, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5830,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x47, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x69, 0x00),
+        PHYREGS(0x0920, 0x091c, 0x0918, 0x01c1, 0x01c2, 0x01c2),
+  },
+  {     .freq                   = 5840,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x48, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x69, 0x00),
+        PHYREGS(0x0924, 0x0920, 0x091c, 0x01c0, 0x01c1, 0x01c2),
+  },
+  {     .freq                   = 5850,
+        RADIOREGS3(0xe0, 0x00, 0x01, 0x02, 0x49, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x69, 0x00),
+        PHYREGS(0x0928, 0x0924, 0x0920, 0x01bf, 0x01c0, 0x01c1),
+  },
+  {     .freq                   = 5860,
+        RADIOREGS3(0xde, 0x00, 0x01, 0x02, 0x4a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x69, 0x00),
+        PHYREGS(0x092c, 0x0928, 0x0924, 0x01bf, 0x01bf, 0x01c0),
+  },
+  {     .freq                   = 5870,
+        RADIOREGS3(0xdb, 0x00, 0x01, 0x02, 0x4b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0930, 0x092c, 0x0928, 0x01be, 0x01bf, 0x01bf),
+  },
+  {     .freq                   = 5880,
+        RADIOREGS3(0xd8, 0x00, 0x01, 0x02, 0x4c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0934, 0x0930, 0x092c, 0x01bd, 0x01be, 0x01bf),
+  },
+  {     .freq                   = 5890,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0938, 0x0934, 0x0930, 0x01bc, 0x01bd, 0x01be),
+  },
+  {     .freq                   = 5900,
+        RADIOREGS3(0xd3, 0x00, 0x01, 0x02, 0x4e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x093c, 0x0938, 0x0934, 0x01bc, 0x01bc, 0x01bd),
+  },
+  {     .freq                   = 5910,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0940, 0x093c, 0x0938, 0x01bb, 0x01bc, 0x01bc),
+  },
+  {     .freq                   = 2412,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x6c, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x04, 0x04, 0x04, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x78, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0b, 0x00, 0x0a, 0x00, 0x78, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0b, 0x00, 0x0a),
+        PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443),
+  },
+  {     .freq                   = 2417,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x71, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x78, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0b, 0x00, 0x0a, 0x00, 0x78, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0b, 0x00, 0x0a),
+        PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441),
+  },
+  {     .freq                   = 2422,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x76, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x67, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0b, 0x00, 0x0a, 0x00, 0x67, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0b, 0x00, 0x0a),
+        PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f),
+  },
+  {     .freq                   = 2427,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x7b, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x57, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x0a, 0x00, 0x57, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x0a),
+        PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d),
+  },
+  {     .freq                   = 2432,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x80, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x56, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x0a, 0x00, 0x56, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x0a),
+        PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a),
+  },
+  {     .freq                   = 2437,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x85, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x46, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x0a, 0x00, 0x46, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x0a),
+        PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438),
+  },
+  {     .freq                   = 2442,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8a, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x45, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x0a, 0x00, 0x45, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x0a),
+        PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436),
+  },
+  {     .freq                   = 2447,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8f, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x34, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x09, 0x00, 0x34, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x09),
+        PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434),
+  },
+  {     .freq                   = 2452,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x94, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x23, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x09, 0x00, 0x23, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x09),
+        PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431),
+  },
+  {     .freq                   = 2457,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x99, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x12, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x09, 0x00, 0x12, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x09),
+        PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f),
+  },
+  {     .freq                   = 2462,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x9e, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x09, 0x00, 0x09, 0x00, 0x02, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x09, 0x00, 0x09),
+        PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d),
+  },
+  {     .freq                   = 2467,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa3, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x09, 0x00, 0x09, 0x00, 0x01, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x09, 0x00, 0x09),
+        PHYREGS(0x03df, 0x03db, 0x03d7, 0x0422, 0x0427, 0x042b),
+  },
+  {     .freq                   = 2472,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa8, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x09, 0x00, 0x09, 0x00, 0x01, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x09, 0x00, 0x09),
+        PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429),
+  },
+  {     .freq                   = 2484,
+        RADIOREGS3(0xff, 0x01, 0x03, 0x09, 0xb4, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x20, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x09, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x09, 0x00, 0x09),
+        PHYREGS(0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424),
+  },
+};
+
+static const struct b43_nphy_channeltab_entry_rev3 b43_nphy_channeltab_rev7_9[] = {
+  {     .freq                   = 4920,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, 0x00, 0x0f,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0b, 0x00, 0x70,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07b4, 0x07b0, 0x07ac, 0x0214, 0x0215, 0x0216),
+  },
+  {     .freq                   = 4930,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xed, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, 0x00, 0x0e,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0b, 0x00, 0x70,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07b8, 0x07b4, 0x07b0, 0x0213, 0x0214, 0x0215),
+  },
+  {     .freq                   = 4940,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xee, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, 0x00, 0x0e,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0b, 0x00, 0x70,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07bc, 0x07b8, 0x07b4, 0x0212, 0x0213, 0x0214),
+  },
+  {     .freq                   = 4950,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xef, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0b, 0x00, 0x70, 0x00, 0x0e,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0b, 0x00, 0x70,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c0, 0x07bc, 0x07b8, 0x0211, 0x0212, 0x0213),
+  },
+  {     .freq                   = 4960,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf0, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0e,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c4, 0x07c0, 0x07bc, 0x020f, 0x0211, 0x0212),
+  },
+  {     .freq                   = 4970,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf1, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c8, 0x07c4, 0x07c0, 0x020e, 0x020f, 0x0211),
+  },
+  {     .freq                   = 4980,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf2, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07cc, 0x07c8, 0x07c4, 0x020d, 0x020e, 0x020f),
+  },
+  {     .freq                   = 4990,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf3, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d0, 0x07cc, 0x07c8, 0x020c, 0x020d, 0x020e),
+  },
+  {     .freq                   = 5000,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf4, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d4, 0x07d0, 0x07cc, 0x020b, 0x020c, 0x020d),
+  },
+  {     .freq                   = 5010,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf5, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x0a, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x0a, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d8, 0x07d4, 0x07d0, 0x020a, 0x020b, 0x020c),
+  },
+  {     .freq                   = 5020,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf6, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0d,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07dc, 0x07d8, 0x07d4, 0x0209, 0x020a, 0x020b),
+  },
+  {     .freq                   = 5030,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf7, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xff, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0c,
+                   0x00, 0x9f, 0x00, 0xff, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e0, 0x07dc, 0x07d8, 0x0208, 0x0209, 0x020a),
+  },
+  {     .freq                   = 5040,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf8, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0c,
+                   0x00, 0x9f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e4, 0x07e0, 0x07dc, 0x0207, 0x0208, 0x0209),
+  },
+  {     .freq                   = 5050,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf9, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0c,
+                   0x00, 0x9f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e8, 0x07e4, 0x07e0, 0x0206, 0x0207, 0x0208),
+  },
+  {     .freq                   = 5060,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfa, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x09, 0x00, 0x70, 0x00, 0x0c,
+                   0x00, 0x9f, 0x00, 0xfd, 0x00, 0x09, 0x00, 0x70,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07ec, 0x07e8, 0x07e4, 0x0205, 0x0206, 0x0207),
+  },
+  {     .freq                   = 5070,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfb, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfd, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f0, 0x07ec, 0x07e8, 0x0204, 0x0205, 0x0206),
+  },
+  {     .freq                   = 5080,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfc, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f4, 0x07f0, 0x07ec, 0x0203, 0x0204, 0x0205),
+  },
+  {     .freq                   = 5090,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfd, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f8, 0x07f4, 0x07f0, 0x0202, 0x0203, 0x0204),
+  },
+  {     .freq                   = 5100,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xfe, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07fc, 0x07f8, 0x07f4, 0x0201, 0x0202, 0x0203),
+  },
+  {     .freq                   = 5110,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xff, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0800, 0x07fc, 0x07f8, 0x0200, 0x0201, 0x0202),
+  },
+  {     .freq                   = 5120,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x00, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0b,
+                   0x00, 0x9f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0804, 0x0800, 0x07fc, 0x01ff, 0x0200, 0x0201),
+  },
+  {     .freq                   = 5130,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x01, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x08, 0x00, 0x70, 0x00, 0x0a,
+                   0x00, 0x9f, 0x00, 0xfb, 0x00, 0x08, 0x00, 0x70,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0808, 0x0804, 0x0800, 0x01fe, 0x01ff, 0x0200),
+  },
+  {     .freq                   = 5140,
+        RADIOREGS3(0xc6, 0x01, 0x01, 0x02, 0x02, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x07, 0x00, 0x70, 0x00, 0x0a,
+                   0x00, 0x9f, 0x00, 0xfb, 0x00, 0x07, 0x00, 0x70,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x080c, 0x0808, 0x0804, 0x01fd, 0x01fe, 0x01ff),
+  },
+  {     .freq                   = 5160,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x04, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x07, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfb, 0x00, 0x07, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0814, 0x0810, 0x080c, 0x01fb, 0x01fc, 0x01fd),
+  },
+  {     .freq                   = 5170,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x05, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfb, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0818, 0x0814, 0x0810, 0x01fa, 0x01fb, 0x01fc),
+  },
+  {     .freq                   = 5180,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x06, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x081c, 0x0818, 0x0814, 0x01f9, 0x01fa, 0x01fb),
+  },
+  {     .freq                   = 5190,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x07, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0820, 0x081c, 0x0818, 0x01f8, 0x01f9, 0x01fa),
+  },
+  {     .freq                   = 5200,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x08, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0824, 0x0820, 0x081c, 0x01f7, 0x01f8, 0x01f9),
+  },
+  {     .freq                   = 5210,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x09, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0828, 0x0824, 0x0820, 0x01f6, 0x01f7, 0x01f8),
+  },
+  {     .freq                   = 5220,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xfe, 0xfa, 0x00, 0x06, 0x00, 0x70, 0x00, 0x09,
+                   0x00, 0x9e, 0x00, 0xfa, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x09, 0x00, 0x6e, 0x00),
+        PHYREGS(0x082c, 0x0828, 0x0824, 0x01f5, 0x01f6, 0x01f7),
+  },
+  {     .freq                   = 5230,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xee, 0xea, 0x00, 0x06, 0x00, 0x70, 0x00, 0x08,
+                   0x00, 0x9e, 0x00, 0xea, 0x00, 0x06, 0x00, 0x70,
+                   0x00, 0x08, 0x00, 0x6e, 0x00),
+        PHYREGS(0x0830, 0x082c, 0x0828, 0x01f4, 0x01f5, 0x01f6),
+  },
+  {     .freq                   = 5240,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xee, 0xe9, 0x00, 0x05, 0x00, 0x70, 0x00, 0x08,
+                   0x00, 0x9d, 0x00, 0xe9, 0x00, 0x05, 0x00, 0x70,
+                   0x00, 0x08, 0x00, 0x6d, 0x00),
+        PHYREGS(0x0834, 0x0830, 0x082c, 0x01f3, 0x01f4, 0x01f5),
+  },
+  {     .freq                   = 5250,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xed, 0xe9, 0x00, 0x05, 0x00, 0x70, 0x00, 0x08,
+                   0x00, 0x9d, 0x00, 0xe9, 0x00, 0x05, 0x00, 0x70,
+                   0x00, 0x08, 0x00, 0x6d, 0x00),
+        PHYREGS(0x0838, 0x0834, 0x0830, 0x01f2, 0x01f3, 0x01f4),
+  },
+  {     .freq                   = 5260,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0e, 0x00,
+                   0xed, 0xd9, 0x00, 0x05, 0x00, 0x70, 0x00, 0x08,
+                   0x00, 0x9d, 0x00, 0xd9, 0x00, 0x05, 0x00, 0x70,
+                   0x00, 0x08, 0x00, 0x6d, 0x00),
+        PHYREGS(0x083c, 0x0838, 0x0834, 0x01f1, 0x01f2, 0x01f3),
+  },
+  {     .freq                   = 5270,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8e, 0x0e, 0x00,
+                   0xed, 0xd8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xd8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0840, 0x083c, 0x0838, 0x01f0, 0x01f1, 0x01f2),
+  },
+  {     .freq                   = 5280,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x10, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xc8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xc8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0844, 0x0840, 0x083c, 0x01f0, 0x01f0, 0x01f1),
+  },
+  {     .freq                   = 5290,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x11, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xc8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xc8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0848, 0x0844, 0x0840, 0x01ef, 0x01f0, 0x01f0),
+  },
+  {     .freq                   = 5300,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x12, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xc8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xc8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x084c, 0x0848, 0x0844, 0x01ee, 0x01ef, 0x01f0),
+  },
+  {     .freq                   = 5310,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x13, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xc8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xc8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0850, 0x084c, 0x0848, 0x01ed, 0x01ee, 0x01ef),
+  },
+  {     .freq                   = 5320,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x14, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdb, 0xb8, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9c, 0x00, 0xb8, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0854, 0x0850, 0x084c, 0x01ec, 0x01ed, 0x01ee),
+  },
+  {     .freq                   = 5330,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x15, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xcb, 0xb7, 0x00, 0x04, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9b, 0x00, 0xb7, 0x00, 0x04, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0858, 0x0854, 0x0850, 0x01eb, 0x01ec, 0x01ed),
+  },
+  {     .freq                   = 5340,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x16, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xca, 0xb7, 0x00, 0x03, 0x00, 0x70, 0x00, 0x07,
+                   0x00, 0x9b, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x07, 0x00, 0x6b, 0x00),
+        PHYREGS(0x085c, 0x0858, 0x0854, 0x01ea, 0x01eb, 0x01ec),
+  },
+  {     .freq                   = 5350,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x17, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0d, 0x00,
+                   0xca, 0xa7, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9b, 0x00, 0xa7, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0860, 0x085c, 0x0858, 0x01e9, 0x01ea, 0x01eb),
+  },
+  {     .freq                   = 5360,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x18, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0d, 0x00,
+                   0xc9, 0xa6, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9b, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0864, 0x0860, 0x085c, 0x01e8, 0x01e9, 0x01ea),
+  },
+  {     .freq                   = 5370,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x19, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0d, 0x00,
+                   0xc9, 0xa6, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9b, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x7b, 0x00),
+        PHYREGS(0x0868, 0x0864, 0x0860, 0x01e7, 0x01e8, 0x01e9),
+  },
+  {     .freq                   = 5380,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb8, 0x96, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9a, 0x00, 0x96, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x7a, 0x00),
+        PHYREGS(0x086c, 0x0868, 0x0864, 0x01e6, 0x01e7, 0x01e8),
+  },
+  {     .freq                   = 5390,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb8, 0x95, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9a, 0x00, 0x95, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x7a, 0x00),
+        PHYREGS(0x0870, 0x086c, 0x0868, 0x01e5, 0x01e6, 0x01e7),
+  },
+  {     .freq                   = 5400,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb8, 0x95, 0x00, 0x03, 0x00, 0x70, 0x00, 0x06,
+                   0x00, 0x9a, 0x00, 0x95, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x06, 0x00, 0x7a, 0x00),
+        PHYREGS(0x0874, 0x0870, 0x086c, 0x01e5, 0x01e5, 0x01e6),
+  },
+  {     .freq                   = 5410,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb7, 0x95, 0x00, 0x03, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x9a, 0x00, 0x95, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x7a, 0x00),
+        PHYREGS(0x0878, 0x0874, 0x0870, 0x01e4, 0x01e5, 0x01e5),
+  },
+  {     .freq                   = 5420,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xa7, 0x95, 0x00, 0x03, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x9a, 0x00, 0x95, 0x00, 0x03, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x7a, 0x00),
+        PHYREGS(0x087c, 0x0878, 0x0874, 0x01e3, 0x01e4, 0x01e5),
+  },
+  {     .freq                   = 5430,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0b, 0x00,
+                   0xa6, 0x85, 0x00, 0x02, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x99, 0x00, 0x85, 0x00, 0x02, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x79, 0x00),
+        PHYREGS(0x0880, 0x087c, 0x0878, 0x01e2, 0x01e3, 0x01e4),
+  },
+  {     .freq                   = 5440,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x20, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0xa6, 0x84, 0x00, 0x02, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x99, 0x00, 0x84, 0x00, 0x02, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x79, 0x00),
+        PHYREGS(0x0884, 0x0880, 0x087c, 0x01e1, 0x01e2, 0x01e3),
+  },
+  {     .freq                   = 5450,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x21, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0x95, 0x84, 0x00, 0x02, 0x00, 0x70, 0x00, 0x05,
+                   0x00, 0x99, 0x00, 0x84, 0x00, 0x02, 0x00, 0x70,
+                   0x00, 0x05, 0x00, 0x79, 0x00),
+        PHYREGS(0x0888, 0x0884, 0x0880, 0x01e0, 0x01e1, 0x01e2),
+  },
+  {     .freq                   = 5460,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x22, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0x95, 0x84, 0x00, 0x02, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x99, 0x00, 0x84, 0x00, 0x02, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x79, 0x00),
+        PHYREGS(0x088c, 0x0888, 0x0884, 0x01df, 0x01e0, 0x01e1),
+  },
+  {     .freq                   = 5470,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x23, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0x94, 0x74, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x99, 0x00, 0x74, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x79, 0x00),
+        PHYREGS(0x0890, 0x088c, 0x0888, 0x01de, 0x01df, 0x01e0),
+  },
+  {     .freq                   = 5480,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x24, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x84, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x78, 0x00),
+        PHYREGS(0x0894, 0x0890, 0x088c, 0x01dd, 0x01de, 0x01df),
+  },
+  {     .freq                   = 5490,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x25, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x83, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x78, 0x00),
+        PHYREGS(0x0898, 0x0894, 0x0890, 0x01dd, 0x01dd, 0x01de),
+  },
+  {     .freq                   = 5500,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x26, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x82, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x78, 0x00),
+        PHYREGS(0x089c, 0x0898, 0x0894, 0x01dc, 0x01dd, 0x01dd),
+  },
+  {     .freq                   = 5510,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x27, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x82, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x78, 0x00),
+        PHYREGS(0x08a0, 0x089c, 0x0898, 0x01db, 0x01dc, 0x01dd),
+  },
+  {     .freq                   = 5520,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x28, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x72, 0x73, 0x00, 0x01, 0x00, 0x70, 0x00, 0x04,
+                   0x00, 0x98, 0x00, 0x73, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x04, 0x00, 0x78, 0x00),
+        PHYREGS(0x08a4, 0x08a0, 0x089c, 0x01da, 0x01db, 0x01dc),
+  },
+  {     .freq                   = 5530,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x29, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x09, 0x00,
+                   0x72, 0x63, 0x00, 0x01, 0x00, 0x70, 0x00, 0x03,
+                   0x00, 0x98, 0x00, 0x63, 0x00, 0x01, 0x00, 0x70,
+                   0x00, 0x03, 0x00, 0x78, 0x00),
+        PHYREGS(0x08a8, 0x08a4, 0x08a0, 0x01d9, 0x01da, 0x01db),
+  },
+  {     .freq                   = 5540,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x09, 0x00,
+                   0x71, 0x62, 0x00, 0x00, 0x00, 0x70, 0x00, 0x03,
+                   0x00, 0x97, 0x00, 0x62, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x03, 0x00, 0x77, 0x00),
+        PHYREGS(0x08ac, 0x08a8, 0x08a4, 0x01d8, 0x01d9, 0x01da),
+  },
+  {     .freq                   = 5550,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x09, 0x00,
+                   0x61, 0x62, 0x00, 0x00, 0x00, 0x70, 0x00, 0x03,
+                   0x00, 0x97, 0x00, 0x62, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x03, 0x00, 0x77, 0x00),
+        PHYREGS(0x08b0, 0x08ac, 0x08a8, 0x01d7, 0x01d8, 0x01d9),
+  },
+  {     .freq                   = 5560,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x09, 0x00,
+                   0x61, 0x62, 0x00, 0x00, 0x00, 0x70, 0x00, 0x03,
+                   0x00, 0x97, 0x00, 0x62, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x03, 0x00, 0x77, 0x00),
+        PHYREGS(0x08b4, 0x08b0, 0x08ac, 0x01d7, 0x01d7, 0x01d8),
+  },
+  {     .freq                   = 5570,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x09, 0x00,
+                   0x61, 0x52, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x52, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x76, 0x00),
+        PHYREGS(0x08b8, 0x08b4, 0x08b0, 0x01d6, 0x01d7, 0x01d7),
+  },
+  {     .freq                   = 5580,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x08, 0x00,
+                   0x60, 0x52, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x52, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x86, 0x00),
+        PHYREGS(0x08bc, 0x08b8, 0x08b4, 0x01d5, 0x01d6, 0x01d7),
+  },
+  {     .freq                   = 5590,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x08, 0x00,
+                   0x50, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x86, 0x00),
+        PHYREGS(0x08c0, 0x08bc, 0x08b8, 0x01d4, 0x01d5, 0x01d6),
+  },
+  {     .freq                   = 5600,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x30, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x89, 0x08, 0x00,
+                   0x50, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x86, 0x00),
+        PHYREGS(0x08c4, 0x08c0, 0x08bc, 0x01d3, 0x01d4, 0x01d5),
+  },
+  {     .freq                   = 5610,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x31, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x89, 0x08, 0x00,
+                   0x50, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x86, 0x00),
+        PHYREGS(0x08c8, 0x08c4, 0x08c0, 0x01d2, 0x01d3, 0x01d4),
+  },
+  {     .freq                   = 5620,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x32, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x89, 0x08, 0x00,
+                   0x50, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x86, 0x00),
+        PHYREGS(0x08cc, 0x08c8, 0x08c4, 0x01d2, 0x01d2, 0x01d3),
+  },
+  {     .freq                   = 5630,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x33, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x50, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x96, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x86, 0x00),
+        PHYREGS(0x08d0, 0x08cc, 0x08c8, 0x01d1, 0x01d2, 0x01d2),
+  },
+  {     .freq                   = 5640,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x34, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x51, 0x00, 0x00, 0x00, 0x70, 0x00, 0x02,
+                   0x00, 0x95, 0x00, 0x51, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x02, 0x00, 0x85, 0x00),
+        PHYREGS(0x08d4, 0x08d0, 0x08cc, 0x01d0, 0x01d1, 0x01d2),
+  },
+  {     .freq                   = 5650,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x35, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x50, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x95, 0x00, 0x50, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x85, 0x00),
+        PHYREGS(0x08d8, 0x08d4, 0x08d0, 0x01cf, 0x01d0, 0x01d1),
+  },
+  {     .freq                   = 5660,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x36, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x50, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x95, 0x00, 0x50, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x85, 0x00),
+        PHYREGS(0x08dc, 0x08d8, 0x08d4, 0x01ce, 0x01cf, 0x01d0),
+  },
+  {     .freq                   = 5670,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x37, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x84, 0x00),
+        PHYREGS(0x08e0, 0x08dc, 0x08d8, 0x01ce, 0x01ce, 0x01cf),
+  },
+  {     .freq                   = 5680,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x38, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x84, 0x00),
+        PHYREGS(0x08e4, 0x08e0, 0x08dc, 0x01cd, 0x01ce, 0x01ce),
+  },
+  {     .freq                   = 5690,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x39, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x94, 0x00),
+        PHYREGS(0x08e8, 0x08e4, 0x08e0, 0x01cc, 0x01cd, 0x01ce),
+  },
+  {     .freq                   = 5700,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x94, 0x00),
+        PHYREGS(0x08ec, 0x08e8, 0x08e4, 0x01cb, 0x01cc, 0x01cd),
+  },
+  {     .freq                   = 5710,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x94, 0x00),
+        PHYREGS(0x08f0, 0x08ec, 0x08e8, 0x01ca, 0x01cb, 0x01cc),
+  },
+  {     .freq                   = 5720,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x94, 0x00),
+        PHYREGS(0x08f4, 0x08f0, 0x08ec, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5725,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x79, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x40, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x40, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x94, 0x00),
+        PHYREGS(0x08f6, 0x08f2, 0x08ee, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5730,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x01,
+                   0x00, 0x94, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x01, 0x00, 0x94, 0x00),
+        PHYREGS(0x08f8, 0x08f4, 0x08f0, 0x01c9, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5735,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x7b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x93, 0x00),
+        PHYREGS(0x08fa, 0x08f6, 0x08f2, 0x01c8, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5740,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x93, 0x00),
+        PHYREGS(0x08fc, 0x08f8, 0x08f4, 0x01c8, 0x01c9, 0x01c9),
+  },
+  {     .freq                   = 5745,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x93, 0x00),
+        PHYREGS(0x08fe, 0x08fa, 0x08f6, 0x01c8, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5750,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x93, 0x00),
+        PHYREGS(0x0900, 0x08fc, 0x08f8, 0x01c7, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5755,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7f, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x10, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x30, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x93, 0x00),
+        PHYREGS(0x0902, 0x08fe, 0x08fa, 0x01c7, 0x01c8, 0x01c8),
+  },
+  {     .freq                   = 5760,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x40, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x86, 0x05, 0x00,
+                   0x10, 0x20, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x93, 0x00, 0x20, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x93, 0x00),
+        PHYREGS(0x0904, 0x0900, 0x08fc, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5765,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x81, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x86, 0x05, 0x00,
+                   0x10, 0x20, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x20, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0906, 0x0902, 0x08fe, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5770,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x41, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x86, 0x04, 0x00,
+                   0x10, 0x20, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x20, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0908, 0x0904, 0x0900, 0x01c6, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5775,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x83, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x86, 0x04, 0x00,
+                   0x10, 0x20, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x20, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x090a, 0x0906, 0x0902, 0x01c5, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5780,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x42, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x86, 0x04, 0x00,
+                   0x10, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x090c, 0x0908, 0x0904, 0x01c5, 0x01c6, 0x01c6),
+  },
+  {     .freq                   = 5785,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x85, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x090e, 0x090a, 0x0906, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5790,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x43, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0910, 0x090c, 0x0908, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5795,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x87, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0912, 0x090e, 0x090a, 0x01c4, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5800,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x44, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0914, 0x0910, 0x090c, 0x01c3, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5805,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x89, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0916, 0x0912, 0x090e, 0x01c3, 0x01c4, 0x01c4),
+  },
+  {     .freq                   = 5810,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x45, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0918, 0x0914, 0x0910, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5815,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x091a, 0x0916, 0x0912, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5820,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x46, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x091c, 0x0918, 0x0914, 0x01c2, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5825,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x091e, 0x091a, 0x0916, 0x01c1, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5830,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x47, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0920, 0x091c, 0x0918, 0x01c1, 0x01c2, 0x01c2),
+  },
+  {     .freq                   = 5840,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x48, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x10, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0924, 0x0920, 0x091c, 0x01c0, 0x01c1, 0x01c2),
+  },
+  {     .freq                   = 5850,
+        RADIOREGS3(0xe0, 0x00, 0x01, 0x02, 0x49, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x0928, 0x0924, 0x0920, 0x01bf, 0x01c0, 0x01c1),
+  },
+  {     .freq                   = 5860,
+        RADIOREGS3(0xde, 0x00, 0x01, 0x02, 0x4a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x92, 0x00),
+        PHYREGS(0x092c, 0x0928, 0x0924, 0x01bf, 0x01bf, 0x01c0),
+  },
+  {     .freq                   = 5870,
+        RADIOREGS3(0xdb, 0x00, 0x01, 0x02, 0x4b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x91, 0x00),
+        PHYREGS(0x0930, 0x092c, 0x0928, 0x01be, 0x01bf, 0x01bf),
+  },
+  {     .freq                   = 5880,
+        RADIOREGS3(0xd8, 0x00, 0x01, 0x02, 0x4c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x91, 0x00),
+        PHYREGS(0x0934, 0x0930, 0x092c, 0x01bd, 0x01be, 0x01bf),
+  },
+  {     .freq                   = 5890,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x91, 0x00),
+        PHYREGS(0x0938, 0x0934, 0x0930, 0x01bc, 0x01bd, 0x01be),
+  },
+  {     .freq                   = 5900,
+        RADIOREGS3(0xd3, 0x00, 0x01, 0x02, 0x4e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x91, 0x00),
+        PHYREGS(0x093c, 0x0938, 0x0934, 0x01bc, 0x01bc, 0x01bd),
+  },
+  {     .freq                   = 5910,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00,
+                   0x00, 0x91, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+                   0x00, 0x00, 0x00, 0x91, 0x00),
+        PHYREGS(0x0940, 0x093c, 0x0938, 0x01bb, 0x01bc, 0x01bc),
+  },
+  {     .freq                   = 2412,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x6c, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x04, 0x04, 0x04, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x89, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0b, 0x00, 0x89, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0b),
+        PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443),
+  },
+  {     .freq                   = 2417,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x71, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x89, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0a, 0x00, 0x89, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0a),
+        PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441),
+  },
+  {     .freq                   = 2422,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x76, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x89, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0f, 0x00, 0x0a, 0x00, 0x89, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0f, 0x00, 0x0a),
+        PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f),
+  },
+  {     .freq                   = 2427,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x7b, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x78, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x0a, 0x00, 0x78, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x0a),
+        PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d),
+  },
+  {     .freq                   = 2432,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x80, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x77, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x0a, 0x00, 0x77, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x0a),
+        PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a),
+  },
+  {     .freq                   = 2437,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x85, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x76, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x0a, 0x00, 0x76, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x0a),
+        PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438),
+  },
+  {     .freq                   = 2442,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8a, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x66, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x0a, 0x00, 0x66, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x0a),
+        PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436),
+  },
+  {     .freq                   = 2447,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8f, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x55, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x09, 0x00, 0x55, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x09),
+        PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434),
+  },
+  {     .freq                   = 2452,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x94, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x45, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0e, 0x00, 0x09, 0x00, 0x45, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0e, 0x00, 0x09),
+        PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431),
+  },
+  {     .freq                   = 2457,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x99, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x34, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x09, 0x00, 0x34, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x09),
+        PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f),
+  },
+  {     .freq                   = 2462,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x9e, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x33, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x09, 0x00, 0x33, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x09),
+        PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d),
+  },
+  {     .freq                   = 2467,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa3, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x22, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x08, 0x00, 0x22, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x08),
+        PHYREGS(0x03df, 0x03db, 0x03d7, 0x0422, 0x0427, 0x042b),
+  },
+  {     .freq                   = 2472,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa8, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x11, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x08, 0x00, 0x11, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x08),
+        PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429),
+  },
+  {     .freq                   = 2484,
+        RADIOREGS3(0xff, 0x01, 0x03, 0x09, 0xb4, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x20, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0d, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0d, 0x00, 0x08),
+        PHYREGS(0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424),
+  },
+};
+
+static const struct b43_nphy_channeltab_entry_rev3 b43_nphy_channeltab_rev8[] = {
+  {     .freq                   = 4920,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xec, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07b4, 0x07b0, 0x07ac, 0x0214, 0x0215, 0x0216),
+  },
+  {     .freq                   = 4930,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xed, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07b8, 0x07b4, 0x07b0, 0x0213, 0x0214, 0x0215),
+  },
+  {     .freq                   = 4940,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xee, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07bc, 0x07b8, 0x07b4, 0x0212, 0x0213, 0x0214),
+  },
+  {     .freq                   = 4950,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xef, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x00, 0x00, 0x00, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c0, 0x07bc, 0x07b8, 0x0211, 0x0212, 0x0213),
+  },
+  {     .freq                   = 4960,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf0, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c4, 0x07c0, 0x07bc, 0x020f, 0x0211, 0x0212),
+  },
+  {     .freq                   = 4970,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf1, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07c8, 0x07c4, 0x07c0, 0x020e, 0x020f, 0x0211),
+  },
+  {     .freq                   = 4980,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf2, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07cc, 0x07c8, 0x07c4, 0x020d, 0x020e, 0x020f),
+  },
+  {     .freq                   = 4990,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf3, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d0, 0x07cc, 0x07c8, 0x020c, 0x020d, 0x020e),
+  },
+  {     .freq                   = 5000,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf4, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d4, 0x07d0, 0x07cc, 0x020b, 0x020c, 0x020d),
+  },
+  {     .freq                   = 5010,
+        RADIOREGS3(0xff, 0x01, 0x01, 0x01, 0xf5, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07d8, 0x07d4, 0x07d0, 0x020a, 0x020b, 0x020c),
+  },
+  {     .freq                   = 5020,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf6, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07dc, 0x07d8, 0x07d4, 0x0209, 0x020a, 0x020b),
+  },
+  {     .freq                   = 5030,
+        RADIOREGS3(0xf7, 0x01, 0x01, 0x01, 0xf7, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e0, 0x07dc, 0x07d8, 0x0208, 0x0209, 0x020a),
+  },
+  {     .freq                   = 5040,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf8, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e4, 0x07e0, 0x07dc, 0x0207, 0x0208, 0x0209),
+  },
+  {     .freq                   = 5050,
+        RADIOREGS3(0xef, 0x01, 0x01, 0x01, 0xf9, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07e8, 0x07e4, 0x07e0, 0x0206, 0x0207, 0x0208),
+  },
+  {     .freq                   = 5060,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfa, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfe, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfe, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07ec, 0x07e8, 0x07e4, 0x0205, 0x0206, 0x0207),
+  },
+  {     .freq                   = 5070,
+        RADIOREGS3(0xe6, 0x01, 0x01, 0x01, 0xfb, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfd, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f0, 0x07ec, 0x07e8, 0x0204, 0x0205, 0x0206),
+  },
+  {     .freq                   = 5080,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfc, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfd, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f4, 0x07f0, 0x07ec, 0x0203, 0x0204, 0x0205),
+  },
+  {     .freq                   = 5090,
+        RADIOREGS3(0xde, 0x01, 0x01, 0x01, 0xfd, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x01, 0x01, 0x01, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x09, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfd, 0x00, 0x09, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07f8, 0x07f4, 0x07f0, 0x0202, 0x0203, 0x0204),
+  },
+  {     .freq                   = 5100,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xfe, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfd, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfd, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x07fc, 0x07f8, 0x07f4, 0x0201, 0x0202, 0x0203),
+  },
+  {     .freq                   = 5110,
+        RADIOREGS3(0xd6, 0x01, 0x01, 0x01, 0xff, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0800, 0x07fc, 0x07f8, 0x0200, 0x0201, 0x0202),
+  },
+  {     .freq                   = 5120,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x00, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0804, 0x0800, 0x07fc, 0x01ff, 0x0200, 0x0201),
+  },
+  {     .freq                   = 5130,
+        RADIOREGS3(0xce, 0x01, 0x01, 0x02, 0x01, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfc, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfc, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0808, 0x0804, 0x0800, 0x01fe, 0x01ff, 0x0200),
+  },
+  {     .freq                   = 5140,
+        RADIOREGS3(0xc6, 0x01, 0x01, 0x02, 0x02, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfb, 0x00, 0x08, 0x00, 0x77, 0x00, 0x0f,
+                   0x00, 0x6f, 0x00, 0xfb, 0x00, 0x08, 0x00, 0x77,
+                   0x00, 0x0f, 0x00, 0x6f, 0x00),
+        PHYREGS(0x080c, 0x0808, 0x0804, 0x01fd, 0x01fe, 0x01ff),
+  },
+  {     .freq                   = 5160,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x04, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x07, 0x00, 0x77, 0x00, 0x0e,
+                   0x00, 0x6f, 0x00, 0xfa, 0x00, 0x07, 0x00, 0x77,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0814, 0x0810, 0x080c, 0x01fb, 0x01fc, 0x01fd),
+  },
+  {     .freq                   = 5170,
+        RADIOREGS3(0xbe, 0x01, 0x01, 0x02, 0x05, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xfa, 0x00, 0x07, 0x00, 0x77, 0x00, 0x0e,
+                   0x00, 0x6f, 0x00, 0xfa, 0x00, 0x07, 0x00, 0x77,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0818, 0x0814, 0x0810, 0x01fa, 0x01fb, 0x01fc),
+  },
+  {     .freq                   = 5180,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x06, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xf9, 0x00, 0x06, 0x00, 0x77, 0x00, 0x0e,
+                   0x00, 0x6f, 0x00, 0xf9, 0x00, 0x06, 0x00, 0x77,
+                   0x00, 0x0e, 0x00, 0x6f, 0x00),
+        PHYREGS(0x081c, 0x0818, 0x0814, 0x01f9, 0x01fa, 0x01fb),
+  },
+  {     .freq                   = 5190,
+        RADIOREGS3(0xb6, 0x01, 0x01, 0x02, 0x07, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xf9, 0x00, 0x06, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xf9, 0x00, 0x06, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0820, 0x081c, 0x0818, 0x01f8, 0x01f9, 0x01fa),
+  },
+  {     .freq                   = 5200,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x08, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xf9, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xf9, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0824, 0x0820, 0x081c, 0x01f7, 0x01f8, 0x01f9),
+  },
+  {     .freq                   = 5210,
+        RADIOREGS3(0xaf, 0x01, 0x01, 0x02, 0x09, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8f, 0x0f, 0x00,
+                   0xff, 0xf9, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xf9, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0828, 0x0824, 0x0820, 0x01f6, 0x01f7, 0x01f8),
+  },
+  {     .freq                   = 5220,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xfe, 0xd8, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xd8, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x082c, 0x0828, 0x0824, 0x01f5, 0x01f6, 0x01f7),
+  },
+  {     .freq                   = 5230,
+        RADIOREGS3(0xa7, 0x01, 0x01, 0x02, 0x0b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xee, 0xd8, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xd8, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0830, 0x082c, 0x0828, 0x01f4, 0x01f5, 0x01f6),
+  },
+  {     .freq                   = 5240,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xee, 0xc8, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xc8, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0834, 0x0830, 0x082c, 0x01f3, 0x01f4, 0x01f5),
+  },
+  {     .freq                   = 5250,
+        RADIOREGS3(0xa0, 0x01, 0x01, 0x02, 0x0d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0f, 0x00,
+                   0xed, 0xc7, 0x00, 0x05, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xc7, 0x00, 0x05, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0838, 0x0834, 0x0830, 0x01f2, 0x01f3, 0x01f4),
+  },
+  {     .freq                   = 5260,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x02, 0x02, 0x02, 0x8e, 0x0e, 0x00,
+                   0xed, 0xc7, 0x00, 0x04, 0x00, 0x77, 0x00, 0x0d,
+                   0x00, 0x6f, 0x00, 0xc7, 0x00, 0x04, 0x00, 0x77,
+                   0x00, 0x0d, 0x00, 0x6f, 0x00),
+        PHYREGS(0x083c, 0x0838, 0x0834, 0x01f1, 0x01f2, 0x01f3),
+  },
+  {     .freq                   = 5270,
+        RADIOREGS3(0x98, 0x01, 0x01, 0x02, 0x0f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8e, 0x0e, 0x00,
+                   0xed, 0xc7, 0x00, 0x04, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xc7, 0x00, 0x04, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0840, 0x083c, 0x0838, 0x01f0, 0x01f1, 0x01f2),
+  },
+  {     .freq                   = 5280,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x10, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0844, 0x0840, 0x083c, 0x01f0, 0x01f0, 0x01f1),
+  },
+  {     .freq                   = 5290,
+        RADIOREGS3(0x91, 0x01, 0x01, 0x02, 0x11, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0848, 0x0844, 0x0840, 0x01ef, 0x01f0, 0x01f0),
+  },
+  {     .freq                   = 5300,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x12, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x084c, 0x0848, 0x0844, 0x01ee, 0x01ef, 0x01f0),
+  },
+  {     .freq                   = 5310,
+        RADIOREGS3(0x8a, 0x01, 0x01, 0x02, 0x13, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdc, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0850, 0x084c, 0x0848, 0x01ed, 0x01ee, 0x01ef),
+  },
+  {     .freq                   = 5320,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x14, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0e, 0x00,
+                   0xdb, 0xb7, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0c,
+                   0x00, 0x6f, 0x00, 0xb7, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0c, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0854, 0x0850, 0x084c, 0x01ec, 0x01ed, 0x01ee),
+  },
+  {     .freq                   = 5330,
+        RADIOREGS3(0x83, 0x01, 0x01, 0x02, 0x15, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xcb, 0xa6, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0b,
+                   0x00, 0x6f, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0858, 0x0854, 0x0850, 0x01eb, 0x01ec, 0x01ed),
+  },
+  {     .freq                   = 5340,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x16, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8d, 0x0d, 0x00,
+                   0xca, 0xa6, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0b,
+                   0x00, 0x6f, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x085c, 0x0858, 0x0854, 0x01ea, 0x01eb, 0x01ec),
+  },
+  {     .freq                   = 5350,
+        RADIOREGS3(0x7c, 0x01, 0x01, 0x02, 0x17, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0d, 0x00,
+                   0xca, 0xa6, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0b,
+                   0x00, 0x6f, 0x00, 0xa6, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0b, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0860, 0x085c, 0x0858, 0x01e9, 0x01ea, 0x01eb),
+  },
+  {     .freq                   = 5360,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x18, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0d, 0x00,
+                   0xc9, 0x95, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x95, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0864, 0x0860, 0x085c, 0x01e8, 0x01e9, 0x01ea),
+  },
+  {     .freq                   = 5370,
+        RADIOREGS3(0x75, 0x01, 0x01, 0x02, 0x19, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0d, 0x00,
+                   0xc9, 0x95, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x95, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0868, 0x0864, 0x0860, 0x01e7, 0x01e8, 0x01e9),
+  },
+  {     .freq                   = 5380,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb8, 0x95, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x95, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x086c, 0x0868, 0x0864, 0x01e6, 0x01e7, 0x01e8),
+  },
+  {     .freq                   = 5390,
+        RADIOREGS3(0x6e, 0x01, 0x01, 0x02, 0x1b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb8, 0x84, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0870, 0x086c, 0x0868, 0x01e5, 0x01e6, 0x01e7),
+  },
+  {     .freq                   = 5400,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb8, 0x84, 0x00, 0x03, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x03, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0874, 0x0870, 0x086c, 0x01e5, 0x01e5, 0x01e6),
+  },
+  {     .freq                   = 5410,
+        RADIOREGS3(0x67, 0x01, 0x01, 0x02, 0x1d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xb7, 0x84, 0x00, 0x02, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x02, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0878, 0x0874, 0x0870, 0x01e4, 0x01e5, 0x01e5),
+  },
+  {     .freq                   = 5420,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0c, 0x00,
+                   0xa7, 0x84, 0x00, 0x02, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x02, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x087c, 0x0878, 0x0874, 0x01e3, 0x01e4, 0x01e5),
+  },
+  {     .freq                   = 5430,
+        RADIOREGS3(0x61, 0x01, 0x01, 0x02, 0x1f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x03, 0x03, 0x03, 0x8c, 0x0b, 0x00,
+                   0xa6, 0x84, 0x00, 0x02, 0x00, 0x77, 0x00, 0x0a,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x02, 0x00, 0x77,
+                   0x00, 0x0a, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0880, 0x087c, 0x0878, 0x01e2, 0x01e3, 0x01e4),
+  },
+  {     .freq                   = 5440,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x20, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0xa6, 0x84, 0x00, 0x02, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x02, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0884, 0x0880, 0x087c, 0x01e1, 0x01e2, 0x01e3),
+  },
+  {     .freq                   = 5450,
+        RADIOREGS3(0x5a, 0x01, 0x01, 0x02, 0x21, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0x95, 0x84, 0x00, 0x01, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x01, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0888, 0x0884, 0x0880, 0x01e0, 0x01e1, 0x01e2),
+  },
+  {     .freq                   = 5460,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x22, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0x95, 0x84, 0x00, 0x01, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x84, 0x00, 0x01, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x088c, 0x0888, 0x0884, 0x01df, 0x01e0, 0x01e1),
+  },
+  {     .freq                   = 5470,
+        RADIOREGS3(0x53, 0x01, 0x01, 0x02, 0x23, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8b, 0x0b, 0x00,
+                   0x94, 0x73, 0x00, 0x01, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x01, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0890, 0x088c, 0x0888, 0x01de, 0x01df, 0x01e0),
+  },
+  {     .freq                   = 5480,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x24, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x84, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0894, 0x0890, 0x088c, 0x01dd, 0x01de, 0x01df),
+  },
+  {     .freq                   = 5490,
+        RADIOREGS3(0x4d, 0x01, 0x01, 0x02, 0x25, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x83, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x0898, 0x0894, 0x0890, 0x01dd, 0x01dd, 0x01de),
+  },
+  {     .freq                   = 5500,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x26, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x82, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x089c, 0x0898, 0x0894, 0x01dc, 0x01dd, 0x01dd),
+  },
+  {     .freq                   = 5510,
+        RADIOREGS3(0x47, 0x01, 0x01, 0x02, 0x27, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x82, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08a0, 0x089c, 0x0898, 0x01db, 0x01dc, 0x01dd),
+  },
+  {     .freq                   = 5520,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x28, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x0a, 0x00,
+                   0x72, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08a4, 0x08a0, 0x089c, 0x01da, 0x01db, 0x01dc),
+  },
+  {     .freq                   = 5530,
+        RADIOREGS3(0x40, 0x01, 0x01, 0x02, 0x29, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x09, 0x00,
+                   0x72, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08a8, 0x08a4, 0x08a0, 0x01d9, 0x01da, 0x01db),
+  },
+  {     .freq                   = 5540,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x8a, 0x09, 0x00,
+                   0x71, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08ac, 0x08a8, 0x08a4, 0x01d8, 0x01d9, 0x01da),
+  },
+  {     .freq                   = 5550,
+        RADIOREGS3(0x3a, 0x01, 0x01, 0x02, 0x2b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x09, 0x00,
+                   0x61, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08b0, 0x08ac, 0x08a8, 0x01d7, 0x01d8, 0x01d9),
+  },
+  {     .freq                   = 5560,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x09, 0x00,
+                   0x61, 0x73, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x73, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08b4, 0x08b0, 0x08ac, 0x01d7, 0x01d7, 0x01d8),
+  },
+  {     .freq                   = 5570,
+        RADIOREGS3(0x34, 0x01, 0x01, 0x02, 0x2d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x09, 0x00,
+                   0x61, 0x62, 0x00, 0x00, 0x00, 0x77, 0x00, 0x09,
+                   0x00, 0x6f, 0x00, 0x62, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x09, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08b8, 0x08b4, 0x08b0, 0x01d6, 0x01d7, 0x01d7),
+  },
+  {     .freq                   = 5580,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x08, 0x00,
+                   0x60, 0x62, 0x00, 0x00, 0x00, 0x77, 0x00, 0x08,
+                   0x00, 0x6f, 0x00, 0x62, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x08, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08bc, 0x08b8, 0x08b4, 0x01d5, 0x01d6, 0x01d7),
+  },
+  {     .freq                   = 5590,
+        RADIOREGS3(0x2e, 0x01, 0x01, 0x02, 0x2f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x04, 0x04, 0x04, 0x89, 0x08, 0x00,
+                   0x50, 0x61, 0x00, 0x00, 0x00, 0x77, 0x00, 0x08,
+                   0x00, 0x6f, 0x00, 0x61, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x08, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08c0, 0x08bc, 0x08b8, 0x01d4, 0x01d5, 0x01d6),
+  },
+  {     .freq                   = 5600,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x30, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x89, 0x08, 0x00,
+                   0x50, 0x51, 0x00, 0x00, 0x00, 0x77, 0x00, 0x08,
+                   0x00, 0x6f, 0x00, 0x51, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x08, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08c4, 0x08c0, 0x08bc, 0x01d3, 0x01d4, 0x01d5),
+  },
+  {     .freq                   = 5610,
+        RADIOREGS3(0x28, 0x01, 0x01, 0x02, 0x31, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x89, 0x08, 0x00,
+                   0x50, 0x51, 0x00, 0x00, 0x00, 0x77, 0x00, 0x08,
+                   0x00, 0x6f, 0x00, 0x51, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x08, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08c8, 0x08c4, 0x08c0, 0x01d2, 0x01d3, 0x01d4),
+  },
+  {     .freq                   = 5620,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x32, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x89, 0x08, 0x00,
+                   0x50, 0x50, 0x00, 0x00, 0x00, 0x77, 0x00, 0x07,
+                   0x00, 0x6f, 0x00, 0x50, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x07, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08cc, 0x08c8, 0x08c4, 0x01d2, 0x01d2, 0x01d3),
+  },
+  {     .freq                   = 5630,
+        RADIOREGS3(0x21, 0x01, 0x01, 0x02, 0x33, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x50, 0x50, 0x00, 0x00, 0x00, 0x77, 0x00, 0x07,
+                   0x00, 0x6f, 0x00, 0x50, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x07, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08d0, 0x08cc, 0x08c8, 0x01d1, 0x01d2, 0x01d2),
+  },
+  {     .freq                   = 5640,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x34, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x50, 0x00, 0x00, 0x00, 0x77, 0x00, 0x07,
+                   0x00, 0x6f, 0x00, 0x50, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x07, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08d4, 0x08d0, 0x08cc, 0x01d0, 0x01d1, 0x01d2),
+  },
+  {     .freq                   = 5650,
+        RADIOREGS3(0x1c, 0x01, 0x01, 0x02, 0x35, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x40, 0x00, 0x00, 0x00, 0x77, 0x00, 0x07,
+                   0x00, 0x6f, 0x00, 0x40, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x07, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08d8, 0x08d4, 0x08d0, 0x01cf, 0x01d0, 0x01d1),
+  },
+  {     .freq                   = 5660,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x36, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x40, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6f, 0x00, 0x40, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08dc, 0x08d8, 0x08d4, 0x01ce, 0x01cf, 0x01d0),
+  },
+  {     .freq                   = 5670,
+        RADIOREGS3(0x16, 0x01, 0x01, 0x02, 0x37, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x88, 0x07, 0x00,
+                   0x40, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6f, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08e0, 0x08dc, 0x08d8, 0x01ce, 0x01ce, 0x01cf),
+  },
+  {     .freq                   = 5680,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x38, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6f, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08e4, 0x08e0, 0x08dc, 0x01cd, 0x01ce, 0x01ce),
+  },
+  {     .freq                   = 5690,
+        RADIOREGS3(0x10, 0x01, 0x01, 0x02, 0x39, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6f, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6f, 0x00),
+        PHYREGS(0x08e8, 0x08e4, 0x08e0, 0x01cc, 0x01cd, 0x01ce),
+  },
+  {     .freq                   = 5700,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08ec, 0x08e8, 0x08e4, 0x01cb, 0x01cc, 0x01cd),
+  },
+  {     .freq                   = 5710,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08f0, 0x08ec, 0x08e8, 0x01ca, 0x01cb, 0x01cc),
+  },
+  {     .freq                   = 5720,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08f4, 0x08f0, 0x08ec, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5725,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x79, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x06, 0x00,
+                   0x30, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08f6, 0x08f2, 0x08ee, 0x01c9, 0x01ca, 0x01cb),
+  },
+  {     .freq                   = 5730,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6e, 0x00),
+        PHYREGS(0x08f8, 0x08f4, 0x08f0, 0x01c9, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5735,
+        RADIOREGS3(0x03, 0x01, 0x02, 0x04, 0x7b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6d, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6d, 0x00),
+        PHYREGS(0x08fa, 0x08f6, 0x08f2, 0x01c8, 0x01c9, 0x01ca),
+  },
+  {     .freq                   = 5740,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6d, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6d, 0x00),
+        PHYREGS(0x08fc, 0x08f8, 0x08f4, 0x01c8, 0x01c9, 0x01c9),
+  },
+  {     .freq                   = 5745,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x30, 0x00, 0x00, 0x00, 0x77, 0x00, 0x06,
+                   0x00, 0x6d, 0x00, 0x30, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x06, 0x00, 0x6d, 0x00),
+        PHYREGS(0x08fe, 0x08fa, 0x08f6, 0x01c8, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5750,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x3f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x20, 0x20, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6d, 0x00, 0x20, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6d, 0x00),
+        PHYREGS(0x0900, 0x08fc, 0x08f8, 0x01c7, 0x01c8, 0x01c9),
+  },
+  {     .freq                   = 5755,
+        RADIOREGS3(0xfe, 0x00, 0x02, 0x04, 0x7f, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x87, 0x05, 0x00,
+                   0x10, 0x20, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6c, 0x00, 0x20, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0902, 0x08fe, 0x08fa, 0x01c7, 0x01c8, 0x01c8),
+  },
+  {     .freq                   = 5760,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x40, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x86, 0x05, 0x00,
+                   0x10, 0x20, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6c, 0x00, 0x20, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0904, 0x0900, 0x08fc, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5765,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x81, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x86, 0x05, 0x00,
+                   0x10, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6c, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6c, 0x00),
+        PHYREGS(0x0906, 0x0902, 0x08fe, 0x01c6, 0x01c7, 0x01c8),
+  },
+  {     .freq                   = 5770,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x41, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x86, 0x04, 0x00,
+                   0x10, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0908, 0x0904, 0x0900, 0x01c6, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5775,
+        RADIOREGS3(0xf8, 0x00, 0x02, 0x04, 0x83, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x05, 0x05, 0x05, 0x86, 0x04, 0x00,
+                   0x10, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x090a, 0x0906, 0x0902, 0x01c5, 0x01c6, 0x01c7),
+  },
+  {     .freq                   = 5780,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x42, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x05, 0x05, 0x05, 0x86, 0x04, 0x00,
+                   0x10, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x090c, 0x0908, 0x0904, 0x01c5, 0x01c6, 0x01c6),
+  },
+  {     .freq                   = 5785,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x85, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x090e, 0x090a, 0x0906, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5790,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x43, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x10, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x10, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0910, 0x090c, 0x0908, 0x01c4, 0x01c5, 0x01c6),
+  },
+  {     .freq                   = 5795,
+        RADIOREGS3(0xf2, 0x00, 0x02, 0x04, 0x87, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0912, 0x090e, 0x090a, 0x01c4, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5800,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x44, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6b, 0x00),
+        PHYREGS(0x0914, 0x0910, 0x090c, 0x01c3, 0x01c4, 0x01c5),
+  },
+  {     .freq                   = 5805,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x89, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6a, 0x00),
+        PHYREGS(0x0916, 0x0912, 0x090e, 0x01c3, 0x01c4, 0x01c4),
+  },
+  {     .freq                   = 5810,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x45, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6a, 0x00),
+        PHYREGS(0x0918, 0x0914, 0x0910, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5815,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8b, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6a, 0x00),
+        PHYREGS(0x091a, 0x0916, 0x0912, 0x01c2, 0x01c3, 0x01c4),
+  },
+  {     .freq                   = 5820,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x46, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x6a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x6a, 0x00),
+        PHYREGS(0x091c, 0x0918, 0x0914, 0x01c2, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5825,
+        RADIOREGS3(0xed, 0x00, 0x02, 0x04, 0x8d, 0x07, 0x07, 0x04,
+                   0x10, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x69, 0x00),
+        PHYREGS(0x091e, 0x091a, 0x0916, 0x01c1, 0x01c2, 0x01c3),
+  },
+  {     .freq                   = 5830,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x47, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x05,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x05, 0x00, 0x69, 0x00),
+        PHYREGS(0x0920, 0x091c, 0x0918, 0x01c1, 0x01c2, 0x01c2),
+  },
+  {     .freq                   = 5840,
+        RADIOREGS3(0x0a, 0x01, 0x01, 0x02, 0x48, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x86, 0x04, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x69, 0x00),
+        PHYREGS(0x0924, 0x0920, 0x091c, 0x01c0, 0x01c1, 0x01c2),
+  },
+  {     .freq                   = 5850,
+        RADIOREGS3(0xe0, 0x00, 0x01, 0x02, 0x49, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x69, 0x00),
+        PHYREGS(0x0928, 0x0924, 0x0920, 0x01bf, 0x01c0, 0x01c1),
+  },
+  {     .freq                   = 5860,
+        RADIOREGS3(0xde, 0x00, 0x01, 0x02, 0x4a, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x69, 0x00),
+        PHYREGS(0x092c, 0x0928, 0x0924, 0x01bf, 0x01bf, 0x01c0),
+  },
+  {     .freq                   = 5870,
+        RADIOREGS3(0xdb, 0x00, 0x01, 0x02, 0x4b, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0930, 0x092c, 0x0928, 0x01be, 0x01bf, 0x01bf),
+  },
+  {     .freq                   = 5880,
+        RADIOREGS3(0xd8, 0x00, 0x01, 0x02, 0x4c, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0934, 0x0930, 0x092c, 0x01bd, 0x01be, 0x01bf),
+  },
+  {     .freq                   = 5890,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4d, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0938, 0x0934, 0x0930, 0x01bc, 0x01bd, 0x01be),
+  },
+  {     .freq                   = 5900,
+        RADIOREGS3(0xd3, 0x00, 0x01, 0x02, 0x4e, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x093c, 0x0938, 0x0934, 0x01bc, 0x01bc, 0x01bd),
+  },
+  {     .freq                   = 5910,
+        RADIOREGS3(0xd6, 0x00, 0x01, 0x02, 0x4f, 0x05, 0x05, 0x04,
+                   0x0c, 0x01, 0x06, 0x06, 0x06, 0x85, 0x03, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x00, 0x77, 0x00, 0x04,
+                   0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x77,
+                   0x00, 0x04, 0x00, 0x68, 0x00),
+        PHYREGS(0x0940, 0x093c, 0x0938, 0x01bb, 0x01bc, 0x01bc),
+  },
+  {     .freq                   = 2412,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x6c, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x04, 0x04, 0x04, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x78, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0b, 0x00, 0x0a, 0x00, 0x89, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0b, 0x00, 0x0a),
+        PHYREGS(0x03c9, 0x03c5, 0x03c1, 0x043a, 0x043f, 0x0443),
+  },
+  {     .freq                   = 2417,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x71, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x78, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0b, 0x00, 0x0a, 0x00, 0x89, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0b, 0x00, 0x0a),
+        PHYREGS(0x03cb, 0x03c7, 0x03c3, 0x0438, 0x043d, 0x0441),
+  },
+  {     .freq                   = 2422,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x76, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x67, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0b, 0x00, 0x0a, 0x00, 0x89, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0b, 0x00, 0x0a),
+        PHYREGS(0x03cd, 0x03c9, 0x03c5, 0x0436, 0x043a, 0x043f),
+  },
+  {     .freq                   = 2427,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x7b, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x57, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x0a, 0x00, 0x78, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x0a),
+        PHYREGS(0x03cf, 0x03cb, 0x03c7, 0x0434, 0x0438, 0x043d),
+  },
+  {     .freq                   = 2432,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x80, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x56, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x0a, 0x00, 0x77, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x0a),
+        PHYREGS(0x03d1, 0x03cd, 0x03c9, 0x0431, 0x0436, 0x043a),
+  },
+  {     .freq                   = 2437,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x85, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x46, 0x00, 0x03, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x0a, 0x00, 0x76, 0x00, 0x03, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x0a),
+        PHYREGS(0x03d3, 0x03cf, 0x03cb, 0x042f, 0x0434, 0x0438),
+  },
+  {     .freq                   = 2442,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8a, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x05, 0x05, 0x05, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x45, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x0a, 0x00, 0x66, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x0a),
+        PHYREGS(0x03d5, 0x03d1, 0x03cd, 0x042d, 0x0431, 0x0436),
+  },
+  {     .freq                   = 2447,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x8f, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x34, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x09, 0x00, 0x55, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x09),
+        PHYREGS(0x03d7, 0x03d3, 0x03cf, 0x042b, 0x042f, 0x0434),
+  },
+  {     .freq                   = 2452,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x94, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x23, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x09, 0x00, 0x45, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x09),
+        PHYREGS(0x03d9, 0x03d5, 0x03d1, 0x0429, 0x042d, 0x0431),
+  },
+  {     .freq                   = 2457,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x99, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x12, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x0a, 0x00, 0x09, 0x00, 0x34, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x0a, 0x00, 0x09),
+        PHYREGS(0x03db, 0x03d7, 0x03d3, 0x0427, 0x042b, 0x042f),
+  },
+  {     .freq                   = 2462,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0x9e, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x09, 0x00, 0x09, 0x00, 0x33, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x09, 0x00, 0x09),
+        PHYREGS(0x03dd, 0x03d9, 0x03d5, 0x0424, 0x0429, 0x042d),
+  },
+  {     .freq                   = 2467,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa3, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x06, 0x06, 0x06, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x09, 0x00, 0x09, 0x00, 0x22, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x09, 0x00, 0x09),
+        PHYREGS(0x03df, 0x03db, 0x03d7, 0x0422, 0x0427, 0x042b),
+  },
+  {     .freq                   = 2472,
+        RADIOREGS3(0x00, 0x01, 0x03, 0x09, 0xa8, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x30, 0x00,
+                   0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x09, 0x00, 0x09, 0x00, 0x11, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x09, 0x00, 0x09),
+        PHYREGS(0x03e1, 0x03dd, 0x03d9, 0x0420, 0x0424, 0x0429),
+  },
+  {     .freq                   = 2484,
+        RADIOREGS3(0xff, 0x01, 0x03, 0x09, 0xb4, 0x08, 0x08, 0x04,
+                   0x16, 0x01, 0x07, 0x07, 0x07, 0x8f, 0x20, 0x00,
+                   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x70, 0x00,
+                   0x09, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00,
+                   0x70, 0x00, 0x09, 0x00, 0x09),
+        PHYREGS(0x03e6, 0x03e2, 0x03de, 0x041b, 0x041f, 0x0424),
+  },
 };
 
 /* TODO: add support for rev4+ devices by searching in rev4+ tables */
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index 78016ae21c5..86bc0a0f735 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -28,23 +28,8 @@
 /* Returns TRUE, if the radio is enabled in hardware. */
 bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
 {
-        if (dev->phy.rev >= 3 || dev->phy.type == B43_PHYTYPE_LP) {
-                if (!(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
-                      & B43_MMIO_RADIO_HWENABLED_HI_MASK))
-                        return 1;
-        } else {
-                /* To prevent CPU fault on PPC, do not read a register
-                 * unless the interface is started; however, on resume
-                 * for hibernation, this routine is entered early. When
-                 * that happens, unconditionally return TRUE.
-                 */
-                if (b43_status(dev) < B43_STAT_STARTED)
-                        return 1;
-                if (b43_read16(dev, B43_MMIO_RADIO_HWENABLED_LO)
-                    & B43_MMIO_RADIO_HWENABLED_LO_MASK)
-                        return 1;
-        }
-        return 0;
+        return !(b43_read32(dev, B43_MMIO_RADIO_HWENABLED_HI)
+                & B43_MMIO_RADIO_HWENABLED_HI_MASK);
 }
 
 /* The poll callback for the hardware button. */
diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c
index 9a55338d957..09e2dfd7b17 100644
--- a/drivers/net/wireless/b43/sdio.c
+++ b/drivers/net/wireless/b43/sdio.c
@@ -163,6 +163,7 @@ static int b43_sdio_probe(struct sdio_func *func,
 err_free_ssb:
         kfree(sdio);
 err_disable_func:
+        sdio_claim_host(func);
         sdio_disable_func(func);
 err_release_host:
         sdio_release_host(func);
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 67f18ecdb3b..1f11e1670bf 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -181,52 +181,75 @@ static int b43legacy_ratelimit(struct b43legacy_wl *wl)
 
 void b43legacyinfo(struct b43legacy_wl *wl, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
 
         if (!b43legacy_ratelimit(wl))
                 return;
+
         va_start(args, fmt);
-        printk(KERN_INFO "b43legacy-%s: ",
-               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-        vprintk(fmt, args);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        printk(KERN_INFO "b43legacy-%s: %pV",
+               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
         va_end(args);
 }
 
 void b43legacyerr(struct b43legacy_wl *wl, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
 
         if (!b43legacy_ratelimit(wl))
                 return;
+
         va_start(args, fmt);
-        printk(KERN_ERR "b43legacy-%s ERROR: ",
-               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-        vprintk(fmt, args);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        printk(KERN_ERR "b43legacy-%s ERROR: %pV",
+               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
         va_end(args);
 }
 
 void b43legacywarn(struct b43legacy_wl *wl, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
 
         if (!b43legacy_ratelimit(wl))
                 return;
+
         va_start(args, fmt);
-        printk(KERN_WARNING "b43legacy-%s warning: ",
-               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-        vprintk(fmt, args);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        printk(KERN_WARNING "b43legacy-%s warning: %pV",
+               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
         va_end(args);
 }
 
 #if B43legacy_DEBUG
 void b43legacydbg(struct b43legacy_wl *wl, const char *fmt, ...)
 {
+        struct va_format vaf;
         va_list args;
 
         va_start(args, fmt);
-        printk(KERN_DEBUG "b43legacy-%s debug: ",
-               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan");
-        vprintk(fmt, args);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        printk(KERN_DEBUG "b43legacy-%s debug: %pV",
+               (wl && wl->hw) ? wiphy_name(wl->hw->wiphy) : "wlan", &vaf);
+
         va_end(args);
 }
 #endif /* DEBUG */
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 01aa2468bd6..93380f97835 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -7,6 +7,10 @@ iwlcore-$(CONFIG_IWL4965) += iwl-legacy.o
 iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlcore-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
 
+# If 3945 is selected only, iwl-legacy.o will be added
+# to iwlcore-m above, but it needs to be built in.
+iwlcore-objs += $(iwlcore-m)
+
 CFLAGS_iwl-devtrace.o := -I$(src)
 
 # AGN
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index 068f1e1e329..3100a72b9b4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
@@ -278,7 +278,6 @@ struct iwl_cfg iwl1000_bgn_cfg = {
         .fw_name_pre = IWL1000_FW_PRE,
         .ucode_api_max = IWL1000_UCODE_API_MAX,
         .ucode_api_min = IWL1000_UCODE_API_MIN,
-        .sku = IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
@@ -287,6 +286,7 @@ struct iwl_cfg iwl1000_bgn_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl1000_base_params,
         .ht_params = &iwl1000_ht_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl1000_bg_cfg = {
@@ -294,7 +294,6 @@ struct iwl_cfg iwl1000_bg_cfg = {
         .fw_name_pre = IWL1000_FW_PRE,
         .ucode_api_max = IWL1000_UCODE_API_MAX,
         .ucode_api_min = IWL1000_UCODE_API_MIN,
-        .sku = IWL_SKU_G,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
@@ -302,6 +301,7 @@ struct iwl_cfg iwl1000_bg_cfg = {
         .ops = &iwl1000_ops,
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl1000_base_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl100_bgn_cfg = {
@@ -309,7 +309,6 @@ struct iwl_cfg iwl100_bgn_cfg = {
         .fw_name_pre = IWL100_FW_PRE,
         .ucode_api_max = IWL100_UCODE_API_MAX,
         .ucode_api_min = IWL100_UCODE_API_MIN,
-        .sku = IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_A,
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
@@ -318,6 +317,7 @@ struct iwl_cfg iwl100_bgn_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl1000_base_params,
         .ht_params = &iwl1000_ht_params,
+        .led_mode = IWL_LED_RF_STATE,
 };
 
 struct iwl_cfg iwl100_bg_cfg = {
@@ -325,7 +325,6 @@ struct iwl_cfg iwl100_bg_cfg = {
         .fw_name_pre = IWL100_FW_PRE,
         .ucode_api_max = IWL100_UCODE_API_MAX,
         .ucode_api_min = IWL100_UCODE_API_MIN,
-        .sku = IWL_SKU_G,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_A,
         .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
@@ -333,6 +332,7 @@ struct iwl_cfg iwl100_bg_cfg = {
         .ops = &iwl1000_ops,
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl1000_base_params,
+        .led_mode = IWL_LED_RF_STATE,
 };
 
 MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index ebac04b7887..d39f449a9bb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -116,7 +116,7 @@ void iwl3945_disable_events(struct iwl_priv *priv)
         u32 base;               /* SRAM address of event log header */
         u32 disable_ptr;        /* SRAM address of event-disable bitmap array */
         u32 array_size;         /* # of u32 entries in array */
-        u32 evt_disable[IWL_EVT_DISABLE_SIZE] = {
+        static const u32 evt_disable[IWL_EVT_DISABLE_SIZE] = {
                 0x00000000,     /*   31 -    0  Event id numbers */
                 0x00000000,     /*   63 -   32 */
                 0x00000000,     /*   95 -   64 */
@@ -297,7 +297,7 @@ static void iwl3945_tx_queue_reclaim(struct iwl_priv *priv,
         if (iwl_queue_space(q) > q->low_mark && (txq_id >= 0) &&
                         (txq_id != IWL39_CMD_QUEUE_NUM) &&
                         priv->mac80211_registered)
-                iwl_wake_queue(priv, txq_id);
+                iwl_wake_queue(priv, txq);
 }
 
 /**
@@ -2788,6 +2788,7 @@ static struct iwl_cfg iwl3945_bg_cfg = {
         .ops = &iwl3945_ops,
         .mod_params = &iwl3945_mod_params,
         .base_params = &iwl3945_base_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 static struct iwl_cfg iwl3945_abg_cfg = {
@@ -2800,6 +2801,7 @@ static struct iwl_cfg iwl3945_abg_cfg = {
         .ops = &iwl3945_ops,
         .mod_params = &iwl3945_mod_params,
         .base_params = &iwl3945_base_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 DEFINE_PCI_DEVICE_TABLE(iwl3945_hw_card_ids) = {
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 4748d067eb1..6788ceb3768 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2238,12 +2238,8 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
 
                         if (priv->mac80211_registered &&
                             (iwl_queue_space(&txq->q) > txq->q.low_mark) &&
-                            (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) {
-                                if (agg->state == IWL_AGG_OFF)
-                                        iwl_wake_queue(priv, txq_id);
-                                else
-                                        iwl_wake_queue(priv, txq->swq_id);
-                        }
+                            (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))
+                                iwl_wake_queue(priv, txq);
                 }
         } else {
                 info->status.rates[0].count = tx_resp->failure_frame + 1;
@@ -2267,7 +2263,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv,
 
                 if (priv->mac80211_registered &&
                     (iwl_queue_space(&txq->q) > txq->q.low_mark))
-                        iwl_wake_queue(priv, txq_id);
+                        iwl_wake_queue(priv, txq);
         }
         if (qc && likely(sta_id != IWL_INVALID_STATION))
                 iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
@@ -2620,6 +2616,7 @@ static struct iwl_base_params iwl4965_base_params = {
         .ucode_tracing = true,
         .sensitivity_calib_by_driver = true,
         .chain_noise_calib_by_driver = true,
+        .no_agg_framecnt_info = true,
 };
 
 struct iwl_cfg iwl4965_agn_cfg = {
@@ -2627,7 +2624,6 @@ struct iwl_cfg iwl4965_agn_cfg = {
         .fw_name_pre = IWL4965_FW_PRE,
         .ucode_api_max = IWL4965_UCODE_API_MAX,
         .ucode_api_min = IWL4965_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_ABC,
         .eeprom_ver = EEPROM_4965_EEPROM_VERSION,
@@ -2635,6 +2631,7 @@ struct iwl_cfg iwl4965_agn_cfg = {
         .ops = &iwl4965_ops,
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl4965_base_params,
+        .led_mode = IWL_LED_BLINK,
         /*
          * Force use of chains B and C for scan RX on 5 GHz band
          * because the device has off-channel reception on chain A.
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index ad43f0fdf91..3ee0f7c035c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -527,7 +527,6 @@ struct iwl_cfg iwl5300_agn_cfg = {
         .fw_name_pre = IWL5000_FW_PRE,
         .ucode_api_max = IWL5000_UCODE_API_MAX,
         .ucode_api_min = IWL5000_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_ABC,
         .valid_rx_ant = ANT_ABC,
         .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
@@ -536,6 +535,7 @@ struct iwl_cfg iwl5300_agn_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl5000_base_params,
         .ht_params = &iwl5000_ht_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl5100_bgn_cfg = {
@@ -543,7 +543,6 @@ struct iwl_cfg iwl5100_bgn_cfg = {
         .fw_name_pre = IWL5000_FW_PRE,
         .ucode_api_max = IWL5000_UCODE_API_MAX,
         .ucode_api_min = IWL5000_UCODE_API_MIN,
-        .sku = IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_B,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
@@ -552,6 +551,7 @@ struct iwl_cfg iwl5100_bgn_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl5000_base_params,
         .ht_params = &iwl5000_ht_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl5100_abg_cfg = {
@@ -559,7 +559,6 @@ struct iwl_cfg iwl5100_abg_cfg = {
         .fw_name_pre = IWL5000_FW_PRE,
         .ucode_api_max = IWL5000_UCODE_API_MAX,
         .ucode_api_min = IWL5000_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G,
         .valid_tx_ant = ANT_B,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
@@ -567,6 +566,7 @@ struct iwl_cfg iwl5100_abg_cfg = {
         .ops = &iwl5000_ops,
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl5000_base_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl5100_agn_cfg = {
@@ -574,7 +574,6 @@ struct iwl_cfg iwl5100_agn_cfg = {
         .fw_name_pre = IWL5000_FW_PRE,
         .ucode_api_max = IWL5000_UCODE_API_MAX,
         .ucode_api_min = IWL5000_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_B,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
@@ -583,6 +582,7 @@ struct iwl_cfg iwl5100_agn_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl5000_base_params,
         .ht_params = &iwl5000_ht_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl5350_agn_cfg = {
@@ -590,7 +590,6 @@ struct iwl_cfg iwl5350_agn_cfg = {
         .fw_name_pre = IWL5000_FW_PRE,
         .ucode_api_max = IWL5000_UCODE_API_MAX,
         .ucode_api_min = IWL5000_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_ABC,
         .valid_rx_ant = ANT_ABC,
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
@@ -599,6 +598,7 @@ struct iwl_cfg iwl5350_agn_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl5000_base_params,
         .ht_params = &iwl5000_ht_params,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl5150_agn_cfg = {
@@ -606,7 +606,6 @@ struct iwl_cfg iwl5150_agn_cfg = {
         .fw_name_pre = IWL5150_FW_PRE,
         .ucode_api_max = IWL5150_UCODE_API_MAX,
         .ucode_api_min = IWL5150_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
@@ -616,6 +615,7 @@ struct iwl_cfg iwl5150_agn_cfg = {
         .base_params = &iwl5000_base_params,
         .ht_params = &iwl5000_ht_params,
         .need_dc_calib = true,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl5150_abg_cfg = {
@@ -623,7 +623,6 @@ struct iwl_cfg iwl5150_abg_cfg = {
         .fw_name_pre = IWL5150_FW_PRE,
         .ucode_api_max = IWL5150_UCODE_API_MAX,
         .ucode_api_min = IWL5150_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_5050_EEPROM_VERSION,
@@ -632,6 +631,7 @@ struct iwl_cfg iwl5150_abg_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl5000_base_params,
         .need_dc_calib = true,
+        .led_mode = IWL_LED_BLINK,
 };
 
 MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index c7ff1bdf42c..93e3fe92f38 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -546,8 +546,10 @@ static struct iwl_bt_params iwl6000_bt_params = {
         .bt_statistics = true,
         /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
         .advanced_bt_coexist = true,
+        .agg_time_limit = BT_AGG_THRESHOLD_DEF,
         .bt_init_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_NONE,
         .bt_prio_boost = IWLAGN_BT_PRIO_BOOST_DEFAULT,
+        .bt_sco_disable = true,
 };
 
 struct iwl_cfg iwl6000g2a_2agn_cfg = {
@@ -555,7 +557,6 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = {
         .fw_name_pre = IWL6000G2A_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -566,6 +567,7 @@ struct iwl_cfg iwl6000g2a_2agn_cfg = {
         .ht_params = &iwl6000_ht_params,
         .need_dc_calib = true,
         .need_temp_offset_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
 };
 
 struct iwl_cfg iwl6000g2a_2abg_cfg = {
@@ -573,7 +575,6 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = {
         .fw_name_pre = IWL6000G2A_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -583,6 +584,7 @@ struct iwl_cfg iwl6000g2a_2abg_cfg = {
         .base_params = &iwl6000_base_params,
         .need_dc_calib = true,
         .need_temp_offset_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
 };
 
 struct iwl_cfg iwl6000g2a_2bg_cfg = {
@@ -590,7 +592,6 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = {
         .fw_name_pre = IWL6000G2A_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_G,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -600,6 +601,7 @@ struct iwl_cfg iwl6000g2a_2bg_cfg = {
         .base_params = &iwl6000_base_params,
         .need_dc_calib = true,
         .need_temp_offset_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
 };
 
 struct iwl_cfg iwl6000g2b_2agn_cfg = {
@@ -607,7 +609,6 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = {
         .fw_name_pre = IWL6000G2B_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -619,6 +620,8 @@ struct iwl_cfg iwl6000g2b_2agn_cfg = {
         .ht_params = &iwl6000_ht_params,
         .need_dc_calib = true,
         .need_temp_offset_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
+        .adv_pm = true,
         /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
         .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 };
@@ -628,7 +631,6 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = {
         .fw_name_pre = IWL6000G2B_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -639,6 +641,8 @@ struct iwl_cfg iwl6000g2b_2abg_cfg = {
         .bt_params = &iwl6000_bt_params,
         .need_dc_calib = true,
         .need_temp_offset_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
+        .adv_pm = true,
         /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
         .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 };
@@ -648,7 +652,6 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = {
         .fw_name_pre = IWL6000G2B_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -660,6 +663,8 @@ struct iwl_cfg iwl6000g2b_2bgn_cfg = {
         .ht_params = &iwl6000_ht_params,
         .need_dc_calib = true,
         .need_temp_offset_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
+        .adv_pm = true,
         /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
         .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 };
@@ -669,7 +674,6 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = {
         .fw_name_pre = IWL6000G2B_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_G,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -680,6 +684,8 @@ struct iwl_cfg iwl6000g2b_2bg_cfg = {
         .bt_params = &iwl6000_bt_params,
         .need_dc_calib = true,
         .need_temp_offset_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
+        .adv_pm = true,
         /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
         .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 };
@@ -689,7 +695,6 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = {
         .fw_name_pre = IWL6000G2B_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -701,6 +706,8 @@ struct iwl_cfg iwl6000g2b_bgn_cfg = {
         .ht_params = &iwl6000_ht_params,
         .need_dc_calib = true,
         .need_temp_offset_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
+        .adv_pm = true,
         /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
         .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 };
@@ -710,7 +717,6 @@ struct iwl_cfg iwl6000g2b_bg_cfg = {
         .fw_name_pre = IWL6000G2B_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_G,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -721,6 +727,8 @@ struct iwl_cfg iwl6000g2b_bg_cfg = {
         .bt_params = &iwl6000_bt_params,
         .need_dc_calib = true,
         .need_temp_offset_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
+        .adv_pm = true,
         /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
         .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 };
@@ -733,7 +741,6 @@ struct iwl_cfg iwl6000i_2agn_cfg = {
         .fw_name_pre = IWL6000_FW_PRE,
         .ucode_api_max = IWL6000_UCODE_API_MAX,
         .ucode_api_min = IWL6000_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_BC,
         .valid_rx_ant = ANT_BC,
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
@@ -743,6 +750,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = {
         .base_params = &iwl6000_base_params,
         .ht_params = &iwl6000_ht_params,
         .pa_type = IWL_PA_INTERNAL,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl6000i_2abg_cfg = {
@@ -750,7 +758,6 @@ struct iwl_cfg iwl6000i_2abg_cfg = {
         .fw_name_pre = IWL6000_FW_PRE,
         .ucode_api_max = IWL6000_UCODE_API_MAX,
         .ucode_api_min = IWL6000_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G,
         .valid_tx_ant = ANT_BC,
         .valid_rx_ant = ANT_BC,
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
@@ -759,6 +766,7 @@ struct iwl_cfg iwl6000i_2abg_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl6000_base_params,
         .pa_type = IWL_PA_INTERNAL,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl6000i_2bg_cfg = {
@@ -766,7 +774,6 @@ struct iwl_cfg iwl6000i_2bg_cfg = {
         .fw_name_pre = IWL6000_FW_PRE,
         .ucode_api_max = IWL6000_UCODE_API_MAX,
         .ucode_api_min = IWL6000_UCODE_API_MIN,
-        .sku = IWL_SKU_G,
         .valid_tx_ant = ANT_BC,
         .valid_rx_ant = ANT_BC,
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
@@ -775,6 +782,7 @@ struct iwl_cfg iwl6000i_2bg_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl6000_base_params,
         .pa_type = IWL_PA_INTERNAL,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl6050_2agn_cfg = {
@@ -782,7 +790,6 @@ struct iwl_cfg iwl6050_2agn_cfg = {
         .fw_name_pre = IWL6050_FW_PRE,
         .ucode_api_max = IWL6050_UCODE_API_MAX,
         .ucode_api_min = IWL6050_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_AB,
         .ops = &iwl6050_ops,
@@ -792,6 +799,7 @@ struct iwl_cfg iwl6050_2agn_cfg = {
         .base_params = &iwl6050_base_params,
         .ht_params = &iwl6000_ht_params,
         .need_dc_calib = true,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl6050g2_bgn_cfg = {
@@ -799,7 +807,6 @@ struct iwl_cfg iwl6050g2_bgn_cfg = {
         .fw_name_pre = IWL6050_FW_PRE,
         .ucode_api_max = IWL6050_UCODE_API_MAX,
         .ucode_api_min = IWL6050_UCODE_API_MIN,
-        .sku = IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6050G2_EEPROM_VERSION,
@@ -809,6 +816,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = {
         .base_params = &iwl6050_base_params,
         .ht_params = &iwl6000_ht_params,
         .need_dc_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
 };
 
 struct iwl_cfg iwl6050_2abg_cfg = {
@@ -816,7 +824,6 @@ struct iwl_cfg iwl6050_2abg_cfg = {
         .fw_name_pre = IWL6050_FW_PRE,
         .ucode_api_max = IWL6050_UCODE_API_MAX,
         .ucode_api_min = IWL6050_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G,
         .valid_tx_ant = ANT_AB,
         .valid_rx_ant = ANT_AB,
         .eeprom_ver = EEPROM_6050_EEPROM_VERSION,
@@ -825,6 +832,7 @@ struct iwl_cfg iwl6050_2abg_cfg = {
         .mod_params = &iwlagn_mod_params,
         .base_params = &iwl6050_base_params,
         .need_dc_calib = true,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl6000_3agn_cfg = {
@@ -832,7 +840,6 @@ struct iwl_cfg iwl6000_3agn_cfg = {
         .fw_name_pre = IWL6000_FW_PRE,
         .ucode_api_max = IWL6000_UCODE_API_MAX,
         .ucode_api_min = IWL6000_UCODE_API_MIN,
-        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_ABC,
         .valid_rx_ant = ANT_ABC,
         .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
@@ -842,6 +849,7 @@ struct iwl_cfg iwl6000_3agn_cfg = {
         .base_params = &iwl6000_base_params,
         .ht_params = &iwl6000_ht_params,
         .need_dc_calib = true,
+        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl130_bgn_cfg = {
@@ -849,7 +857,6 @@ struct iwl_cfg iwl130_bgn_cfg = {
         .fw_name_pre = IWL6000G2B_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_G|IWL_SKU_N,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_A,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -860,6 +867,8 @@ struct iwl_cfg iwl130_bgn_cfg = {
         .bt_params = &iwl6000_bt_params,
         .ht_params = &iwl6000_ht_params,
         .need_dc_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
+        .adv_pm = true,
         /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
         .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 };
@@ -869,7 +878,6 @@ struct iwl_cfg iwl130_bg_cfg = {
         .fw_name_pre = IWL6000G2B_FW_PRE,
         .ucode_api_max = IWL6000G2_UCODE_API_MAX,
         .ucode_api_min = IWL6000G2_UCODE_API_MIN,
-        .sku = IWL_SKU_G,
         .valid_tx_ant = ANT_A,
         .valid_rx_ant = ANT_A,
         .eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
@@ -879,6 +887,8 @@ struct iwl_cfg iwl130_bg_cfg = {
         .base_params = &iwl6000_coex_base_params,
         .bt_params = &iwl6000_bt_params,
         .need_dc_calib = true,
+        .led_mode = IWL_LED_RF_STATE,
+        .adv_pm = true,
         /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
         .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
 };
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
index a650baba080..8a4d3acb9b7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
@@ -248,6 +248,27 @@ err:
 
 }
 
+int iwl_eeprom_check_sku(struct iwl_priv *priv)
+{
+        u16 eeprom_sku;
+
+        eeprom_sku = iwl_eeprom_query16(priv, EEPROM_SKU_CAP);
+
+        priv->cfg->sku = ((eeprom_sku & EEPROM_SKU_CAP_BAND_SELECTION) >>
+                        EEPROM_SKU_CAP_BAND_POS);
+        if (eeprom_sku & EEPROM_SKU_CAP_11N_ENABLE)
+                priv->cfg->sku |= IWL_SKU_N;
+
+        if (!priv->cfg->sku) {
+                IWL_ERR(priv, "Invalid device sku\n");
+                return -EINVAL;
+        }
+
+        IWL_INFO(priv, "Device SKU: 0X%x\n", priv->cfg->sku);
+
+        return 0;
+}
+
 void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac)
 {
         const u8 *addr = priv->cfg->ops->lib->eeprom_ops.query_addr(priv,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
index ffb2f4111ad..366340f3fb0 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
@@ -307,6 +307,7 @@ static int iwlagn_set_pan_params(struct iwl_priv *priv)
 
         if (ctx_bss->vif && ctx_pan->vif) {
                 int bcnint = ctx_pan->vif->bss_conf.beacon_int;
+                int dtim = ctx_pan->vif->bss_conf.dtim_period ?: 1;
 
                 /* should be set, but seems unused?? */
                 cmd.flags |= cpu_to_le16(IWL_WIPAN_PARAMS_FLG_SLOTTED_MODE);
@@ -329,10 +330,10 @@ static int iwlagn_set_pan_params(struct iwl_priv *priv)
                 if (test_bit(STATUS_SCAN_HW, &priv->status) ||
                     (!ctx_bss->vif->bss_conf.idle &&
                      !ctx_bss->vif->bss_conf.assoc)) {
-                        slot0 = bcnint * 3 - 20;
+                        slot0 = dtim * bcnint * 3 - 20;
                         slot1 = 20;
                 } else if (!ctx_pan->vif->bss_conf.idle &&
-                           !ctx_pan->vif->bss_conf.assoc) {
+                           !ctx_pan->vif->bss_conf.assoc) {
                         slot1 = bcnint * 3 - 20;
                         slot0 = 20;
                 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index ca3530c4295..f8fe5f44e19 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -445,22 +445,17 @@ static void iwlagn_rx_reply_tx(struct iwl_priv *priv,
 
                         if (priv->mac80211_registered &&
                             (iwl_queue_space(&txq->q) > txq->q.low_mark) &&
-                            (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA)) {
-                                if (agg->state == IWL_AGG_OFF)
-                                        iwl_wake_queue(priv, txq_id);
-                                else
-                                        iwl_wake_queue(priv, txq->swq_id);
-                        }
+                            (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))
+                                iwl_wake_queue(priv, txq);
                 }
         } else {
-                BUG_ON(txq_id != txq->swq_id);
                 iwlagn_set_tx_status(priv, info, tx_resp, txq_id, false);
                 freed = iwlagn_tx_queue_reclaim(priv, txq_id, index);
                 iwl_free_tfds_in_queue(priv, sta_id, tid, freed);
 
                 if (priv->mac80211_registered &&
                     (iwl_queue_space(&txq->q) > txq->q.low_mark))
-                        iwl_wake_queue(priv, txq_id);
+                        iwl_wake_queue(priv, txq);
         }
 
         iwlagn_txq_check_empty(priv, sta_id, tid, txq_id);
@@ -1834,6 +1829,10 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
         } else {
                 bt_cmd.flags = IWLAGN_BT_FLAG_COEX_MODE_3W <<
                                         IWLAGN_BT_FLAG_COEX_MODE_SHIFT;
+                if (priv->cfg->bt_params &&
+                    priv->cfg->bt_params->bt_sco_disable)
+                        bt_cmd.flags |= IWLAGN_BT_FLAG_SYNC_2_BT_DISABLE;
+
                 if (priv->bt_ch_announce)
                         bt_cmd.flags |= IWLAGN_BT_FLAG_CHANNEL_INHIBITION;
                 IWL_DEBUG_INFO(priv, "BT coex flag: 0X%x\n", bt_cmd.flags);
@@ -2001,7 +2000,7 @@ static void iwlagn_set_kill_ack_msk(struct iwl_priv *priv,
                                      struct iwl_bt_uart_msg *uart_msg)
 {
         u8 kill_ack_msk;
-        __le32 bt_kill_ack_msg[2] = {
+        static const __le32 bt_kill_ack_msg[2] = {
                         cpu_to_le32(0xFFFFFFF), cpu_to_le32(0xFFFFFC00) };
 
         kill_ack_msk = (((BT_UART_MSG_FRAME3A2DP_MSK |
@@ -2025,7 +2024,6 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,
         struct iwl_bt_coex_profile_notif *coex = &pkt->u.bt_coex_profile_notif;
         struct iwlagn_bt_sco_cmd sco_cmd = { .flags = 0 };
         struct iwl_bt_uart_msg *uart_msg = &coex->last_bt_uart_msg;
-        u8 last_traffic_load;
 
         IWL_DEBUG_NOTIF(priv, "BT Coex notification:\n");
         IWL_DEBUG_NOTIF(priv, "    status: %d\n", coex->bt_status);
@@ -2034,11 +2032,10 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv,
                         coex->bt_ci_compliance);
         iwlagn_print_uartmsg(priv, uart_msg);
 
-        last_traffic_load = priv->notif_bt_traffic_load;
-        priv->notif_bt_traffic_load = coex->bt_traffic_load;
+        priv->last_bt_traffic_load = priv->bt_traffic_load;
         if (priv->iw_mode != NL80211_IFTYPE_ADHOC) {
                 if (priv->bt_status != coex->bt_status ||
-                    last_traffic_load != coex->bt_traffic_load) {
+                    priv->last_bt_traffic_load != coex->bt_traffic_load) {
                         if (coex->bt_status) {
                                 /* BT on */
                                 if (!priv->bt_ch_announce)
@@ -2287,7 +2284,7 @@ static const char *get_csr_string(int cmd)
 void iwl_dump_csr(struct iwl_priv *priv)
 {
         int i;
-        u32 csr_tbl[] = {
+        static const u32 csr_tbl[] = {
                 CSR_HW_IF_CONFIG_REG,
                 CSR_INT_COALESCING,
                 CSR_INT,
@@ -2346,7 +2343,7 @@ int iwl_dump_fh(struct iwl_priv *priv, char **buf, bool display)
         int pos = 0;
         size_t bufsz = 0;
 #endif
-        u32 fh_tbl[] = {
+        static const u32 fh_tbl[] = {
                 FH_RSCSR_CHNL0_STTS_WPTR_REG,
                 FH_RSCSR_CHNL0_RBDCB_BASE_REG,
                 FH_RSCSR_CHNL0_WPTR,
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 065553629de..f450adc7236 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -833,17 +833,23 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
                             struct iwl_lq_sta *lq_sta)
 {
         struct iwl_scale_tbl_info *tbl;
-        bool full_concurrent;
+        bool full_concurrent = priv->bt_full_concurrent;
         unsigned long flags;
 
-        spin_lock_irqsave(&priv->lock, flags);
-        if (priv->bt_ci_compliance && priv->bt_ant_couple_ok)
-                full_concurrent = true;
-        else
-                full_concurrent = false;
-        spin_unlock_irqrestore(&priv->lock, flags);
-
-        if (priv->bt_full_concurrent != full_concurrent) {
+        if (priv->bt_ant_couple_ok) {
+                /*
+                 * Is there a need to switch between
+                 * full concurrency and 3-wire?
+                 */
+                spin_lock_irqsave(&priv->lock, flags);
+                if (priv->bt_ci_compliance && priv->bt_ant_couple_ok)
+                        full_concurrent = true;
+                else
+                        full_concurrent = false;
+                spin_unlock_irqrestore(&priv->lock, flags);
+        }
+        if ((priv->bt_traffic_load != priv->last_bt_traffic_load) ||
+            (priv->bt_full_concurrent != full_concurrent)) {
                 priv->bt_full_concurrent = full_concurrent;
 
                 /* Update uCode's rate table. */
@@ -1040,8 +1046,7 @@ done:
         if (sta && sta->supp_rates[sband->band])
                 rs_rate_scale_perform(priv, skb, sta, lq_sta);
 
-        /* Is there a need to switch between full concurrency and 3-wire? */
-        if (priv->bt_ant_couple_ok)
+        if (priv->cfg->bt_params && priv->cfg->bt_params->advanced_bt_coexist)
                 rs_bt_update_lq(priv, ctx, lq_sta);
 }
 
@@ -3010,10 +3015,7 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
          */
         if (priv && priv->cfg->bt_params &&
             priv->cfg->bt_params->agg_time_limit &&
-            priv->cfg->bt_params->agg_time_limit >=
-                LINK_QUAL_AGG_TIME_LIMIT_MIN &&
-            priv->cfg->bt_params->agg_time_limit <=
-                 LINK_QUAL_AGG_TIME_LIMIT_MAX)
+            priv->bt_traffic_load >= IWL_BT_COEX_TRAFFIC_LOAD_HIGH)
                 lq_cmd->agg_params.agg_time_limit =
                         cpu_to_le16(priv->cfg->bt_params->agg_time_limit);
 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 2d927a94074..203ee60a82b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -72,6 +72,34 @@ static int iwlagn_disable_pan(struct iwl_priv *priv,
         return ret;
 }
 
+static void iwlagn_update_qos(struct iwl_priv *priv,
+                              struct iwl_rxon_context *ctx)
+{
+        int ret;
+
+        if (!ctx->is_active)
+                return;
+
+        ctx->qos_data.def_qos_parm.qos_flags = 0;
+
+        if (ctx->qos_data.qos_active)
+                ctx->qos_data.def_qos_parm.qos_flags |=
+                        QOS_PARAM_FLG_UPDATE_EDCA_MSK;
+
+        if (ctx->ht.enabled)
+                ctx->qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;
+
+        IWL_DEBUG_QOS(priv, "send QoS cmd with Qos active=%d FLAGS=0x%X\n",
+                      ctx->qos_data.qos_active,
+                      ctx->qos_data.def_qos_parm.qos_flags);
+
+        ret = iwl_send_cmd_pdu(priv, ctx->qos_cmd,
+                               sizeof(struct iwl_qosparam_cmd),
+                               &ctx->qos_data.def_qos_parm);
+        if (ret)
+                IWL_ERR(priv, "Failed to update QoS\n");
+}
+
 static int iwlagn_update_beacon(struct iwl_priv *priv,
                                 struct ieee80211_vif *vif)
 {
@@ -97,6 +125,7 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         /* cast away the const for active_rxon in this function */
         struct iwl_rxon_cmd *active = (void *)&ctx->active;
         bool new_assoc = !!(ctx->staging.filter_flags & RXON_FILTER_ASSOC_MSK);
+        bool old_assoc = !!(ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK);
         int ret;
 
         lockdep_assert_held(&priv->mutex);
@@ -176,25 +205,27 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
          * AP station must be done after the BSSID is set to correctly
          * set up filters in the device.
          */
-        if (ctx->ctxid == IWL_RXON_CTX_BSS)
-                ret = iwlagn_disable_bss(priv, ctx, &ctx->staging);
-        else
-                ret = iwlagn_disable_pan(priv, ctx, &ctx->staging);
-        if (ret)
-                return ret;
+        if ((old_assoc && new_assoc) || !new_assoc) {
+                if (ctx->ctxid == IWL_RXON_CTX_BSS)
+                        ret = iwlagn_disable_bss(priv, ctx, &ctx->staging);
+                else
+                        ret = iwlagn_disable_pan(priv, ctx, &ctx->staging);
+                if (ret)
+                        return ret;
 
-        memcpy(active, &ctx->staging, sizeof(*active));
+                memcpy(active, &ctx->staging, sizeof(*active));
 
-        /*
-         * Un-assoc RXON clears the station table and WEP
-         * keys, so we have to restore those afterwards.
-         */
-        iwl_clear_ucode_stations(priv, ctx);
-        iwl_restore_stations(priv, ctx);
-        ret = iwl_restore_default_wep_keys(priv, ctx);
-        if (ret) {
-                IWL_ERR(priv, "Failed to restore WEP keys (%d)\n", ret);
-                return ret;
+                /*
+                 * Un-assoc RXON clears the station table and WEP
+                 * keys, so we have to restore those afterwards.
+                 */
+                iwl_clear_ucode_stations(priv, ctx);
+                iwl_restore_stations(priv, ctx);
+                ret = iwl_restore_default_wep_keys(priv, ctx);
+                if (ret) {
+                        IWL_ERR(priv, "Failed to restore WEP keys (%d)\n", ret);
+                        return ret;
+                }
         }
 
         /* RXON timing must be before associated RXON */
@@ -205,6 +236,9 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         }
 
         if (new_assoc) {
+                /* QoS info may be cleared by previous un-assoc RXON */
+                iwlagn_update_qos(priv, ctx);
+
                 /*
                  * We'll run into this code path when beaconing is
                  * enabled, but then we also need to send the beacon
@@ -235,6 +269,8 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
                 }
                 memcpy(active, &ctx->staging, sizeof(*active));
 
+                iwl_reprogram_ap_sta(priv, ctx);
+
                 /* IBSS beacon needs to be sent after setting assoc */
                 if (ctx->vif && (ctx->vif->type == NL80211_IFTYPE_ADHOC))
                         if (iwlagn_update_beacon(priv, ctx->vif))
@@ -261,34 +297,6 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
         return 0;
 }
 
-static void iwlagn_update_qos(struct iwl_priv *priv,
-                              struct iwl_rxon_context *ctx)
-{
-        int ret;
-
-        if (!ctx->is_active)
-                return;
-
-        ctx->qos_data.def_qos_parm.qos_flags = 0;
-
-        if (ctx->qos_data.qos_active)
-                ctx->qos_data.def_qos_parm.qos_flags |=
-                        QOS_PARAM_FLG_UPDATE_EDCA_MSK;
-
-        if (ctx->ht.enabled)
-                ctx->qos_data.def_qos_parm.qos_flags |= QOS_PARAM_FLG_TGN_MSK;
-
-        IWL_DEBUG_QOS(priv, "send QoS cmd with Qos active=%d FLAGS=0x%X\n",
-                      ctx->qos_data.qos_active,
-                      ctx->qos_data.def_qos_parm.qos_flags);
-
-        ret = iwl_send_cmd_pdu(priv, ctx->qos_cmd,
-                               sizeof(struct iwl_qosparam_cmd),
-                               &ctx->qos_data.def_qos_parm);
-        if (ret)
-                IWL_ERR(priv, "Failed to update QoS\n");
-}
-
 int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
 {
         struct iwl_priv *priv = hw->priv;
@@ -507,6 +515,11 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
 
         mutex_lock(&priv->mutex);
 
+        if (WARN_ON(!ctx->vif)) {
+                mutex_unlock(&priv->mutex);
+                return;
+        }
+
         if (changes & BSS_CHANGED_BEACON_INT)
                 force = true;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 2b078a99572..07bbc915529 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -518,11 +518,11 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         struct iwl_cmd_meta *out_meta;
         struct iwl_tx_cmd *tx_cmd;
         struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
-        int swq_id, txq_id;
+        int txq_id;
         dma_addr_t phys_addr;
         dma_addr_t txcmd_phys;
         dma_addr_t scratch_phys;
-        u16 len, len_org, firstlen, secondlen;
+        u16 len, firstlen, secondlen;
         u16 seq_number = 0;
         __le16 fc;
         u8 hdr_len;
@@ -620,7 +620,6 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         }
 
         txq = &priv->txq[txq_id];
-        swq_id = txq->swq_id;
         q = &txq->q;
 
         if (unlikely(iwl_queue_space(q) < q->high_mark)) {
@@ -687,30 +686,23 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
          */
         len = sizeof(struct iwl_tx_cmd) +
                 sizeof(struct iwl_cmd_header) + hdr_len;
-
-        len_org = len;
-        firstlen = len = (len + 3) & ~3;
-
-        if (len_org != len)
-                len_org = 1;
-        else
-                len_org = 0;
+        firstlen = (len + 3) & ~3;
 
         /* Tell NIC about any 2-byte padding after MAC header */
-        if (len_org)
+        if (firstlen != len)
                 tx_cmd->tx_flags |= TX_CMD_FLG_MH_PAD_MSK;
 
         /* Physical address of this Tx command's header (not MAC header!),
          * within command buffer array. */
         txcmd_phys = pci_map_single(priv->pci_dev,
-                                    &out_cmd->hdr, len,
+                                    &out_cmd->hdr, firstlen,
                                     PCI_DMA_BIDIRECTIONAL);
         dma_unmap_addr_set(out_meta, mapping, txcmd_phys);
-        dma_unmap_len_set(out_meta, len, len);
+        dma_unmap_len_set(out_meta, len, firstlen);
         /* Add buffer containing Tx command and MAC(!) header to TFD's
          * first entry */
         priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
-                                                   txcmd_phys, len, 1, 0);
+                                                   txcmd_phys, firstlen, 1, 0);
 
         if (!ieee80211_has_morefrags(hdr->frame_control)) {
                 txq->need_update = 1;
@@ -721,23 +713,21 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
 
         /* Set up TFD's 2nd entry to point directly to remainder of skb,
          * if any (802.11 null frames have no payload). */
-        secondlen = len = skb->len - hdr_len;
-        if (len) {
+        secondlen = skb->len - hdr_len;
+        if (secondlen > 0) {
                 phys_addr = pci_map_single(priv->pci_dev, skb->data + hdr_len,
-                                           len, PCI_DMA_TODEVICE);
+                                           secondlen, PCI_DMA_TODEVICE);
                 priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq,
-                                                           phys_addr, len,
+                                                           phys_addr, secondlen,
                                                            0, 0);
         }
 
         scratch_phys = txcmd_phys + sizeof(struct iwl_cmd_header) +
                                 offsetof(struct iwl_tx_cmd, scratch);
 
-        len = sizeof(struct iwl_tx_cmd) +
-                sizeof(struct iwl_cmd_header) + hdr_len;
         /* take back ownership of DMA buffer to enable update */
         pci_dma_sync_single_for_cpu(priv->pci_dev, txcmd_phys,
-                                    len, PCI_DMA_BIDIRECTIONAL);
+                                    firstlen, PCI_DMA_BIDIRECTIONAL);
         tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys);
         tx_cmd->dram_msb_ptr = iwl_get_dma_hi_addr(scratch_phys);
 
@@ -753,7 +743,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
                                                      le16_to_cpu(tx_cmd->len));
 
         pci_dma_sync_single_for_device(priv->pci_dev, txcmd_phys,
-                                       len, PCI_DMA_BIDIRECTIONAL);
+                                       firstlen, PCI_DMA_BIDIRECTIONAL);
 
         trace_iwlwifi_dev_tx(priv,
                              &((struct iwl_tfd *)txq->tfds)[txq->q.write_ptr],
@@ -784,7 +774,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
                         iwl_txq_update_write_ptr(priv, txq);
                         spin_unlock_irqrestore(&priv->lock, flags);
                 } else {
-                        iwl_stop_queue(priv, txq->swq_id);
+                        iwl_stop_queue(priv, txq);
                 }
         }
 
@@ -1013,7 +1003,7 @@ int iwlagn_tx_agg_start(struct iwl_priv *priv, struct ieee80211_vif *vif,
         tid_data = &priv->stations[sta_id].tid[tid];
         *ssn = SEQ_TO_SN(tid_data->seq_number);
         tid_data->agg.txq_id = txq_id;
-        priv->txq[txq_id].swq_id = iwl_virtual_agg_queue_num(get_ac_from_tid(tid), txq_id);
+        iwl_set_swq_id(&priv->txq[txq_id], get_ac_from_tid(tid), txq_id);
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
         ret = priv->cfg->ops->lib->txq_agg_enable(priv, txq_id, tx_fifo,
@@ -1241,37 +1231,61 @@ static int iwlagn_tx_status_reply_compressed_ba(struct iwl_priv *priv,
         if (sh < 0) /* tbw something is wrong with indices */
                 sh += 0x100;
 
-        /* don't use 64-bit values for now */
-        bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
-
         if (agg->frame_count > (64 - sh)) {
                 IWL_DEBUG_TX_REPLY(priv, "more frames than bitmap size");
                 return -1;
         }
-
-        /* check for success or failure according to the
-         * transmitted bitmap and block-ack bitmap */
-        sent_bitmap = bitmap & agg->bitmap;
-
-        /* For each frame attempted in aggregation,
-         * update driver's record of tx frame's status. */
-        i = 0;
-        while (sent_bitmap) {
-                ack = sent_bitmap & 1ULL;
-                successes += ack;
-                IWL_DEBUG_TX_REPLY(priv, "%s ON i=%d idx=%d raw=%d\n",
-                        ack ? "ACK" : "NACK", i, (agg->start_idx + i) & 0xff,
-                        agg->start_idx + i);
-                sent_bitmap >>= 1;
-                ++i;
+        if (!priv->cfg->base_params->no_agg_framecnt_info && ba_resp->txed) {
+                /*
+                 * sent and ack information provided by uCode
+                 * use it instead of figure out ourself
+                 */
+                if (ba_resp->txed_2_done > ba_resp->txed) {
+                        IWL_DEBUG_TX_REPLY(priv,
+                                "bogus sent(%d) and ack(%d) count\n",
+                                ba_resp->txed, ba_resp->txed_2_done);
+                        /*
+                         * set txed_2_done = txed,
+                         * so it won't impact rate scale
+                         */
+                        ba_resp->txed = ba_resp->txed_2_done;
+                }
+                IWL_DEBUG_HT(priv, "agg frames sent:%d, acked:%d\n",
+                                ba_resp->txed, ba_resp->txed_2_done);
+        } else {
+                /* don't use 64-bit values for now */
+                bitmap = le64_to_cpu(ba_resp->bitmap) >> sh;
+
+                /* check for success or failure according to the
+                 * transmitted bitmap and block-ack bitmap */
+                sent_bitmap = bitmap & agg->bitmap;
+
+                /* For each frame attempted in aggregation,
+                 * update driver's record of tx frame's status. */
+                i = 0;
+                while (sent_bitmap) {
+                        ack = sent_bitmap & 1ULL;
+                        successes += ack;
+                        IWL_DEBUG_TX_REPLY(priv, "%s ON i=%d idx=%d raw=%d\n",
+                                ack ? "ACK" : "NACK", i,
+                                (agg->start_idx + i) & 0xff,
+                                agg->start_idx + i);
+                        sent_bitmap >>= 1;
+                        ++i;
+                }
         }
-
         info = IEEE80211_SKB_CB(priv->txq[scd_flow].txb[agg->start_idx].skb);
         memset(&info->status, 0, sizeof(info->status));
         info->flags |= IEEE80211_TX_STAT_ACK;
         info->flags |= IEEE80211_TX_STAT_AMPDU;
-        info->status.ampdu_ack_len = successes;
-        info->status.ampdu_len = agg->frame_count;
+        if (!priv->cfg->base_params->no_agg_framecnt_info && ba_resp->txed) {
+                info->status.ampdu_ack_len = ba_resp->txed_2_done;
+                info->status.ampdu_len = ba_resp->txed;
+
+        } else {
+                info->status.ampdu_ack_len = successes;
+                info->status.ampdu_len = agg->frame_count;
+        }
         iwlagn_hwrate_to_tx_control(priv, agg->rate_n_flags, info);
 
         IWL_DEBUG_TX_REPLY(priv, "Bitmap %llx\n", (unsigned long long)bitmap);
@@ -1385,7 +1399,7 @@ void iwlagn_rx_reply_compressed_ba(struct iwl_priv *priv,
                 if ((iwl_queue_space(&txq->q) > txq->q.low_mark) &&
                     priv->mac80211_registered &&
                     (agg->state != IWL_EMPTYING_HW_QUEUE_DELBA))
-                        iwl_wake_queue(priv, txq->swq_id);
+                        iwl_wake_queue(priv, txq);
 
                 iwlagn_txq_check_empty(priv, sta_id, tid, scd_flow);
         }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
index 703621107da..411a7a20450 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
@@ -40,30 +40,36 @@
 #include "iwl-agn.h"
 #include "iwl-agn-calib.h"
 
-static const s8 iwlagn_default_queue_to_tx_fifo[] = {
-        IWL_TX_FIFO_VO,
-        IWL_TX_FIFO_VI,
-        IWL_TX_FIFO_BE,
-        IWL_TX_FIFO_BK,
-        IWLAGN_CMD_FIFO_NUM,
-        IWL_TX_FIFO_UNUSED,
-        IWL_TX_FIFO_UNUSED,
-        IWL_TX_FIFO_UNUSED,
-        IWL_TX_FIFO_UNUSED,
-        IWL_TX_FIFO_UNUSED,
+#define IWL_AC_UNSET -1
+
+struct queue_to_fifo_ac {
+        s8 fifo, ac;
+};
+
+static const struct queue_to_fifo_ac iwlagn_default_queue_to_tx_fifo[] = {
+        { IWL_TX_FIFO_VO, 0, },
+        { IWL_TX_FIFO_VI, 1, },
+        { IWL_TX_FIFO_BE, 2, },
+        { IWL_TX_FIFO_BK, 3, },
+        { IWLAGN_CMD_FIFO_NUM, IWL_AC_UNSET, },
+        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
+        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
+        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
+        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
+        { IWL_TX_FIFO_UNUSED, IWL_AC_UNSET, },
 };
 
-static const s8 iwlagn_ipan_queue_to_tx_fifo[] = {
-        IWL_TX_FIFO_VO,
-        IWL_TX_FIFO_VI,
-        IWL_TX_FIFO_BE,
-        IWL_TX_FIFO_BK,
-        IWL_TX_FIFO_BK_IPAN,
-        IWL_TX_FIFO_BE_IPAN,
-        IWL_TX_FIFO_VI_IPAN,
-        IWL_TX_FIFO_VO_IPAN,
-        IWL_TX_FIFO_BE_IPAN,
-        IWLAGN_CMD_FIFO_NUM,
+static const struct queue_to_fifo_ac iwlagn_ipan_queue_to_tx_fifo[] = {
+        { IWL_TX_FIFO_VO, 0, },
+        { IWL_TX_FIFO_VI, 1, },
+        { IWL_TX_FIFO_BE, 2, },
+        { IWL_TX_FIFO_BK, 3, },
+        { IWL_TX_FIFO_BK_IPAN, 3, },
+        { IWL_TX_FIFO_BE_IPAN, 2, },
+        { IWL_TX_FIFO_VI_IPAN, 1, },
+        { IWL_TX_FIFO_VO_IPAN, 0, },
+        { IWL_TX_FIFO_BE_IPAN, 2, },
+        { IWLAGN_CMD_FIFO_NUM, IWL_AC_UNSET, },
 };
 
 static struct iwl_wimax_coex_event_entry cu_priorities[COEX_NUM_OF_EVENTS] = {
@@ -429,7 +435,7 @@ void iwlagn_send_bt_env(struct iwl_priv *priv, u8 action, u8 type)
 
 int iwlagn_alive_notify(struct iwl_priv *priv)
 {
-        const s8 *queues;
+        const struct queue_to_fifo_ac *queue_to_fifo;
         u32 a;
         unsigned long flags;
         int i, chan;
@@ -492,9 +498,9 @@ int iwlagn_alive_notify(struct iwl_priv *priv)
 
         /* map queues to FIFOs */
         if (priv->valid_contexts != BIT(IWL_RXON_CTX_BSS))
-                queues = iwlagn_ipan_queue_to_tx_fifo;
+                queue_to_fifo = iwlagn_ipan_queue_to_tx_fifo;
         else
-                queues = iwlagn_default_queue_to_tx_fifo;
+                queue_to_fifo = iwlagn_default_queue_to_tx_fifo;
 
         iwlagn_set_wr_ptrs(priv, priv->cmd_queue, 0);
 
@@ -510,14 +516,17 @@ int iwlagn_alive_notify(struct iwl_priv *priv)
         BUILD_BUG_ON(ARRAY_SIZE(iwlagn_ipan_queue_to_tx_fifo) != 10);
 
         for (i = 0; i < 10; i++) {
-                int ac = queues[i];
+                int fifo = queue_to_fifo[i].fifo;
+                int ac = queue_to_fifo[i].ac;
 
                 iwl_txq_ctx_activate(priv, i);
 
-                if (ac == IWL_TX_FIFO_UNUSED)
+                if (fifo == IWL_TX_FIFO_UNUSED)
                         continue;
 
-                iwlagn_tx_queue_set_status(priv, &priv->txq[i], ac, 0);
+                if (ac != IWL_AC_UNSET)
+                        iwl_set_swq_id(&priv->txq[i], ac, i);
+                iwlagn_tx_queue_set_status(priv, &priv->txq[i], fifo, 0);
         }
 
         spin_unlock_irqrestore(&priv->lock, flags);
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 007fb20d78a..5b96b0d8009 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -97,7 +97,8 @@ void iwl_update_chain_flags(struct iwl_priv *priv)
         if (priv->cfg->ops->hcmd->set_rxon_chain) {
                 for_each_context(priv, ctx) {
                         priv->cfg->ops->hcmd->set_rxon_chain(priv, ctx);
-                        iwlcore_commit_rxon(priv, ctx);
+                        if (ctx->active.rx_chain != ctx->staging.rx_chain)
+                                iwlcore_commit_rxon(priv, ctx);
                 }
         }
 }
@@ -2716,6 +2717,8 @@ static void iwl_alive_start(struct iwl_priv *priv)
 
         iwl_reset_run_time_calib(priv);
 
+        set_bit(STATUS_READY, &priv->status);
+
         /* Configure the adapter for unassociated operation */
         iwlcore_commit_rxon(priv, ctx);
 
@@ -2725,7 +2728,6 @@ static void iwl_alive_start(struct iwl_priv *priv)
         iwl_leds_init(priv);
 
         IWL_DEBUG_INFO(priv, "ALIVE processing complete.\n");
-        set_bit(STATUS_READY, &priv->status);
         wake_up_interruptible(&priv->wait_command_queue);
 
         iwl_power_update_mode(priv, true);
@@ -3837,7 +3839,6 @@ static int iwl_init_drv(struct iwl_priv *priv)
                 priv->bt_on_thresh = BT_ON_THRESHOLD_DEF;
                 priv->bt_duration = BT_DURATION_LIMIT_DEF;
                 priv->dynamic_frag_thresh = BT_FRAG_THRESHOLD_DEF;
-                priv->dynamic_agg_thresh = BT_AGG_THRESHOLD_DEF;
         }
 
         /* Set the tx_power_user_lmt to the lowest power level
@@ -4135,6 +4136,10 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (err)
                 goto out_free_eeprom;
 
+        err = iwl_eeprom_check_sku(priv);
+        if (err)
+                goto out_free_eeprom;
+
         /* extract MAC Address */
         iwl_eeprom_get_mac(priv, priv->addresses[0].addr);
         IWL_DEBUG_INFO(priv, "MAC address: %pM\n", priv->addresses[0].addr);
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 424801abc80..c9448cba1e2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -2022,6 +2022,9 @@ struct iwl_compressed_ba_resp {
         __le64 bitmap;
         __le16 scd_flow;
         __le16 scd_ssn;
+        /* following only for 5000 series and up */
+        u8 txed;        /* number of frames sent */
+        u8 txed_2_done; /* number of frames acked */
 } __packed;
 
 /*
@@ -2407,9 +2410,9 @@ struct iwl_link_quality_cmd {
 #define BT_FRAG_THRESHOLD_MAX   0
 #define BT_FRAG_THRESHOLD_MIN   0
 
-#define BT_AGG_THRESHOLD_DEF    0
-#define BT_AGG_THRESHOLD_MAX    0
-#define BT_AGG_THRESHOLD_MIN    0
+#define BT_AGG_THRESHOLD_DEF    1200
+#define BT_AGG_THRESHOLD_MAX    8000
+#define BT_AGG_THRESHOLD_MIN    400
 
 /*
  * REPLY_BT_CONFIG = 0x9b (command, has simple generic response)
@@ -2436,8 +2439,9 @@ struct iwl_bt_cmd {
 #define IWLAGN_BT_FLAG_COEX_MODE_3W             2
 #define IWLAGN_BT_FLAG_COEX_MODE_4W             3
 
-#define IWLAGN_BT_FLAG_UCODE_DEFAULT    BIT(6)
-#define IWLAGN_BT_FLAG_NOCOEX_NOTIF     BIT(7)
+#define IWLAGN_BT_FLAG_UCODE_DEFAULT            BIT(6)
+/* Disable Sync PSPoll on SCO/eSCO */
+#define IWLAGN_BT_FLAG_SYNC_2_BT_DISABLE        BIT(7)
 
 #define IWLAGN_BT_PRIO_BOOST_MAX        0xFF
 #define IWLAGN_BT_PRIO_BOOST_MIN        0x00
@@ -2447,8 +2451,8 @@ struct iwl_bt_cmd {
 
 #define IWLAGN_BT3_T7_DEFAULT           1
 
-#define IWLAGN_BT_KILL_ACK_MASK_DEFAULT cpu_to_le32(0xffffffff)
-#define IWLAGN_BT_KILL_CTS_MASK_DEFAULT cpu_to_le32(0xffffffff)
+#define IWLAGN_BT_KILL_ACK_MASK_DEFAULT cpu_to_le32(0xffff0000)
+#define IWLAGN_BT_KILL_CTS_MASK_DEFAULT cpu_to_le32(0xffff0000)
 
 #define IWLAGN_BT3_PRIO_SAMPLE_DEFAULT  2
 
@@ -2664,9 +2668,16 @@ struct iwl_spectrum_notification {
 #define IWL_POWER_VEC_SIZE 5
 
 #define IWL_POWER_DRIVER_ALLOW_SLEEP_MSK        cpu_to_le16(BIT(0))
+#define IWL_POWER_POWER_SAVE_ENA_MSK            cpu_to_le16(BIT(0))
+#define IWL_POWER_POWER_MANAGEMENT_ENA_MSK      cpu_to_le16(BIT(1))
 #define IWL_POWER_SLEEP_OVER_DTIM_MSK           cpu_to_le16(BIT(2))
 #define IWL_POWER_PCI_PM_MSK                    cpu_to_le16(BIT(3))
 #define IWL_POWER_FAST_PD                       cpu_to_le16(BIT(4))
+#define IWL_POWER_BEACON_FILTERING              cpu_to_le16(BIT(5))
+#define IWL_POWER_SHADOW_REG_ENA                cpu_to_le16(BIT(6))
+#define IWL_POWER_CT_KILL_SET                   cpu_to_le16(BIT(7))
+#define IWL_POWER_BT_SCO_ENA                    cpu_to_le16(BIT(8))
+#define IWL_POWER_ADVANCE_PM_ENA_MSK            cpu_to_le16(BIT(9))
 
 struct iwl3945_powertable_cmd {
         __le16 flags;
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index c884ed385fc..c41f5a87821 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -1469,7 +1469,7 @@ static void iwl_teardown_interface(struct iwl_priv *priv,
          * both values are the same and zero.
          */
         if (vif->type == NL80211_IFTYPE_ADHOC)
-                priv->bt_traffic_load = priv->notif_bt_traffic_load;
+                priv->bt_traffic_load = priv->last_bt_traffic_load;
 }
 
 void iwl_mac_remove_interface(struct ieee80211_hw *hw,
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index ee8cf240d65..808be731ecb 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -291,7 +291,9 @@ struct iwl_mod_params {
  * @chain_noise_calib_by_driver: driver has the capability to perform
  *      chain noise calibration operation
  * @shadow_reg_enable: HW shadhow register bit
-*/
+ * @no_agg_framecnt_info: uCode do not provide aggregation frame count
+ *      information
+ */
 struct iwl_base_params {
         int eeprom_size;
         int num_of_queues;      /* def: HW dependent */
@@ -322,6 +324,7 @@ struct iwl_base_params {
         const bool sensitivity_calib_by_driver;
         const bool chain_noise_calib_by_driver;
         const bool shadow_reg_enable;
+        const bool no_agg_framecnt_info;
 };
 /*
  * @advanced_bt_coexist: support advanced bt coexist
@@ -331,6 +334,7 @@ struct iwl_base_params {
  * @agg_time_limit: maximum number of uSec in aggregation
  * @ampdu_factor: Maximum A-MPDU length factor
  * @ampdu_density: Minimum A-MPDU spacing
+ * @bt_sco_disable: uCode should not response to BT in SCO/ESCO mode
 */
 struct iwl_bt_params {
         bool advanced_bt_coexist;
@@ -340,6 +344,7 @@ struct iwl_bt_params {
         u16 agg_time_limit;
         u8 ampdu_factor;
         u8 ampdu_density;
+        bool bt_sco_disable;
 };
 /*
  * @use_rts_for_aggregation: use rts/cts protection for HT traffic
@@ -360,6 +365,8 @@ struct iwl_ht_params {
  * @need_dc_calib: need to perform init dc calibration
  * @need_temp_offset_calib: need to perform temperature offset calibration
  * @scan_antennas: available antenna for scan operation
+ * @led_mode: 0=blinking, 1=On(RF On)/Off(RF Off)
+ * @adv_pm: advance power management
  *
  * We enable the driver to be backward compatible wrt API version. The
  * driver specifies which APIs it supports (with @ucode_api_max being the
@@ -406,6 +413,8 @@ struct iwl_cfg {
         const bool need_temp_offset_calib; /* if used set to true */
         u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
         u8 scan_tx_antennas[IEEE80211_NUM_BANDS];
+        enum iwl_led_mode led_mode;
+        const bool adv_pm;
 };
 
 /***************************
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index 8fdd4efdb1d..3cc58420d44 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -992,11 +992,8 @@ static ssize_t iwl_dbgfs_tx_queue_read(struct file *file,
                                 " swq_id=%#.2x (ac %d/hwq %d)\n",
                                 cnt, q->read_ptr, q->write_ptr,
                                 !!test_bit(cnt, priv->queue_stopped),
-                                txq->swq_id,
-                                txq->swq_id & 0x80 ? txq->swq_id & 3 :
-                                txq->swq_id,
-                                txq->swq_id & 0x80 ? (txq->swq_id >> 2) &
-                                0x1f : txq->swq_id);
+                                txq->swq_id, txq->swq_id & 3,
+                                (txq->swq_id >> 2) & 0x1f);
                 if (cnt >= 4)
                         continue;
                 /* for the ACs, display the stop count too */
@@ -1580,7 +1577,7 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file,
                 priv->bt_full_concurrent ? "full concurrency" : "3-wire");
         pos += scnprintf(buf + pos, bufsz - pos, "BT status: %s, "
                          "last traffic notif: %d\n",
-                priv->bt_status ? "On" : "Off", priv->notif_bt_traffic_load);
+                priv->bt_status ? "On" : "Off", priv->last_bt_traffic_load);
         pos += scnprintf(buf + pos, bufsz - pos, "ch_announcement: %d, "
                          "sco_active: %d, kill_ack_mask: %x, "
                          "kill_cts_mask: %x\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 9fcaaf0cfe9..ea81ced1375 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1471,7 +1471,7 @@ struct iwl_priv {
 
         /* bt coex */
         u8 bt_status;
-        u8 bt_traffic_load, notif_bt_traffic_load;
+        u8 bt_traffic_load, last_bt_traffic_load;
         bool bt_ch_announce;
         bool bt_sco_active;
         bool bt_full_concurrent;
@@ -1482,7 +1482,6 @@ struct iwl_priv {
         u16 bt_on_thresh;
         u16 bt_duration;
         u16 dynamic_frag_thresh;
-        u16 dynamic_agg_thresh;
         u8 bt_ci_compliance;
         struct work_struct bt_traffic_change_work;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.h b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
index d9b590625ae..e87be1e551a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@ -110,9 +110,18 @@ enum {
 };
 
 /* SKU Capabilities */
+/* 3945 only */
 #define EEPROM_SKU_CAP_SW_RF_KILL_ENABLE                (1 << 0)
 #define EEPROM_SKU_CAP_HW_RF_KILL_ENABLE                (1 << 1)
 
+/* 5000 and up */
+#define EEPROM_SKU_CAP_BAND_POS                         (4)
+#define EEPROM_SKU_CAP_BAND_SELECTION                   \
+                (3 << EEPROM_SKU_CAP_BAND_POS)
+#define EEPROM_SKU_CAP_11N_ENABLE                       (1 << 6)
+#define EEPROM_SKU_CAP_AMT_ENABLE                       (1 << 7)
+#define EEPROM_SKU_CAP_IPAN_ENABLE                      (1 << 8)
+
 /* *regulatory* channel data format in eeprom, one for each channel.
  * There are separate entries for HT40 (40 MHz) vs. normal (20 MHz) channels. */
 struct iwl_eeprom_channel {
@@ -397,7 +406,7 @@ struct iwl_eeprom_calib_info {
 #define EEPROM_BOARD_REVISION               (2*0x35)    /* 2  bytes */
 #define EEPROM_BOARD_PBA_NUMBER             (2*0x3B+1)  /* 9  bytes */
 #define EEPROM_VERSION                      (2*0x44)    /* 2  bytes */
-#define EEPROM_SKU_CAP                      (2*0x45)    /* 1  bytes */
+#define EEPROM_SKU_CAP                      (2*0x45)    /* 2  bytes */
 #define EEPROM_OEM_MODE                     (2*0x46)    /* 2  bytes */
 #define EEPROM_WOWLAN_MODE                  (2*0x47)    /* 2  bytes */
 #define EEPROM_RADIO_CONFIG                 (2*0x48)    /* 2  bytes */
@@ -504,6 +513,7 @@ struct iwl_eeprom_ops {
 int iwl_eeprom_init(struct iwl_priv *priv);
 void iwl_eeprom_free(struct iwl_priv *priv);
 int  iwl_eeprom_check_version(struct iwl_priv *priv);
+int  iwl_eeprom_check_sku(struct iwl_priv *priv);
 const u8 *iwl_eeprom_query_addr(const struct iwl_priv *priv, size_t offset);
 int iwlcore_eeprom_verify_signature(struct iwl_priv *priv);
 u16 iwl_eeprom_query16(const struct iwl_priv *priv, size_t offset);
diff --git a/drivers/net/wireless/iwlwifi/iwl-helpers.h b/drivers/net/wireless/iwlwifi/iwl-helpers.h
index 1aaef70deae..3f5bedd8875 100644
--- a/drivers/net/wireless/iwlwifi/iwl-helpers.h
+++ b/drivers/net/wireless/iwlwifi/iwl-helpers.h
@@ -44,15 +44,6 @@ static inline struct ieee80211_conf *ieee80211_get_hw_conf(
         return &hw->conf;
 }
 
-static inline unsigned long elapsed_jiffies(unsigned long start,
-                                            unsigned long end)
-{
-        if (end >= start)
-                return end - start;
-
-        return end + (MAX_JIFFY_OFFSET - start) + 1;
-}
-
 /**
  * iwl_queue_inc_wrap - increment queue index, wrap back to beginning
  * @index -- current index
@@ -104,42 +95,36 @@ static inline int iwl_alloc_fw_desc(struct pci_dev *pci_dev,
  * | | | | | | | |
  * | | | | | | +-+-------- AC queue (0-3)
  * | | | | | |
- * | +-+-+-+-+------------ HW A-MPDU queue
+ * | +-+-+-+-+------------ HW queue ID
  * |
- * +---------------------- indicates agg queue
+ * +---------------------- unused
  */
-static inline u8 iwl_virtual_agg_queue_num(u8 ac, u8 hwq)
+static inline void iwl_set_swq_id(struct iwl_tx_queue *txq, u8 ac, u8 hwq)
 {
         BUG_ON(ac > 3);   /* only have 2 bits */
-        BUG_ON(hwq > 31); /* only have 5 bits */
+        BUG_ON(hwq > 31); /* only use 5 bits */
 
-        return 0x80 | (hwq << 2) | ac;
+        txq->swq_id = (hwq << 2) | ac;
 }
 
-static inline void iwl_wake_queue(struct iwl_priv *priv, u8 queue)
+static inline void iwl_wake_queue(struct iwl_priv *priv,
+                                  struct iwl_tx_queue *txq)
 {
-        u8 ac = queue;
-        u8 hwq = queue;
-
-        if (queue & 0x80) {
-                ac = queue & 3;
-                hwq = (queue >> 2) & 0x1f;
-        }
+        u8 queue = txq->swq_id;
+        u8 ac = queue & 3;
+        u8 hwq = (queue >> 2) & 0x1f;
 
         if (test_and_clear_bit(hwq, priv->queue_stopped))
                 if (atomic_dec_return(&priv->queue_stop_count[ac]) <= 0)
                         ieee80211_wake_queue(priv->hw, ac);
 }
 
-static inline void iwl_stop_queue(struct iwl_priv *priv, u8 queue)
+static inline void iwl_stop_queue(struct iwl_priv *priv,
+                                  struct iwl_tx_queue *txq)
 {
-        u8 ac = queue;
-        u8 hwq = queue;
-
-        if (queue & 0x80) {
-                ac = queue & 3;
-                hwq = (queue >> 2) & 0x1f;
-        }
+        u8 queue = txq->swq_id;
+        u8 ac = queue & 3;
+        u8 hwq = (queue >> 2) & 0x1f;
 
         if (!test_and_set_bit(hwq, priv->queue_stopped))
                 if (atomic_inc_return(&priv->queue_stop_count[ac]) > 0)
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 5a9129219c9..516e5577ed2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -45,9 +45,8 @@
 /* default: IWL_LED_BLINK(0) using blinking index table */
 static int led_mode;
 module_param(led_mode, int, S_IRUGO);
-MODULE_PARM_DESC(led_mode, "led mode: 0=blinking, 1=On(RF On)/Off(RF Off), "
-                           "(default 0)");
-
+MODULE_PARM_DESC(led_mode, "led mode: 0=system default, "
+                "1=On(RF On)/Off(RF Off), 2=blinking");
 
 static const struct {
         u16 tpt;        /* Mb/s */
@@ -128,7 +127,7 @@ EXPORT_SYMBOL(iwl_led_start);
 int iwl_led_associate(struct iwl_priv *priv)
 {
         IWL_DEBUG_LED(priv, "Associated\n");
-        if (led_mode == IWL_LED_BLINK)
+        if (priv->cfg->led_mode == IWL_LED_BLINK)
                 priv->allow_blinking = 1;
         priv->last_blink_time = jiffies;
 
@@ -223,5 +222,8 @@ void iwl_leds_init(struct iwl_priv *priv)
         priv->last_blink_rate = 0;
         priv->last_blink_time = 0;
         priv->allow_blinking = 0;
+        if (led_mode != IWL_LED_DEFAULT &&
+            led_mode != priv->cfg->led_mode)
+                priv->cfg->led_mode = led_mode;
 }
 EXPORT_SYMBOL(iwl_leds_init);
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.h b/drivers/net/wireless/iwlwifi/iwl-led.h
index 49a70baa3fb..9079b33486e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.h
+++ b/drivers/net/wireless/iwlwifi/iwl-led.h
@@ -47,14 +47,16 @@ enum led_type {
 
 /*
  * LED mode
- *    IWL_LED_BLINK:    adjust led blink rate based on blink table
+ *    IWL_LED_DEFAULT:  use system default
  *    IWL_LED_RF_STATE: turn LED on/off based on RF state
  *                      LED ON  = RF ON
  *                      LED OFF = RF OFF
+ *    IWL_LED_BLINK:    adjust led blink rate based on blink table
  */
 enum iwl_led_mode {
-        IWL_LED_BLINK,
+        IWL_LED_DEFAULT,
         IWL_LED_RF_STATE,
+        IWL_LED_BLINK,
 };
 
 void iwl_leds_init(struct iwl_priv *priv);
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c
index b7abd86676f..1eec18d909d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-power.c
+++ b/drivers/net/wireless/iwlwifi/iwl-power.c
@@ -75,6 +75,10 @@ struct iwl_power_vec_entry {
 
 #define NOSLP cpu_to_le16(0), 0, 0
 #define SLP IWL_POWER_DRIVER_ALLOW_SLEEP_MSK, 0, 0
+#define ASLP (IWL_POWER_POWER_SAVE_ENA_MSK |    \
+                IWL_POWER_POWER_MANAGEMENT_ENA_MSK | \
+                IWL_POWER_ADVANCE_PM_ENA_MSK)
+#define ASLP_TOUT(T) cpu_to_le32(T)
 #define TU_TO_USEC 1024
 #define SLP_TOUT(T) cpu_to_le32((T) * TU_TO_USEC)
 #define SLP_VEC(X0, X1, X2, X3, X4) {cpu_to_le32(X0), \
@@ -114,6 +118,52 @@ static const struct iwl_power_vec_entry range_2[IWL_POWER_NUM] = {
         {{SLP, SLP_TOUT(25), SLP_TOUT(25), SLP_VEC(4, 7, 10, 10, 0xFF)}, 0}
 };
 
+/* advance power management */
+/* DTIM 0 - 2 */
+static const struct iwl_power_vec_entry apm_range_0[IWL_POWER_NUM] = {
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 6, 8, 0xFF), ASLP_TOUT(2)}, 2}
+};
+
+
+/* for DTIM period IWL_DTIM_RANGE_0_MAX + 1 through IWL_DTIM_RANGE_1_MAX */
+/* DTIM 3 - 10 */
+static const struct iwl_power_vec_entry apm_range_1[IWL_POWER_NUM] = {
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 6, 8, 0xFF), 0}, 2}
+};
+
+/* for DTIM period > IWL_DTIM_RANGE_1_MAX */
+/* DTIM 11 - */
+static const struct iwl_power_vec_entry apm_range_2[IWL_POWER_NUM] = {
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 4, 6, 0xFF), 0}, 0},
+        {{ASLP, 0, 0, ASLP_TOUT(50), ASLP_TOUT(50),
+                SLP_VEC(1, 2, 6, 8, 0xFF), ASLP_TOUT(2)}, 2}
+};
+
 static void iwl_static_sleep_cmd(struct iwl_priv *priv,
                                  struct iwl_powertable_cmd *cmd,
                                  enum iwl_power_level lvl, int period)
@@ -124,11 +174,19 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,
         u8 skip;
         u32 slp_itrvl;
 
-        table = range_2;
-        if (period <= IWL_DTIM_RANGE_1_MAX)
-                table = range_1;
-        if (period <= IWL_DTIM_RANGE_0_MAX)
-                table = range_0;
+        if (priv->cfg->adv_pm) {
+                table = apm_range_2;
+                if (period <= IWL_DTIM_RANGE_1_MAX)
+                        table = apm_range_1;
+                if (period <= IWL_DTIM_RANGE_0_MAX)
+                        table = apm_range_0;
+        } else {
+                table = range_2;
+                if (period <= IWL_DTIM_RANGE_1_MAX)
+                        table = range_1;
+                if (period <= IWL_DTIM_RANGE_0_MAX)
+                        table = range_0;
+        }
 
         BUG_ON(lvl < 0 || lvl >= IWL_POWER_NUM);
 
@@ -163,6 +221,20 @@ static void iwl_static_sleep_cmd(struct iwl_priv *priv,
         else
                 cmd->flags &= ~IWL_POWER_SLEEP_OVER_DTIM_MSK;
 
+        if (priv->cfg->base_params->shadow_reg_enable)
+                cmd->flags |= IWL_POWER_SHADOW_REG_ENA;
+        else
+                cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;
+
+        if (priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist) {
+                if (!priv->cfg->bt_params->bt_sco_disable)
+                        cmd->flags |= IWL_POWER_BT_SCO_ENA;
+                else
+                        cmd->flags &= ~IWL_POWER_BT_SCO_ENA;
+        }
+
+
         slp_itrvl = le32_to_cpu(cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1]);
         if (slp_itrvl > IWL_CONN_MAX_LISTEN_INTERVAL)
                 cmd->sleep_interval[IWL_POWER_VEC_SIZE - 1] =
@@ -236,6 +308,19 @@ static void iwl_power_fill_sleep_cmd(struct iwl_priv *priv,
         if (priv->power_data.pci_pm)
                 cmd->flags |= IWL_POWER_PCI_PM_MSK;
 
+        if (priv->cfg->base_params->shadow_reg_enable)
+                cmd->flags |= IWL_POWER_SHADOW_REG_ENA;
+        else
+                cmd->flags &= ~IWL_POWER_SHADOW_REG_ENA;
+
+        if (priv->cfg->bt_params &&
+            priv->cfg->bt_params->advanced_bt_coexist) {
+                if (!priv->cfg->bt_params->bt_sco_disable)
+                        cmd->flags |= IWL_POWER_BT_SCO_ENA;
+                else
+                        cmd->flags &= ~IWL_POWER_BT_SCO_ENA;
+        }
+
         cmd->rx_data_timeout = cpu_to_le32(1000 * dynps_ms);
         cmd->tx_data_timeout = cpu_to_le32(1000 * dynps_ms);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index e1aa0e1daa5..12d9363d0af 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -252,8 +252,7 @@ static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
 
         IWL_DEBUG_SCAN(priv, "Scan on %sGHz took %dms\n",
                        (priv->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
-                       jiffies_to_msecs(elapsed_jiffies
-                                        (priv->scan_start, jiffies)));
+                       jiffies_to_msecs(jiffies - priv->scan_start));
 
         queue_work(priv->workqueue, &priv->scan_completed);
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 7c7f7dcb1b1..0a67b2fa52a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -400,7 +400,8 @@ static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, u8 sta_id)
 }
 
 static int iwl_send_remove_station(struct iwl_priv *priv,
-                                   const u8 *addr, int sta_id)
+                                   const u8 *addr, int sta_id,
+                                   bool temporary)
 {
         struct iwl_rx_packet *pkt;
         int ret;
@@ -436,9 +437,11 @@ static int iwl_send_remove_station(struct iwl_priv *priv,
         if (!ret) {
                 switch (pkt->u.rem_sta.status) {
                 case REM_STA_SUCCESS_MSK:
-                        spin_lock_irqsave(&priv->sta_lock, flags_spin);
-                        iwl_sta_ucode_deactivate(priv, sta_id);
-                        spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+                        if (!temporary) {
+                                spin_lock_irqsave(&priv->sta_lock, flags_spin);
+                                iwl_sta_ucode_deactivate(priv, sta_id);
+                                spin_unlock_irqrestore(&priv->sta_lock, flags_spin);
+                        }
                         IWL_DEBUG_ASSOC(priv, "REPLY_REMOVE_STA PASSED\n");
                         break;
                 default:
@@ -505,7 +508,7 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 sta_id,
 
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 
-        return iwl_send_remove_station(priv, addr, sta_id);
+        return iwl_send_remove_station(priv, addr, sta_id, false);
 out_err:
         spin_unlock_irqrestore(&priv->sta_lock, flags);
         return -EINVAL;
@@ -624,6 +627,44 @@ void iwl_restore_stations(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 }
 EXPORT_SYMBOL(iwl_restore_stations);
 
+void iwl_reprogram_ap_sta(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
+{
+        unsigned long flags;
+        int sta_id = ctx->ap_sta_id;
+        int ret;
+        struct iwl_addsta_cmd sta_cmd;
+        struct iwl_link_quality_cmd lq;
+        bool active;
+
+        spin_lock_irqsave(&priv->sta_lock, flags);
+        if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE)) {
+                spin_unlock_irqrestore(&priv->sta_lock, flags);
+                return;
+        }
+
+        memcpy(&sta_cmd, &priv->stations[sta_id].sta, sizeof(sta_cmd));
+        sta_cmd.mode = 0;
+        memcpy(&lq, priv->stations[sta_id].lq, sizeof(lq));
+
+        active = priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE;
+        spin_unlock_irqrestore(&priv->sta_lock, flags);
+
+        if (active) {
+                ret = iwl_send_remove_station(
+                        priv, priv->stations[sta_id].sta.sta.addr,
+                        sta_id, true);
+                if (ret)
+                        IWL_ERR(priv, "failed to remove STA %pM (%d)\n",
+                                priv->stations[sta_id].sta.sta.addr, ret);
+        }
+        ret = iwl_send_add_sta(priv, &sta_cmd, CMD_SYNC);
+        if (ret)
+                IWL_ERR(priv, "failed to re-add STA %pM (%d)\n",
+                        priv->stations[sta_id].sta.sta.addr, ret);
+        iwl_send_lq_cmd(priv, ctx, &lq, CMD_SYNC, true);
+}
+EXPORT_SYMBOL(iwl_reprogram_ap_sta);
+
 int iwl_get_free_ucode_key_index(struct iwl_priv *priv)
 {
         int i;
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.h b/drivers/net/wireless/iwlwifi/iwl-sta.h
index 06475872eee..206f1e1a0ca 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.h
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.h
@@ -63,6 +63,7 @@ u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
 
 int iwl_send_lq_cmd(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
                     struct iwl_link_quality_cmd *lq, u8 flags, bool init);
+void iwl_reprogram_ap_sta(struct iwl_priv *priv, struct iwl_rxon_context *ctx);
 
 /**
  * iwl_clear_driver_stations - clear knowledge of all stations from driver
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index feaa3670c6b..90659bcf580 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -359,13 +359,12 @@ int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
         txq->need_update = 0;
 
         /*
-         * Aggregation TX queues will get their ID when aggregation begins;
-         * they overwrite the setting done here. The command FIFO doesn't
-         * need an swq_id so don't set one to catch errors, all others can
-         * be set up to the identity mapping.
+         * For the default queues 0-3, set up the swq_id
+         * already -- all others need to get one later
+         * (if they need one at all).
          */
-        if (txq_id != priv->cmd_queue)
-                txq->swq_id = txq_id;
+        if (txq_id < 4)
+                iwl_set_swq_id(txq, txq_id, txq_id);
 
         /* TFD_QUEUE_SIZE_MAX must be power-of-two size, otherwise
          * iwl_queue_inc_wrap and iwl_queue_dec_wrap are broken. */
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 931c546367e..8eb1393506b 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -475,7 +475,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         dma_addr_t phys_addr;
         dma_addr_t txcmd_phys;
         int txq_id = skb_get_queue_mapping(skb);
-        u16 len, idx, len_org, hdr_len; /* TODO: len_org is not used */
+        u16 len, idx, hdr_len;
         u8 id;
         u8 unicast;
         u8 sta_id;
@@ -612,15 +612,8 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
          */
         len = sizeof(struct iwl3945_tx_cmd) +
                         sizeof(struct iwl_cmd_header) + hdr_len;
-
-        len_org = len;
         len = (len + 3) & ~3;
 
-        if (len_org != len)
-                len_org = 1;
-        else
-                len_org = 0;
-
         /* Physical address of this Tx command's header (not MAC header!),
          * within command buffer array. */
         txcmd_phys = pci_map_single(priv->pci_dev, &out_cmd->hdr,
@@ -662,7 +655,7 @@ static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
                         spin_unlock_irqrestore(&priv->lock, flags);
                 }
 
-                iwl_stop_queue(priv, skb_get_queue_mapping(skb));
+                iwl_stop_queue(priv, txq);
         }
 
         return 0;
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c
index 330c7d9cf10..50dee6a0a5c 100644
--- a/drivers/net/wireless/iwmc3200wifi/commands.c
+++ b/drivers/net/wireless/iwmc3200wifi/commands.c
@@ -908,7 +908,7 @@ int iwm_scan_ssids(struct iwm_priv *iwm, struct cfg80211_ssid *ssids,
                 return ret;
         }
 
-        iwm->scan_id = iwm->scan_id++ % IWM_SCAN_ID_MAX;
+        iwm->scan_id = (iwm->scan_id + 1) % IWM_SCAN_ID_MAX;
 
         return 0;
 }
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 373930afc26..dee32d3681a 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -9,8 +9,6 @@
 #include <linux/sched.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>
 #include <asm/unaligned.h>
@@ -2062,7 +2060,7 @@ static void lbs_cfg_set_regulatory_hint(struct lbs_private *priv)
         };
 
         /* Section 5.17.2 */
-        static struct region_code_mapping regmap[] = {
+        static const struct region_code_mapping regmap[] = {
                 {"US ", 0x10}, /* US FCC */
                 {"CA ", 0x20}, /* Canada */
                 {"EU ", 0x30}, /* ETSI   */
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 70745928f3f..78c4da150a7 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -177,6 +177,14 @@ int lbs_host_sleep_cfg(struct lbs_private *priv, uint32_t criteria,
         struct cmd_ds_host_sleep cmd_config;
         int ret;
 
+        /*
+         * Certain firmware versions do not support EHS_REMOVE_WAKEUP command
+         * and the card will return a failure.  Since we need to be
+         * able to reset the mask, in those cases we set a 0 mask instead.
+         */
+        if (criteria == EHS_REMOVE_WAKEUP && !priv->ehs_remove_supported)
+                criteria = 0;
+
         cmd_config.hdr.size = cpu_to_le16(sizeof(cmd_config));
         cmd_config.criteria = cpu_to_le32(criteria);
         cmd_config.gpio = priv->wol_gpio;
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index cb14c38caf3..18dd9a02c45 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -138,6 +138,7 @@ struct lbs_private {
         uint32_t wol_criteria;
         uint8_t wol_gpio;
         uint8_t wol_gap;
+        bool ehs_remove_supported;
 
         /* Transmitting */
         int tx_pending_len;             /* -1 while building packet */
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index efaf8503220..6524c70363d 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -345,6 +345,13 @@ static int if_usb_probe(struct usb_interface *intf,
         if (device_create_file(&priv->dev->dev, &dev_attr_lbs_flash_boot2))
                 lbs_pr_err("cannot register lbs_flash_boot2 attribute\n");
 
+        /*
+         * EHS_REMOVE_WAKEUP is not supported on all versions of the firmware.
+         */
+        priv->wol_criteria = EHS_REMOVE_WAKEUP;
+        if (lbs_host_sleep_cfg(priv, priv->wol_criteria, NULL))
+                priv->ehs_remove_supported = false;
+
         return 0;
 
 err_start_card:
@@ -1090,12 +1097,6 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
         if (priv->psstate != PS_STATE_FULL_POWER)
                 return -1;
 
-        if (priv->wol_criteria == EHS_REMOVE_WAKEUP) {
-                lbs_pr_info("Suspend attempt without "
-                                                "configuring wake params!\n");
-                return -ENOSYS;
-        }
-
         ret = lbs_suspend(priv);
         if (ret)
                 goto out;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 46b88b118c9..143473c5939 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -851,9 +851,10 @@ struct lbs_private *lbs_add_card(void *card, struct device *dmdev)
         priv->work_thread = create_singlethread_workqueue("lbs_worker");
         INIT_WORK(&priv->mcast_work, lbs_set_mcast_worker);
 
-        priv->wol_criteria = 0xffffffff;
+        priv->wol_criteria = EHS_REMOVE_WAKEUP;
         priv->wol_gpio = 0xff;
         priv->wol_gap = 20;
+        priv->ehs_remove_supported = true;
 
         goto done;
 
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index a4d0bca9ef2..a2b1df21d28 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -55,7 +55,9 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
         struct rxpd *p_rx_pd;
         int hdrchop;
         struct ethhdr *p_ethhdr;
-        const u8 rfc1042_eth_hdr[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+        static const u8 rfc1042_eth_hdr[] = {
+                0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00
+        };
 
         lbs_deb_enter(LBS_DEB_RX);
 
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 1bbcd7c1d02..9ecf8407cb1 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -29,6 +29,12 @@
 #define MWL8K_NAME      KBUILD_MODNAME
 #define MWL8K_VERSION   "0.12"
 
+/* Module parameters */
+static unsigned ap_mode_default;
+module_param(ap_mode_default, bool, 0);
+MODULE_PARM_DESC(ap_mode_default,
+                 "Set to 1 to make ap mode the default instead of sta mode");
+
 /* Register definitions */
 #define MWL8K_HIU_GEN_PTR                       0x00000c10
 #define  MWL8K_MODE_STA                          0x0000005a
@@ -92,8 +98,10 @@ struct rxd_ops {
 struct mwl8k_device_info {
         char *part_name;
         char *helper_image;
-        char *fw_image;
+        char *fw_image_sta;
+        char *fw_image_ap;
         struct rxd_ops *ap_rxd_ops;
+        u32 fw_api_ap;
 };
 
 struct mwl8k_rx_queue {
@@ -136,8 +144,8 @@ struct mwl8k_priv {
         void __iomem *regs;
 
         /* firmware */
-        struct firmware *fw_helper;
-        struct firmware *fw_ucode;
+        const struct firmware *fw_helper;
+        const struct firmware *fw_ucode;
 
         /* hardware/firmware parameters */
         bool ap_fw;
@@ -210,6 +218,18 @@ struct mwl8k_priv {
 
         /* Most recently reported noise in dBm */
         s8 noise;
+
+        /*
+         * preserve the queue configurations so they can be restored if/when
+         * the firmware image is swapped.
+         */
+        struct ieee80211_tx_queue_params wmm_params[MWL8K_TX_QUEUES];
+
+        /* async firmware loading state */
+        unsigned fw_state;
+        char *fw_pref;
+        char *fw_alt;
+        struct completion firmware_loading_complete;
 };
 
 /* Per interface specific private data */
@@ -285,8 +305,9 @@ static const struct ieee80211_rate mwl8k_rates_50[] = {
 };
 
 /* Set or get info from Firmware */
-#define MWL8K_CMD_SET                   0x0001
 #define MWL8K_CMD_GET                   0x0000
+#define MWL8K_CMD_SET                   0x0001
+#define MWL8K_CMD_SET_LIST              0x0002
 
 /* Firmware command codes */
 #define MWL8K_CMD_CODE_DNLD             0x0001
@@ -296,6 +317,7 @@ static const struct ieee80211_rate mwl8k_rates_50[] = {
 #define MWL8K_CMD_GET_STAT              0x0014
 #define MWL8K_CMD_RADIO_CONTROL         0x001c
 #define MWL8K_CMD_RF_TX_POWER           0x001e
+#define MWL8K_CMD_TX_POWER              0x001f
 #define MWL8K_CMD_RF_ANTENNA            0x0020
 #define MWL8K_CMD_SET_BEACON            0x0100          /* per-vif */
 #define MWL8K_CMD_SET_PRE_SCAN          0x0107
@@ -333,6 +355,7 @@ static const char *mwl8k_cmd_name(__le16 cmd, char *buf, int bufsize)
                 MWL8K_CMDNAME(GET_STAT);
                 MWL8K_CMDNAME(RADIO_CONTROL);
                 MWL8K_CMDNAME(RF_TX_POWER);
+                MWL8K_CMDNAME(TX_POWER);
                 MWL8K_CMDNAME(RF_ANTENNA);
                 MWL8K_CMDNAME(SET_BEACON);
                 MWL8K_CMDNAME(SET_PRE_SCAN);
@@ -372,7 +395,7 @@ static void mwl8k_hw_reset(struct mwl8k_priv *priv)
 }
 
 /* Release fw image */
-static void mwl8k_release_fw(struct firmware **fw)
+static void mwl8k_release_fw(const struct firmware **fw)
 {
         if (*fw == NULL)
                 return;
@@ -386,37 +409,68 @@ static void mwl8k_release_firmware(struct mwl8k_priv *priv)
         mwl8k_release_fw(&priv->fw_helper);
 }
 
+/* states for asynchronous f/w loading */
+static void mwl8k_fw_state_machine(const struct firmware *fw, void *context);
+enum {
+        FW_STATE_INIT = 0,
+        FW_STATE_LOADING_PREF,
+        FW_STATE_LOADING_ALT,
+        FW_STATE_ERROR,
+};
+
 /* Request fw image */
 static int mwl8k_request_fw(struct mwl8k_priv *priv,
-                            const char *fname, struct firmware **fw)
+                            const char *fname, const struct firmware **fw,
+                            bool nowait)
 {
         /* release current image */
         if (*fw != NULL)
                 mwl8k_release_fw(fw);
 
-        return request_firmware((const struct firmware **)fw,
-                                fname, &priv->pdev->dev);
+        if (nowait)
+                return request_firmware_nowait(THIS_MODULE, 1, fname,
+                                               &priv->pdev->dev, GFP_KERNEL,
+                                               priv, mwl8k_fw_state_machine);
+        else
+                return request_firmware(fw, fname, &priv->pdev->dev);
 }
 
-static int mwl8k_request_firmware(struct mwl8k_priv *priv)
+static int mwl8k_request_firmware(struct mwl8k_priv *priv, char *fw_image,
+                                  bool nowait)
 {
         struct mwl8k_device_info *di = priv->device_info;
         int rc;
 
         if (di->helper_image != NULL) {
-                rc = mwl8k_request_fw(priv, di->helper_image, &priv->fw_helper);
-                if (rc) {
-                        printk(KERN_ERR "%s: Error requesting helper "
-                               "firmware file %s\n", pci_name(priv->pdev),
-                               di->helper_image);
+                if (nowait)
+                        rc = mwl8k_request_fw(priv, di->helper_image,
+                                              &priv->fw_helper, true);
+                else
+                        rc = mwl8k_request_fw(priv, di->helper_image,
+                                              &priv->fw_helper, false);
+                if (rc)
+                        printk(KERN_ERR "%s: Error requesting helper fw %s\n",
+                               pci_name(priv->pdev), di->helper_image);
+
+                if (rc || nowait)
                         return rc;
-                }
         }
 
-        rc = mwl8k_request_fw(priv, di->fw_image, &priv->fw_ucode);
+        if (nowait) {
+                /*
+                 * if we get here, no helper image is needed.  Skip the
+                 * FW_STATE_INIT state.
+                 */
+                priv->fw_state = FW_STATE_LOADING_PREF;
+                rc = mwl8k_request_fw(priv, fw_image,
+                                      &priv->fw_ucode,
+                                      true);
+        } else
+                rc = mwl8k_request_fw(priv, fw_image,
+                                      &priv->fw_ucode, false);
         if (rc) {
                 printk(KERN_ERR "%s: Error requesting firmware file %s\n",
-                       pci_name(priv->pdev), di->fw_image);
+                       pci_name(priv->pdev), fw_image);
                 mwl8k_release_fw(&priv->fw_helper);
                 return rc;
         }
@@ -577,12 +631,12 @@ static int mwl8k_feed_fw_image(struct mwl8k_priv *priv,
 static int mwl8k_load_firmware(struct ieee80211_hw *hw)
 {
         struct mwl8k_priv *priv = hw->priv;
-        struct firmware *fw = priv->fw_ucode;
+        const struct firmware *fw = priv->fw_ucode;
         int rc;
         int loops;
 
         if (!memcmp(fw->data, "\x01\x00\x00\x00", 4)) {
-                struct firmware *helper = priv->fw_helper;
+                const struct firmware *helper = priv->fw_helper;
 
                 if (helper == NULL) {
                         printk(KERN_ERR "%s: helper image needed but none "
@@ -1125,12 +1179,10 @@ struct mwl8k_tx_desc {
         __le32 reserved;
         __le16 rate_info;
         __u8 peer_id;
-        __u8 xmitcontrol;
+        __u8 tx_frag_cnt;
 } __packed;
 
 #define MWL8K_TX_DESCS          128
-#define MWL8K_XMITCONTROL_NON_AMPDU     0x04
-
 
 static int mwl8k_txq_init(struct ieee80211_hw *hw, int index)
 {
@@ -1450,9 +1502,6 @@ mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb)
                 tx->peer_id = MWL8K_STA(tx_info->control.sta)->peer_id;
         else
                 tx->peer_id = 0;
-
-        if (priv->ap_fw)
-                tx->xmitcontrol = MWL8K_XMITCONTROL_NON_AMPDU;
         wmb();
         tx->status = cpu_to_le32(MWL8K_TXD_STATUS_FW_OWNED | txstatus);
 
@@ -1816,6 +1865,7 @@ struct mwl8k_cmd_get_hw_spec_ap {
         __le32 wcbbase1;
         __le32 wcbbase2;
         __le32 wcbbase3;
+        __le32 fw_api_version;
 } __packed;
 
 static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
@@ -1823,6 +1873,7 @@ static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
         struct mwl8k_priv *priv = hw->priv;
         struct mwl8k_cmd_get_hw_spec_ap *cmd;
         int rc;
+        u32 api_version;
 
         cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
         if (cmd == NULL)
@@ -1839,6 +1890,16 @@ static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
         if (!rc) {
                 int off;
 
+                api_version = le32_to_cpu(cmd->fw_api_version);
+                if (priv->device_info->fw_api_ap != api_version) {
+                        printk(KERN_ERR "%s: Unsupported fw API version for %s."
+                               "  Expected %d got %d.\n", MWL8K_NAME,
+                               priv->device_info->part_name,
+                               priv->device_info->fw_api_ap,
+                               api_version);
+                        rc = -EINVAL;
+                        goto done;
+                }
                 SET_IEEE80211_PERM_ADDR(hw, cmd->perm_addr);
                 priv->num_mcaddrs = le16_to_cpu(cmd->num_mcaddrs);
                 priv->fw_rev = le32_to_cpu(cmd->fw_rev);
@@ -1866,6 +1927,7 @@ static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
                 iowrite32(priv->txq[3].txd_dma, priv->sram + off);
         }
 
+done:
         kfree(cmd);
         return rc;
 }
@@ -2089,7 +2151,7 @@ mwl8k_set_radio_preamble(struct ieee80211_hw *hw, bool short_preamble)
 /*
  * CMD_RF_TX_POWER.
  */
-#define MWL8K_TX_POWER_LEVEL_TOTAL      8
+#define MWL8K_RF_TX_POWER_LEVEL_TOTAL   8
 
 struct mwl8k_cmd_rf_tx_power {
         struct mwl8k_cmd_pkt header;
@@ -2097,7 +2159,7 @@ struct mwl8k_cmd_rf_tx_power {
         __le16 support_level;
         __le16 current_level;
         __le16 reserved;
-        __le16 power_level_list[MWL8K_TX_POWER_LEVEL_TOTAL];
+        __le16 power_level_list[MWL8K_RF_TX_POWER_LEVEL_TOTAL];
 } __packed;
 
 static int mwl8k_cmd_rf_tx_power(struct ieee80211_hw *hw, int dBm)
@@ -2121,6 +2183,65 @@ static int mwl8k_cmd_rf_tx_power(struct ieee80211_hw *hw, int dBm)
 }
 
 /*
+ * CMD_TX_POWER.
+ */
+#define MWL8K_TX_POWER_LEVEL_TOTAL      12
+
+struct mwl8k_cmd_tx_power {
+        struct mwl8k_cmd_pkt header;
+        __le16 action;
+        __le16 band;
+        __le16 channel;
+        __le16 bw;
+        __le16 sub_ch;
+        __le16 power_level_list[MWL8K_TX_POWER_LEVEL_TOTAL];
+} __attribute__((packed));
+
+static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,
+                                     struct ieee80211_conf *conf,
+                                     unsigned short pwr)
+{
+        struct ieee80211_channel *channel = conf->channel;
+        struct mwl8k_cmd_tx_power *cmd;
+        int rc;
+        int i;
+
+        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
+        if (cmd == NULL)
+                return -ENOMEM;
+
+        cmd->header.code = cpu_to_le16(MWL8K_CMD_TX_POWER);
+        cmd->header.length = cpu_to_le16(sizeof(*cmd));
+        cmd->action = cpu_to_le16(MWL8K_CMD_SET_LIST);
+
+        if (channel->band == IEEE80211_BAND_2GHZ)
+                cmd->band = cpu_to_le16(0x1);
+        else if (channel->band == IEEE80211_BAND_5GHZ)
+                cmd->band = cpu_to_le16(0x4);
+
+        cmd->channel = channel->hw_value;
+
+        if (conf->channel_type == NL80211_CHAN_NO_HT ||
+            conf->channel_type == NL80211_CHAN_HT20) {
+                cmd->bw = cpu_to_le16(0x2);
+        } else {
+                cmd->bw = cpu_to_le16(0x4);
+                if (conf->channel_type == NL80211_CHAN_HT40MINUS)
+                        cmd->sub_ch = cpu_to_le16(0x3);
+                else if (conf->channel_type == NL80211_CHAN_HT40PLUS)
+                        cmd->sub_ch = cpu_to_le16(0x1);
+        }
+
+        for (i = 0; i < MWL8K_TX_POWER_LEVEL_TOTAL; i++)
+                cmd->power_level_list[i] = cpu_to_le16(pwr);
+
+        rc = mwl8k_post_cmd(hw, &cmd->header);
+        kfree(cmd);
+
+        return rc;
+}
+
+/*
  * CMD_RF_ANTENNA.
  */
 struct mwl8k_cmd_rf_antenna {
@@ -3288,13 +3409,16 @@ static void mwl8k_stop(struct ieee80211_hw *hw)
                 mwl8k_txq_reclaim(hw, i, INT_MAX, 1);
 }
 
+static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char *fw_image);
+
 static int mwl8k_add_interface(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif)
 {
         struct mwl8k_priv *priv = hw->priv;
         struct mwl8k_vif *mwl8k_vif;
         u32 macids_supported;
-        int macid;
+        int macid, rc;
+        struct mwl8k_device_info *di;
 
         /*
          * Reject interface creation if sniffer mode is active, as
@@ -3307,12 +3431,28 @@ static int mwl8k_add_interface(struct ieee80211_hw *hw,
                 return -EINVAL;
         }
 
-
+        di = priv->device_info;
         switch (vif->type) {
         case NL80211_IFTYPE_AP:
+                if (!priv->ap_fw && di->fw_image_ap) {
+                        /* we must load the ap fw to meet this request */
+                        if (!list_empty(&priv->vif_list))
+                                return -EBUSY;
+                        rc = mwl8k_reload_firmware(hw, di->fw_image_ap);
+                        if (rc)
+                                return rc;
+                }
                 macids_supported = priv->ap_macids_supported;
                 break;
         case NL80211_IFTYPE_STATION:
+                if (priv->ap_fw && di->fw_image_sta) {
+                        /* we must load the sta fw to meet this request */
+                        if (!list_empty(&priv->vif_list))
+                                return -EBUSY;
+                        rc = mwl8k_reload_firmware(hw, di->fw_image_sta);
+                        if (rc)
+                                return rc;
+                }
                 macids_supported = priv->sta_macids_supported;
                 break;
         default:
@@ -3382,15 +3522,19 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed)
 
         if (conf->power_level > 18)
                 conf->power_level = 18;
-        rc = mwl8k_cmd_rf_tx_power(hw, conf->power_level);
-        if (rc)
-                goto out;
 
         if (priv->ap_fw) {
+                rc = mwl8k_cmd_tx_power(hw, conf, conf->power_level);
+                if (rc)
+                        goto out;
+
                 rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_RX, 0x7);
                 if (!rc)
                         rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_TX, 0x7);
         } else {
+                rc = mwl8k_cmd_rf_tx_power(hw, conf->power_level);
+                if (rc)
+                        goto out;
                 rc = mwl8k_cmd_mimo_config(hw, 0x7, 0x7);
         }
 
@@ -3744,6 +3888,9 @@ static int mwl8k_conf_tx(struct ieee80211_hw *hw, u16 queue,
 
         rc = mwl8k_fw_lock(hw);
         if (!rc) {
+                BUG_ON(queue > MWL8K_TX_QUEUES - 1);
+                memcpy(&priv->wmm_params[queue], params, sizeof(*params));
+
                 if (!priv->wmm_enabled)
                         rc = mwl8k_cmd_set_wmm_mode(hw, 1);
 
@@ -3843,21 +3990,27 @@ enum {
         MWL8366,
 };
 
+#define MWL8K_8366_AP_FW_API 1
+#define _MWL8K_8366_AP_FW(api) "mwl8k/fmimage_8366_ap-" #api ".fw"
+#define MWL8K_8366_AP_FW(api) _MWL8K_8366_AP_FW(api)
+
 static struct mwl8k_device_info mwl8k_info_tbl[] __devinitdata = {
         [MWL8363] = {
                 .part_name      = "88w8363",
                 .helper_image   = "mwl8k/helper_8363.fw",
-                .fw_image       = "mwl8k/fmimage_8363.fw",
+                .fw_image_sta   = "mwl8k/fmimage_8363.fw",
         },
         [MWL8687] = {
                 .part_name      = "88w8687",
                 .helper_image   = "mwl8k/helper_8687.fw",
-                .fw_image       = "mwl8k/fmimage_8687.fw",
+                .fw_image_sta   = "mwl8k/fmimage_8687.fw",
         },
         [MWL8366] = {
                 .part_name      = "88w8366",
                 .helper_image   = "mwl8k/helper_8366.fw",
-                .fw_image       = "mwl8k/fmimage_8366.fw",
+                .fw_image_sta   = "mwl8k/fmimage_8366.fw",
+                .fw_image_ap    = MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API),
+                .fw_api_ap      = MWL8K_8366_AP_FW_API,
                 .ap_rxd_ops     = &rxd_8366_ap_ops,
         },
 };
@@ -3868,6 +4021,7 @@ MODULE_FIRMWARE("mwl8k/helper_8687.fw");
 MODULE_FIRMWARE("mwl8k/fmimage_8687.fw");
 MODULE_FIRMWARE("mwl8k/helper_8366.fw");
 MODULE_FIRMWARE("mwl8k/fmimage_8366.fw");
+MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API));
 
 static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
         { PCI_VDEVICE(MARVELL, 0x2a0a), .driver_data = MWL8363, },
@@ -3881,94 +4035,133 @@ static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = {
 };
 MODULE_DEVICE_TABLE(pci, mwl8k_pci_id_table);
 
-static int __devinit mwl8k_probe(struct pci_dev *pdev,
-                                 const struct pci_device_id *id)
+static int mwl8k_request_alt_fw(struct mwl8k_priv *priv)
 {
-        static int printed_version = 0;
-        struct ieee80211_hw *hw;
-        struct mwl8k_priv *priv;
         int rc;
-        int i;
-
-        if (!printed_version) {
-                printk(KERN_INFO "%s version %s\n", MWL8K_DESC, MWL8K_VERSION);
-                printed_version = 1;
-        }
-
-
-        rc = pci_enable_device(pdev);
+        printk(KERN_ERR "%s: Error requesting preferred fw %s.\n"
+               "Trying alternative firmware %s\n", pci_name(priv->pdev),
+               priv->fw_pref, priv->fw_alt);
+        rc = mwl8k_request_fw(priv, priv->fw_alt, &priv->fw_ucode, true);
         if (rc) {
-                printk(KERN_ERR "%s: Cannot enable new PCI device\n",
-                       MWL8K_NAME);
+                printk(KERN_ERR "%s: Error requesting alt fw %s\n",
+                       pci_name(priv->pdev), priv->fw_alt);
                 return rc;
         }
+        return 0;
+}
 
-        rc = pci_request_regions(pdev, MWL8K_NAME);
-        if (rc) {
-                printk(KERN_ERR "%s: Cannot obtain PCI resources\n",
-                       MWL8K_NAME);
-                goto err_disable_device;
-        }
-
-        pci_set_master(pdev);
-
-
-        hw = ieee80211_alloc_hw(sizeof(*priv), &mwl8k_ops);
-        if (hw == NULL) {
-                printk(KERN_ERR "%s: ieee80211 alloc failed\n", MWL8K_NAME);
-                rc = -ENOMEM;
-                goto err_free_reg;
-        }
+static int mwl8k_firmware_load_success(struct mwl8k_priv *priv);
+static void mwl8k_fw_state_machine(const struct firmware *fw, void *context)
+{
+        struct mwl8k_priv *priv = context;
+        struct mwl8k_device_info *di = priv->device_info;
+        int rc;
 
-        SET_IEEE80211_DEV(hw, &pdev->dev);
-        pci_set_drvdata(pdev, hw);
+        switch (priv->fw_state) {
+        case FW_STATE_INIT:
+                if (!fw) {
+                        printk(KERN_ERR "%s: Error requesting helper fw %s\n",
+                               pci_name(priv->pdev), di->helper_image);
+                        goto fail;
+                }
+                priv->fw_helper = fw;
+                rc = mwl8k_request_fw(priv, priv->fw_pref, &priv->fw_ucode,
+                                      true);
+                if (rc && priv->fw_alt) {
+                        rc = mwl8k_request_alt_fw(priv);
+                        if (rc)
+                                goto fail;
+                        priv->fw_state = FW_STATE_LOADING_ALT;
+                } else if (rc)
+                        goto fail;
+                else
+                        priv->fw_state = FW_STATE_LOADING_PREF;
+                break;
 
-        priv = hw->priv;
-        priv->hw = hw;
-        priv->pdev = pdev;
-        priv->device_info = &mwl8k_info_tbl[id->driver_data];
+        case FW_STATE_LOADING_PREF:
+                if (!fw) {
+                        if (priv->fw_alt) {
+                                rc = mwl8k_request_alt_fw(priv);
+                                if (rc)
+                                        goto fail;
+                                priv->fw_state = FW_STATE_LOADING_ALT;
+                        } else
+                                goto fail;
+                } else {
+                        priv->fw_ucode = fw;
+                        rc = mwl8k_firmware_load_success(priv);
+                        if (rc)
+                                goto fail;
+                        else
+                                complete(&priv->firmware_loading_complete);
+                }
+                break;
 
+        case FW_STATE_LOADING_ALT:
+                if (!fw) {
+                        printk(KERN_ERR "%s: Error requesting alt fw %s\n",
+                               pci_name(priv->pdev), di->helper_image);
+                        goto fail;
+                }
+                priv->fw_ucode = fw;
+                rc = mwl8k_firmware_load_success(priv);
+                if (rc)
+                        goto fail;
+                else
+                        complete(&priv->firmware_loading_complete);
+                break;
 
-        priv->sram = pci_iomap(pdev, 0, 0x10000);
-        if (priv->sram == NULL) {
-                wiphy_err(hw->wiphy, "Cannot map device SRAM\n");
-                goto err_iounmap;
+        default:
+                printk(KERN_ERR "%s: Unexpected firmware loading state: %d\n",
+                       MWL8K_NAME, priv->fw_state);
+                BUG_ON(1);
         }
 
-        /*
-         * If BAR0 is a 32 bit BAR, the register BAR will be BAR1.
-         * If BAR0 is a 64 bit BAR, the register BAR will be BAR2.
-         */
-        priv->regs = pci_iomap(pdev, 1, 0x10000);
-        if (priv->regs == NULL) {
-                priv->regs = pci_iomap(pdev, 2, 0x10000);
-                if (priv->regs == NULL) {
-                        wiphy_err(hw->wiphy, "Cannot map device registers\n");
-                        goto err_iounmap;
-                }
-        }
+        return;
 
+fail:
+        priv->fw_state = FW_STATE_ERROR;
+        complete(&priv->firmware_loading_complete);
+        device_release_driver(&priv->pdev->dev);
+        mwl8k_release_firmware(priv);
+}
+
+static int mwl8k_init_firmware(struct ieee80211_hw *hw, char *fw_image,
+                               bool nowait)
+{
+        struct mwl8k_priv *priv = hw->priv;
+        int rc;
 
         /* Reset firmware and hardware */
         mwl8k_hw_reset(priv);
 
         /* Ask userland hotplug daemon for the device firmware */
-        rc = mwl8k_request_firmware(priv);
+        rc = mwl8k_request_firmware(priv, fw_image, nowait);
         if (rc) {
                 wiphy_err(hw->wiphy, "Firmware files not found\n");
-                goto err_stop_firmware;
+                return rc;
         }
 
+        if (nowait)
+                return rc;
+
         /* Load firmware into hardware */
         rc = mwl8k_load_firmware(hw);
-        if (rc) {
+        if (rc)
                 wiphy_err(hw->wiphy, "Cannot start firmware\n");
-                goto err_stop_firmware;
-        }
 
         /* Reclaim memory once firmware is successfully loaded */
         mwl8k_release_firmware(priv);
 
+        return rc;
+}
+
+/* initialize hw after successfully loading a firmware image */
+static int mwl8k_probe_hw(struct ieee80211_hw *hw)
+{
+        struct mwl8k_priv *priv = hw->priv;
+        int rc = 0;
+        int i;
 
         if (priv->ap_fw) {
                 priv->rxd_ops = priv->device_info->ap_rxd_ops;
@@ -3985,58 +4178,11 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
         priv->wmm_enabled = false;
         priv->pending_tx_pkts = 0;
 
-
-        /*
-         * Extra headroom is the size of the required DMA header
-         * minus the size of the smallest 802.11 frame (CTS frame).
-         */
-        hw->extra_tx_headroom =
-                sizeof(struct mwl8k_dma_data) - sizeof(struct ieee80211_cts);
-
-        hw->channel_change_time = 10;
-
-        hw->queues = MWL8K_TX_QUEUES;
-
-        /* Set rssi values to dBm */
-        hw->flags |= IEEE80211_HW_SIGNAL_DBM;
-        hw->vif_data_size = sizeof(struct mwl8k_vif);
-        hw->sta_data_size = sizeof(struct mwl8k_sta);
-
-        priv->macids_used = 0;
-        INIT_LIST_HEAD(&priv->vif_list);
-
-        /* Set default radio state and preamble */
-        priv->radio_on = 0;
-        priv->radio_short_preamble = 0;
-
-        /* Finalize join worker */
-        INIT_WORK(&priv->finalize_join_worker, mwl8k_finalize_join_worker);
-
-        /* TX reclaim and RX tasklets.  */
-        tasklet_init(&priv->poll_tx_task, mwl8k_tx_poll, (unsigned long)hw);
-        tasklet_disable(&priv->poll_tx_task);
-        tasklet_init(&priv->poll_rx_task, mwl8k_rx_poll, (unsigned long)hw);
-        tasklet_disable(&priv->poll_rx_task);
-
-        /* Power management cookie */
-        priv->cookie = pci_alloc_consistent(priv->pdev, 4, &priv->cookie_dma);
-        if (priv->cookie == NULL)
-                goto err_stop_firmware;
-
         rc = mwl8k_rxq_init(hw, 0);
         if (rc)
-                goto err_free_cookie;
+                goto err_stop_firmware;
         rxq_refill(hw, 0, INT_MAX);
 
-        mutex_init(&priv->fw_mutex);
-        priv->fw_mutex_owner = NULL;
-        priv->fw_mutex_depth = 0;
-        priv->hostcmd_wait = NULL;
-
-        spin_lock_init(&priv->tx_lock);
-
-        priv->tx_wait = NULL;
-
         for (i = 0; i < MWL8K_TX_QUEUES; i++) {
                 rc = mwl8k_txq_init(hw, i);
                 if (rc)
@@ -4076,13 +4222,6 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
                 goto err_free_irq;
         }
 
-        hw->wiphy->interface_modes = 0;
-        if (priv->ap_macids_supported)
-                hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP);
-        if (priv->sta_macids_supported)
-                hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_STATION);
-
-
         /* Turn radio off */
         rc = mwl8k_cmd_radio_disable(hw);
         if (rc) {
@@ -4101,12 +4240,6 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
         iowrite32(0, priv->regs + MWL8K_HIU_A2H_INTERRUPT_MASK);
         free_irq(priv->pdev->irq, hw);
 
-        rc = ieee80211_register_hw(hw);
-        if (rc) {
-                wiphy_err(hw->wiphy, "Cannot register device\n");
-                goto err_free_queues;
-        }
-
         wiphy_info(hw->wiphy, "%s v%d, %pm, %s firmware %u.%u.%u.%u\n",
                    priv->device_info->part_name,
                    priv->hw_rev, hw->wiphy->perm_addr,
@@ -4125,14 +4258,238 @@ err_free_queues:
                 mwl8k_txq_deinit(hw, i);
         mwl8k_rxq_deinit(hw, 0);
 
+err_stop_firmware:
+        mwl8k_hw_reset(priv);
+
+        return rc;
+}
+
+/*
+ * invoke mwl8k_reload_firmware to change the firmware image after the device
+ * has already been registered
+ */
+static int mwl8k_reload_firmware(struct ieee80211_hw *hw, char *fw_image)
+{
+        int i, rc = 0;
+        struct mwl8k_priv *priv = hw->priv;
+
+        mwl8k_stop(hw);
+        mwl8k_rxq_deinit(hw, 0);
+
+        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+                mwl8k_txq_deinit(hw, i);
+
+        rc = mwl8k_init_firmware(hw, fw_image, false);
+        if (rc)
+                goto fail;
+
+        rc = mwl8k_probe_hw(hw);
+        if (rc)
+                goto fail;
+
+        rc = mwl8k_start(hw);
+        if (rc)
+                goto fail;
+
+        rc = mwl8k_config(hw, ~0);
+        if (rc)
+                goto fail;
+
+        for (i = 0; i < MWL8K_TX_QUEUES; i++) {
+                rc = mwl8k_conf_tx(hw, i, &priv->wmm_params[i]);
+                if (rc)
+                        goto fail;
+        }
+
+        return rc;
+
+fail:
+        printk(KERN_WARNING "mwl8k: Failed to reload firmware image.\n");
+        return rc;
+}
+
+static int mwl8k_firmware_load_success(struct mwl8k_priv *priv)
+{
+        struct ieee80211_hw *hw = priv->hw;
+        int i, rc;
+
+        rc = mwl8k_load_firmware(hw);
+        mwl8k_release_firmware(priv);
+        if (rc) {
+                wiphy_err(hw->wiphy, "Cannot start firmware\n");
+                return rc;
+        }
+
+        /*
+         * Extra headroom is the size of the required DMA header
+         * minus the size of the smallest 802.11 frame (CTS frame).
+         */
+        hw->extra_tx_headroom =
+                sizeof(struct mwl8k_dma_data) - sizeof(struct ieee80211_cts);
+
+        hw->channel_change_time = 10;
+
+        hw->queues = MWL8K_TX_QUEUES;
+
+        /* Set rssi values to dBm */
+        hw->flags |= IEEE80211_HW_SIGNAL_DBM;
+        hw->vif_data_size = sizeof(struct mwl8k_vif);
+        hw->sta_data_size = sizeof(struct mwl8k_sta);
+
+        priv->macids_used = 0;
+        INIT_LIST_HEAD(&priv->vif_list);
+
+        /* Set default radio state and preamble */
+        priv->radio_on = 0;
+        priv->radio_short_preamble = 0;
+
+        /* Finalize join worker */
+        INIT_WORK(&priv->finalize_join_worker, mwl8k_finalize_join_worker);
+
+        /* TX reclaim and RX tasklets.  */
+        tasklet_init(&priv->poll_tx_task, mwl8k_tx_poll, (unsigned long)hw);
+        tasklet_disable(&priv->poll_tx_task);
+        tasklet_init(&priv->poll_rx_task, mwl8k_rx_poll, (unsigned long)hw);
+        tasklet_disable(&priv->poll_rx_task);
+
+        /* Power management cookie */
+        priv->cookie = pci_alloc_consistent(priv->pdev, 4, &priv->cookie_dma);
+        if (priv->cookie == NULL)
+                return -ENOMEM;
+
+        mutex_init(&priv->fw_mutex);
+        priv->fw_mutex_owner = NULL;
+        priv->fw_mutex_depth = 0;
+        priv->hostcmd_wait = NULL;
+
+        spin_lock_init(&priv->tx_lock);
+
+        priv->tx_wait = NULL;
+
+        rc = mwl8k_probe_hw(hw);
+        if (rc)
+                goto err_free_cookie;
+
+        hw->wiphy->interface_modes = 0;
+        if (priv->ap_macids_supported || priv->device_info->fw_image_ap)
+                hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP);
+        if (priv->sta_macids_supported || priv->device_info->fw_image_sta)
+                hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_STATION);
+
+        rc = ieee80211_register_hw(hw);
+        if (rc) {
+                wiphy_err(hw->wiphy, "Cannot register device\n");
+                goto err_unprobe_hw;
+        }
+
+        return 0;
+
+err_unprobe_hw:
+        for (i = 0; i < MWL8K_TX_QUEUES; i++)
+                mwl8k_txq_deinit(hw, i);
+        mwl8k_rxq_deinit(hw, 0);
+
 err_free_cookie:
         if (priv->cookie != NULL)
                 pci_free_consistent(priv->pdev, 4,
                                 priv->cookie, priv->cookie_dma);
 
+        return rc;
+}
+static int __devinit mwl8k_probe(struct pci_dev *pdev,
+                                 const struct pci_device_id *id)
+{
+        static int printed_version;
+        struct ieee80211_hw *hw;
+        struct mwl8k_priv *priv;
+        struct mwl8k_device_info *di;
+        int rc;
+
+        if (!printed_version) {
+                printk(KERN_INFO "%s version %s\n", MWL8K_DESC, MWL8K_VERSION);
+                printed_version = 1;
+        }
+
+
+        rc = pci_enable_device(pdev);
+        if (rc) {
+                printk(KERN_ERR "%s: Cannot enable new PCI device\n",
+                       MWL8K_NAME);
+                return rc;
+        }
+
+        rc = pci_request_regions(pdev, MWL8K_NAME);
+        if (rc) {
+                printk(KERN_ERR "%s: Cannot obtain PCI resources\n",
+                       MWL8K_NAME);
+                goto err_disable_device;
+        }
+
+        pci_set_master(pdev);
+
+
+        hw = ieee80211_alloc_hw(sizeof(*priv), &mwl8k_ops);
+        if (hw == NULL) {
+                printk(KERN_ERR "%s: ieee80211 alloc failed\n", MWL8K_NAME);
+                rc = -ENOMEM;
+                goto err_free_reg;
+        }
+
+        SET_IEEE80211_DEV(hw, &pdev->dev);
+        pci_set_drvdata(pdev, hw);
+
+        priv = hw->priv;
+        priv->hw = hw;
+        priv->pdev = pdev;
+        priv->device_info = &mwl8k_info_tbl[id->driver_data];
+
+
+        priv->sram = pci_iomap(pdev, 0, 0x10000);
+        if (priv->sram == NULL) {
+                wiphy_err(hw->wiphy, "Cannot map device SRAM\n");
+                goto err_iounmap;
+        }
+
+        /*
+         * If BAR0 is a 32 bit BAR, the register BAR will be BAR1.
+         * If BAR0 is a 64 bit BAR, the register BAR will be BAR2.
+         */
+        priv->regs = pci_iomap(pdev, 1, 0x10000);
+        if (priv->regs == NULL) {
+                priv->regs = pci_iomap(pdev, 2, 0x10000);
+                if (priv->regs == NULL) {
+                        wiphy_err(hw->wiphy, "Cannot map device registers\n");
+                        goto err_iounmap;
+                }
+        }
+
+        /*
+         * Choose the initial fw image depending on user input.  If a second
+         * image is available, make it the alternative image that will be
+         * loaded if the first one fails.
+         */
+        init_completion(&priv->firmware_loading_complete);
+        di = priv->device_info;
+        if (ap_mode_default && di->fw_image_ap) {
+                priv->fw_pref = di->fw_image_ap;
+                priv->fw_alt = di->fw_image_sta;
+        } else if (!ap_mode_default && di->fw_image_sta) {
+                priv->fw_pref = di->fw_image_sta;
+                priv->fw_alt = di->fw_image_ap;
+        } else if (ap_mode_default && !di->fw_image_ap && di->fw_image_sta) {
+                printk(KERN_WARNING "AP fw is unavailable.  Using STA fw.");
+                priv->fw_pref = di->fw_image_sta;
+        } else if (!ap_mode_default && !di->fw_image_sta && di->fw_image_ap) {
+                printk(KERN_WARNING "STA fw is unavailable.  Using AP fw.");
+                priv->fw_pref = di->fw_image_ap;
+        }
+        rc = mwl8k_init_firmware(hw, priv->fw_pref, true);
+        if (rc)
+                goto err_stop_firmware;
+        return rc;
+
 err_stop_firmware:
         mwl8k_hw_reset(priv);
-        mwl8k_release_firmware(priv);
 
 err_iounmap:
         if (priv->regs != NULL)
@@ -4168,6 +4525,13 @@ static void __devexit mwl8k_remove(struct pci_dev *pdev)
                 return;
         priv = hw->priv;
 
+        wait_for_completion(&priv->firmware_loading_complete);
+
+        if (priv->fw_state == FW_STATE_ERROR) {
+                mwl8k_hw_reset(priv);
+                goto unmap;
+        }
+
         ieee80211_stop_queues(hw);
 
         ieee80211_unregister_hw(hw);
@@ -4190,6 +4554,7 @@ static void __devexit mwl8k_remove(struct pci_dev *pdev)
 
         pci_free_consistent(priv->pdev, 4, priv->cookie, priv->cookie_dma);
 
+unmap:
         pci_iounmap(pdev, priv->regs);
         pci_iounmap(pdev, priv->sram);
         pci_set_drvdata(pdev, NULL);
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 97007d9e2c1..2b1cbba90a8 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2286,8 +2286,8 @@ static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len)
         struct ethhdr *peth;
         UCHAR srcaddr[ADDRLEN];
         UCHAR destaddr[ADDRLEN];
-        static UCHAR org_bridge[3] = { 0, 0, 0xf8 };
-        static UCHAR org_1042[3] = { 0, 0, 0 };
+        static const UCHAR org_bridge[3] = { 0, 0, 0xf8 };
+        static const UCHAR org_1042[3] = { 0, 0, 0 };
 
         memcpy(destaddr, ieee80211_get_DA(pmac), ADDRLEN);
         memcpy(srcaddr, ieee80211_get_SA(pmac), ADDRLEN);
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 71b5971da59..19f3d568f70 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -156,6 +156,12 @@ MODULE_PARM_DESC(workaround_interval,
 #define RNDIS_STATUS_ADAPTER_NOT_OPEN           cpu_to_le32(0xc0010012)
 
 
+/* Known device types */
+#define RNDIS_UNKNOWN   0
+#define RNDIS_BCM4320A  1
+#define RNDIS_BCM4320B  2
+
+
 /* NDIS data structures. Taken from wpa_supplicant driver_ndis.c
  * slightly modified for datatype endianess, etc
  */
@@ -478,6 +484,7 @@ struct rndis_wlan_private {
         struct ieee80211_rate rates[ARRAY_SIZE(rndis_rates)];
         u32 cipher_suites[ARRAY_SIZE(rndis_cipher_suites)];
 
+        int device_type;
         int caps;
         int multicast_size;
 
@@ -810,7 +817,8 @@ exit_unlock:
         return ret;
 }
 
-static int rndis_set_oid(struct usbnet *dev, __le32 oid, void *data, int len)
+static int rndis_set_oid(struct usbnet *dev, __le32 oid, const void *data,
+                         int len)
 {
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(dev);
         union {
@@ -994,7 +1002,18 @@ static int level_to_qual(int level)
  */
 static int set_infra_mode(struct usbnet *usbdev, int mode);
 static void restore_keys(struct usbnet *usbdev);
-static int rndis_check_bssid_list(struct usbnet *usbdev);
+static int rndis_check_bssid_list(struct usbnet *usbdev, u8 *match_bssid,
+                                        bool *matched);
+
+static int rndis_start_bssid_list_scan(struct usbnet *usbdev)
+{
+        __le32 tmp;
+
+        /* Note: OID_802_11_BSSID_LIST_SCAN clears internal BSS list. */
+        tmp = cpu_to_le32(1);
+        return rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
+                                                        sizeof(tmp));
+}
 
 static int set_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
 {
@@ -1015,7 +1034,7 @@ static int set_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
         return ret;
 }
 
-static int set_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
+static int set_bssid(struct usbnet *usbdev, const u8 *bssid)
 {
         int ret;
 
@@ -1031,7 +1050,9 @@ static int set_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
 
 static int clear_bssid(struct usbnet *usbdev)
 {
-        u8 broadcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+        static const u8 broadcast_mac[ETH_ALEN] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
 
         return set_bssid(usbdev, broadcast_mac);
 }
@@ -1904,14 +1925,14 @@ static int rndis_scan(struct wiphy *wiphy, struct net_device *dev,
         struct usbnet *usbdev = netdev_priv(dev);
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
         int ret;
-        __le32 tmp;
+        int delay = SCAN_DELAY_JIFFIES;
 
         netdev_dbg(usbdev->net, "cfg80211.scan\n");
 
         /* Get current bssid list from device before new scan, as new scan
          * clears internal bssid list.
          */
-        rndis_check_bssid_list(usbdev);
+        rndis_check_bssid_list(usbdev, NULL, NULL);
 
         if (!request)
                 return -EINVAL;
@@ -1921,13 +1942,13 @@ static int rndis_scan(struct wiphy *wiphy, struct net_device *dev,
 
         priv->scan_request = request;
 
-        tmp = cpu_to_le32(1);
-        ret = rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
-                                                        sizeof(tmp));
+        ret = rndis_start_bssid_list_scan(usbdev);
         if (ret == 0) {
+                if (priv->device_type == RNDIS_BCM4320A)
+                        delay = HZ;
+
                 /* Wait before retrieving scan results from device */
-                queue_delayed_work(priv->workqueue, &priv->scan_work,
-                        SCAN_DELAY_JIFFIES);
+                queue_delayed_work(priv->workqueue, &priv->scan_work, delay);
         }
 
         return ret;
@@ -1981,7 +2002,8 @@ static struct cfg80211_bss *rndis_bss_info_update(struct usbnet *usbdev,
                 GFP_KERNEL);
 }
 
-static int rndis_check_bssid_list(struct usbnet *usbdev)
+static int rndis_check_bssid_list(struct usbnet *usbdev, u8 *match_bssid,
+                                        bool *matched)
 {
         void *buf = NULL;
         struct ndis_80211_bssid_list_ex *bssid_list;
@@ -2017,7 +2039,11 @@ resize_buf:
                    count, len);
 
         while (count && ((void *)bssid + bssid_len) <= (buf + len)) {
-                rndis_bss_info_update(usbdev, bssid);
+                if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&
+                    matched) {
+                        if (compare_ether_addr(bssid->mac, match_bssid))
+                                *matched = true;
+                }
 
                 bssid = (void *)bssid + bssid_len;
                 bssid_len = le32_to_cpu(bssid->length);
@@ -2041,7 +2067,7 @@ static void rndis_get_scan_results(struct work_struct *work)
         if (!priv->scan_request)
                 return;
 
-        ret = rndis_check_bssid_list(usbdev);
+        ret = rndis_check_bssid_list(usbdev, NULL, NULL);
 
         cfg80211_scan_done(priv->scan_request, ret < 0);
 
@@ -2495,6 +2521,91 @@ static int rndis_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
         return rndis_set_oid(usbdev, OID_802_11_PMKID, &pmkid, sizeof(pmkid));
 }
 
+static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
+                                           struct ndis_80211_assoc_info *info)
+{
+        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+        struct ieee80211_channel *channel;
+        struct ndis_80211_conf config;
+        struct ndis_80211_ssid ssid;
+        s32 signal;
+        u64 timestamp;
+        u16 capability;
+        u16 beacon_interval;
+        __le32 rssi;
+        u8 ie_buf[34];
+        int len, ret, ie_len;
+
+        /* Get signal quality, in case of error use rssi=0 and ignore error. */
+        len = sizeof(rssi);
+        rssi = 0;
+        ret = rndis_query_oid(usbdev, OID_802_11_RSSI, &rssi, &len);
+        signal = level_to_qual(le32_to_cpu(rssi));
+
+        netdev_dbg(usbdev->net, "%s(): OID_802_11_RSSI -> %d, "
+                   "rssi:%d, qual: %d\n", __func__, ret, le32_to_cpu(rssi),
+                   level_to_qual(le32_to_cpu(rssi)));
+
+        /* Get AP capabilities */
+        if (info) {
+                capability = le16_to_cpu(info->resp_ie.capa);
+        } else {
+                /* Set atleast ESS/IBSS capability */
+                capability = (priv->infra_mode == NDIS_80211_INFRA_INFRA) ?
+                                WLAN_CAPABILITY_ESS : WLAN_CAPABILITY_IBSS;
+        }
+
+        /* Get channel and beacon interval */
+        len = sizeof(config);
+        ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
+        netdev_dbg(usbdev->net, "%s(): OID_802_11_CONFIGURATION -> %d\n",
+                                __func__, ret);
+        if (ret >= 0) {
+                beacon_interval = le16_to_cpu(config.beacon_period);
+                channel = ieee80211_get_channel(priv->wdev.wiphy,
+                                KHZ_TO_MHZ(le32_to_cpu(config.ds_config)));
+                if (!channel) {
+                        netdev_warn(usbdev->net, "%s(): could not get channel."
+                                                 "\n", __func__);
+                        return;
+                }
+        } else {
+                netdev_warn(usbdev->net, "%s(): could not get configuration.\n",
+                                         __func__);
+                return;
+        }
+
+        /* Get SSID, in case of error, use zero length SSID and ignore error. */
+        len = sizeof(ssid);
+        memset(&ssid, 0, sizeof(ssid));
+        ret = rndis_query_oid(usbdev, OID_802_11_SSID, &ssid, &len);
+        netdev_dbg(usbdev->net, "%s(): OID_802_11_SSID -> %d, len: %d, ssid: "
+                                "'%.32s'\n", __func__, ret,
+                                le32_to_cpu(ssid.length), ssid.essid);
+
+        if (le32_to_cpu(ssid.length) > 32)
+                ssid.length = cpu_to_le32(32);
+
+        ie_buf[0] = WLAN_EID_SSID;
+        ie_buf[1] = le32_to_cpu(ssid.length);
+        memcpy(&ie_buf[2], ssid.essid, le32_to_cpu(ssid.length));
+
+        ie_len = le32_to_cpu(ssid.length) + 2;
+
+        /* no tsf */
+        timestamp = 0;
+
+        netdev_dbg(usbdev->net, "%s(): channel:%d(freq), bssid:[%pM], tsf:%d, "
+                "capa:%x, beacon int:%d, resp_ie(len:%d, essid:'%.32s'), "
+                "signal:%d\n", __func__, (channel ? channel->center_freq : -1),
+                bssid, (u32)timestamp, capability, beacon_interval, ie_len,
+                ssid.essid, signal);
+
+        cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid,
+                timestamp, capability, beacon_interval, ie_buf, ie_len,
+                signal, GFP_KERNEL);
+}
+
 /*
  * workers, indication handlers, device poller
  */
@@ -2507,6 +2618,7 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
         u8 *req_ie, *resp_ie;
         int ret, offset;
         bool roamed = false;
+        bool match_bss;
 
         if (priv->infra_mode == NDIS_80211_INFRA_INFRA && priv->connected) {
                 /* received media connect indication while connected, either
@@ -2558,6 +2670,13 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
                                         resp_ie_len =
                                                 CONTROL_BUFFER_SIZE - offset;
                         }
+                } else {
+                        /* Since rndis_wlan_craft_connected_bss() might use info
+                         * later and expects info to contain valid data if
+                         * non-null, free info and set NULL here.
+                         */
+                        kfree(info);
+                        info = NULL;
                 }
         } else if (WARN_ON(priv->infra_mode != NDIS_80211_INFRA_ADHOC))
                 return;
@@ -2569,13 +2688,26 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
         netdev_dbg(usbdev->net, "link up work: [%pM]%s\n",
                    bssid, roamed ? " roamed" : "");
 
-        /* Internal bss list in device always contains at least the currently
+        /* Internal bss list in device should contain at least the currently
          * connected bss and we can get it to cfg80211 with
          * rndis_check_bssid_list().
-         * NOTE: This is true for Broadcom chip, but not mentioned in RNDIS
-         * spec.
+         *
+         * NDIS spec says: "If the device is associated, but the associated
+         *  BSSID is not in its BSSID scan list, then the driver must add an
+         *  entry for the BSSID at the end of the data that it returns in
+         *  response to query of OID_802_11_BSSID_LIST."
+         *
+         * NOTE: Seems to be true for BCM4320b variant, but not BCM4320a.
          */
-        rndis_check_bssid_list(usbdev);
+        match_bss = false;
+        rndis_check_bssid_list(usbdev, bssid, &match_bss);
+
+        if (!is_zero_ether_addr(bssid) && !match_bss) {
+                /* Couldn't get bss from device, we need to manually craft bss
+                 * for cfg80211.
+                 */
+                rndis_wlan_craft_connected_bss(usbdev, bssid, info);
+        }
 
         if (priv->infra_mode == NDIS_80211_INFRA_INFRA) {
                 if (!roamed)
@@ -2934,8 +3066,21 @@ static void rndis_device_poller(struct work_struct *work)
          * also polls device with rndis_command() and catches for media link
          * indications.
          */
-        if (!is_associated(usbdev))
+        if (!is_associated(usbdev)) {
+                /* Workaround bad scanning in BCM4320a devices with active
+                 * background scanning when not associated.
+                 */
+                if (priv->device_type == RNDIS_BCM4320A && priv->radio_on &&
+                    !priv->scan_request) {
+                        /* Get previous scan results */
+                        rndis_check_bssid_list(usbdev, NULL, NULL);
+
+                        /* Initiate new scan */
+                        rndis_start_bssid_list_scan(usbdev);
+                }
+
                 goto end;
+        }
 
         len = sizeof(rssi);
         ret = rndis_query_oid(usbdev, OID_802_11_RSSI, &rssi, &len);
@@ -2992,10 +3137,12 @@ end:
 /*
  * driver/device initialization
  */
-static void rndis_copy_module_params(struct usbnet *usbdev)
+static void rndis_copy_module_params(struct usbnet *usbdev, int device_type)
 {
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
 
+        priv->device_type = device_type;
+
         priv->param_country[0] = modparam_country[0];
         priv->param_country[1] = modparam_country[1];
         priv->param_country[2] = 0;
@@ -3038,12 +3185,25 @@ static void rndis_copy_module_params(struct usbnet *usbdev)
                 priv->param_workaround_interval = modparam_workaround_interval;
 }
 
+static int unknown_early_init(struct usbnet *usbdev)
+{
+        /* copy module parameters for unknown so that iwconfig reports txpower
+         * and workaround parameter is copied to private structure correctly.
+         */
+        rndis_copy_module_params(usbdev, RNDIS_UNKNOWN);
+
+        /* This is unknown device, so do not try set configuration parameters.
+         */
+
+        return 0;
+}
+
 static int bcm4320a_early_init(struct usbnet *usbdev)
 {
         /* copy module parameters for bcm4320a so that iwconfig reports txpower
          * and workaround parameter is copied to private structure correctly.
          */
-        rndis_copy_module_params(usbdev);
+        rndis_copy_module_params(usbdev, RNDIS_BCM4320A);
 
         /* bcm4320a doesn't handle configuration parameters well. Try
          * set any and you get partially zeroed mac and broken device.
@@ -3057,7 +3217,7 @@ static int bcm4320b_early_init(struct usbnet *usbdev)
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
         char buf[8];
 
-        rndis_copy_module_params(usbdev);
+        rndis_copy_module_params(usbdev, RNDIS_BCM4320B);
 
         /* Early initialization settings, setting these won't have effect
          * if called after generic_rndis_bind().
@@ -3320,7 +3480,7 @@ static const struct driver_info rndis_wlan_info = {
         .tx_fixup =     rndis_tx_fixup,
         .reset =        rndis_wlan_reset,
         .stop =         rndis_wlan_stop,
-        .early_init =   bcm4320a_early_init,
+        .early_init =   unknown_early_init,
         .indication =   rndis_wlan_indication,
 };
 
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index 4396d4b9bfb..6f383cd684b 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -53,51 +53,41 @@ config RT61PCI
 
           When compiled as a module, this driver will be called rt61pci.
 
-config RT2800PCI_PCI
-        boolean
-        depends on PCI
-        default y
-
-config RT2800PCI_SOC
-        boolean
-        depends on RALINK_RT288X || RALINK_RT305X
-        default y
-
 config RT2800PCI
-        tristate "Ralink rt28xx/rt30xx/rt35xx (PCI/PCIe/PCMCIA) support (EXPERIMENTAL)"
-        depends on (RT2800PCI_PCI || RT2800PCI_SOC) && EXPERIMENTAL
+        tristate "Ralink rt27xx/rt28xx/rt30xx (PCI/PCIe/PCMCIA) support"
+        depends on PCI || RALINK_RT288X || RALINK_RT305X
         select RT2800_LIB
-        select RT2X00_LIB_PCI if RT2800PCI_PCI
-        select RT2X00_LIB_SOC if RT2800PCI_SOC
+        select RT2X00_LIB_PCI if PCI
+        select RT2X00_LIB_SOC if RALINK_RT288X || RALINK_RT305X
         select RT2X00_LIB_HT
         select RT2X00_LIB_FIRMWARE
         select RT2X00_LIB_CRYPTO
         select CRC_CCITT
         select EEPROM_93CX6
         ---help---
-          This adds support for rt2800/rt3000/rt3500 wireless chipset family.
-          Supported chips: RT2760, RT2790, RT2860, RT2880, RT2890 & RT3052
-
-          This driver is non-functional at the moment and is intended for
-          developers.
+          This adds support for rt27xx/rt28xx/rt30xx wireless chipset family.
+          Supported chips: RT2760, RT2790, RT2860, RT2880, RT2890, RT3052,
+                           RT3090, RT3091 & RT3092
 
           When compiled as a module, this driver will be called "rt2800pci.ko".
 
 if RT2800PCI
 
-config RT2800PCI_RT30XX
-        bool "rt2800pci - Include support for rt30xx (PCI/PCIe/PCMCIA) devices"
-        default y
+config RT2800PCI_RT33XX
+        bool "rt2800pci - Include support for rt33xx devices (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        default n
         ---help---
-          This adds support for rt30xx wireless chipset family to the
+          This adds support for rt33xx wireless chipset family to the
           rt2800pci driver.
-          Supported chips: RT3090, RT3091 & RT3092
+          Supported chips: RT3390
 
           Support for these devices is non-functional at the moment and is
           intended for testers and developers.
 
 config RT2800PCI_RT35XX
-        bool "rt2800pci - Include support for rt35xx (PCI/PCIe/PCMCIA) devices"
+        bool "rt2800pci - Include support for rt35xx devices (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
         default n
         ---help---
           This adds support for rt35xx wireless chipset family to the
@@ -134,8 +124,8 @@ config RT73USB
           When compiled as a module, this driver will be called rt73usb.
 
 config RT2800USB
-        tristate "Ralink rt2800 (USB) support (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
+        tristate "Ralink rt27xx/rt28xx/rt30xx (USB) support"
+        depends on USB
         select RT2800_LIB
         select RT2X00_LIB_USB
         select RT2X00_LIB_HT
@@ -143,30 +133,28 @@ config RT2800USB
         select RT2X00_LIB_CRYPTO
         select CRC_CCITT
         ---help---
-          This adds experimental support for rt2800 wireless chipset family.
-          Supported chips: RT2770, RT2870 & RT3070.
-
-          Known issues:
-          - support for RT2870 chips doesn't work with 802.11n APs yet
-          - support for RT3070 chips is non-functional at the moment
+          This adds support for rt27xx/rt28xx/rt30xx wireless chipset family.
+          Supported chips: RT2770, RT2870 & RT3070, RT3071 & RT3072
 
           When compiled as a module, this driver will be called "rt2800usb.ko".
 
 if RT2800USB
 
-config RT2800USB_RT30XX
-        bool "rt2800usb - Include support for rt30xx (USB) devices"
-        default y
+config RT2800USB_RT33XX
+        bool "rt2800usb - Include support for rt33xx devices (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        default n
         ---help---
-          This adds support for rt30xx wireless chipset family to the
+          This adds support for rt33xx wireless chipset family to the
           rt2800usb driver.
-          Supported chips: RT3070, RT3071 & RT3072
+          Supported chips: RT3370
 
           Support for these devices is non-functional at the moment and is
           intended for testers and developers.
 
 config RT2800USB_RT35XX
-        bool "rt2800usb - Include support for rt35xx (USB) devices"
+        bool "rt2800usb - Include support for rt35xx devices (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
         default n
         ---help---
           This adds support for rt35xx wireless chipset family to the
@@ -180,9 +168,9 @@ config RT2800USB_UNKNOWN
         bool "rt2800usb - Include support for unknown (USB) devices"
         default n
         ---help---
-          This adds support for rt2800 family devices that are known to
-          have a rt2800 family chipset, but for which the exact chipset
-          is unknown.
+          This adds support for rt2800usb devices that are known to
+          have a rt28xx family compatible chipset, but for which the exact
+          chipset is unknown.
 
           Support status for these devices is unknown, and enabling these
           devices may or may not work.
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index 002224c9bb6..a81c4371835 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -47,6 +47,7 @@
  * RF3021 2.4G 1T2R
  * RF3022 2.4G 2T2R
  * RF3052 2.4G 2T2R
+ * RF3320 2.4G 1T1R
  */
 #define RF2820                          0x0001
 #define RF2850                          0x0002
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index b5d2ebab6ea..75631614aba 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1544,7 +1544,8 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
             rt2x00_rf(rt2x00dev, RF3020) ||
             rt2x00_rf(rt2x00dev, RF3021) ||
             rt2x00_rf(rt2x00dev, RF3022) ||
-            rt2x00_rf(rt2x00dev, RF3052))
+            rt2x00_rf(rt2x00dev, RF3052) ||
+            rt2x00_rf(rt2x00dev, RF3320))
                 rt2800_config_channel_rf3xxx(rt2x00dev, conf, rf, info);
         else
                 rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
@@ -2165,7 +2166,7 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
                                          SHARED_KEY_MODE_ENTRY(i), 0);
 
         for (i = 0; i < 256; i++) {
-                u32 wcid[2] = { 0xffffffff, 0x00ffffff };
+                static const u32 wcid[2] = { 0xffffffff, 0x00ffffff };
                 rt2800_register_multiwrite(rt2x00dev, MAC_WCID_ENTRY(i),
                                               wcid, sizeof(wcid));
 
@@ -3012,7 +3013,8 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
             !rt2x00_rf(rt2x00dev, RF2020) &&
             !rt2x00_rf(rt2x00dev, RF3021) &&
             !rt2x00_rf(rt2x00dev, RF3022) &&
-            !rt2x00_rf(rt2x00dev, RF3052)) {
+            !rt2x00_rf(rt2x00dev, RF3052) &&
+            !rt2x00_rf(rt2x00dev, RF3320)) {
                 ERROR(rt2x00dev, "Invalid RF chipset detected.\n");
                 return -ENODEV;
         }
@@ -3276,7 +3278,8 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         } else if (rt2x00_rf(rt2x00dev, RF3020) ||
                    rt2x00_rf(rt2x00dev, RF2020) ||
                    rt2x00_rf(rt2x00dev, RF3021) ||
-                   rt2x00_rf(rt2x00dev, RF3022)) {
+                   rt2x00_rf(rt2x00dev, RF3022) ||
+                   rt2x00_rf(rt2x00dev, RF3320)) {
                 spec->num_channels = 14;
                 spec->channels = rf_vals_3x;
         } else if (rt2x00_rf(rt2x00dev, RF3052)) {
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index 5f3a018c088..433c7f3ef83 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -84,20 +84,22 @@ static void rt2800pci_mcu_status(struct rt2x00_dev *rt2x00dev, const u8 token)
         rt2800_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
 }
 
-#ifdef CONFIG_RT2800PCI_SOC
+#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
 static void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
 {
-        u32 *base_addr = (u32 *) KSEG1ADDR(0x1F040000); /* XXX for RT3052 */
+        void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE);
 
         memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
+
+        iounmap(base_addr);
 }
 #else
 static inline void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
 {
 }
-#endif /* CONFIG_RT2800PCI_SOC */
+#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */
 
-#ifdef CONFIG_RT2800PCI_PCI
+#ifdef CONFIG_PCI
 static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
 {
         struct rt2x00_dev *rt2x00dev = eeprom->data;
@@ -181,7 +183,7 @@ static inline int rt2800pci_efuse_detect(struct rt2x00_dev *rt2x00dev)
 static inline void rt2800pci_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev)
 {
 }
-#endif /* CONFIG_RT2800PCI_PCI */
+#endif /* CONFIG_PCI */
 
 /*
  * Firmware functions
@@ -1031,12 +1033,15 @@ static const struct rt2x00_ops rt2800pci_ops = {
 /*
  * RT2800pci module information.
  */
-#ifdef CONFIG_RT2800PCI_PCI
+#ifdef CONFIG_PCI
 static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
         { PCI_DEVICE(0x1814, 0x0601), PCI_DEVICE_DATA(&rt2800pci_ops) },
         { PCI_DEVICE(0x1814, 0x0681), PCI_DEVICE_DATA(&rt2800pci_ops) },
         { PCI_DEVICE(0x1814, 0x0701), PCI_DEVICE_DATA(&rt2800pci_ops) },
         { PCI_DEVICE(0x1814, 0x0781), PCI_DEVICE_DATA(&rt2800pci_ops) },
+        { PCI_DEVICE(0x1814, 0x3090), PCI_DEVICE_DATA(&rt2800pci_ops) },
+        { PCI_DEVICE(0x1814, 0x3091), PCI_DEVICE_DATA(&rt2800pci_ops) },
+        { PCI_DEVICE(0x1814, 0x3092), PCI_DEVICE_DATA(&rt2800pci_ops) },
         { PCI_DEVICE(0x1432, 0x7708), PCI_DEVICE_DATA(&rt2800pci_ops) },
         { PCI_DEVICE(0x1432, 0x7727), PCI_DEVICE_DATA(&rt2800pci_ops) },
         { PCI_DEVICE(0x1432, 0x7728), PCI_DEVICE_DATA(&rt2800pci_ops) },
@@ -1044,12 +1049,10 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
         { PCI_DEVICE(0x1432, 0x7748), PCI_DEVICE_DATA(&rt2800pci_ops) },
         { PCI_DEVICE(0x1432, 0x7758), PCI_DEVICE_DATA(&rt2800pci_ops) },
         { PCI_DEVICE(0x1432, 0x7768), PCI_DEVICE_DATA(&rt2800pci_ops) },
-        { PCI_DEVICE(0x1a3b, 0x1059), PCI_DEVICE_DATA(&rt2800pci_ops) },
-#ifdef CONFIG_RT2800PCI_RT30XX
-        { PCI_DEVICE(0x1814, 0x3090), PCI_DEVICE_DATA(&rt2800pci_ops) },
-        { PCI_DEVICE(0x1814, 0x3091), PCI_DEVICE_DATA(&rt2800pci_ops) },
-        { PCI_DEVICE(0x1814, 0x3092), PCI_DEVICE_DATA(&rt2800pci_ops) },
         { PCI_DEVICE(0x1462, 0x891a), PCI_DEVICE_DATA(&rt2800pci_ops) },
+        { PCI_DEVICE(0x1a3b, 0x1059), PCI_DEVICE_DATA(&rt2800pci_ops) },
+#ifdef CONFIG_RT2800PCI_RT33XX
+        { PCI_DEVICE(0x1814, 0x3390), PCI_DEVICE_DATA(&rt2800pci_ops) },
 #endif
 #ifdef CONFIG_RT2800PCI_RT35XX
         { PCI_DEVICE(0x1814, 0x3060), PCI_DEVICE_DATA(&rt2800pci_ops) },
@@ -1060,19 +1063,19 @@ static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
 #endif
         { 0, }
 };
-#endif /* CONFIG_RT2800PCI_PCI */
+#endif /* CONFIG_PCI */
 
 MODULE_AUTHOR(DRV_PROJECT);
 MODULE_VERSION(DRV_VERSION);
 MODULE_DESCRIPTION("Ralink RT2800 PCI & PCMCIA Wireless LAN driver.");
 MODULE_SUPPORTED_DEVICE("Ralink RT2860 PCI & PCMCIA chipset based cards");
-#ifdef CONFIG_RT2800PCI_PCI
+#ifdef CONFIG_PCI
 MODULE_FIRMWARE(FIRMWARE_RT2860);
 MODULE_DEVICE_TABLE(pci, rt2800pci_device_table);
-#endif /* CONFIG_RT2800PCI_PCI */
+#endif /* CONFIG_PCI */
 MODULE_LICENSE("GPL");
 
-#ifdef CONFIG_RT2800PCI_SOC
+#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
 static int rt2800soc_probe(struct platform_device *pdev)
 {
         return rt2x00soc_probe(pdev, &rt2800pci_ops);
@@ -1089,9 +1092,9 @@ static struct platform_driver rt2800soc_driver = {
         .suspend        = rt2x00soc_suspend,
         .resume         = rt2x00soc_resume,
 };
-#endif /* CONFIG_RT2800PCI_SOC */
+#endif /* CONFIG_RALINK_RT288X || CONFIG_RALINK_RT305X */
 
-#ifdef CONFIG_RT2800PCI_PCI
+#ifdef CONFIG_PCI
 static struct pci_driver rt2800pci_driver = {
         .name           = KBUILD_MODNAME,
         .id_table       = rt2800pci_device_table,
@@ -1100,21 +1103,21 @@ static struct pci_driver rt2800pci_driver = {
         .suspend        = rt2x00pci_suspend,
         .resume         = rt2x00pci_resume,
 };
-#endif /* CONFIG_RT2800PCI_PCI */
+#endif /* CONFIG_PCI */
 
 static int __init rt2800pci_init(void)
 {
         int ret = 0;
 
-#ifdef CONFIG_RT2800PCI_SOC
+#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
         ret = platform_driver_register(&rt2800soc_driver);
         if (ret)
                 return ret;
 #endif
-#ifdef CONFIG_RT2800PCI_PCI
+#ifdef CONFIG_PCI
         ret = pci_register_driver(&rt2800pci_driver);
         if (ret) {
-#ifdef CONFIG_RT2800PCI_SOC
+#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
                 platform_driver_unregister(&rt2800soc_driver);
 #endif
                 return ret;
@@ -1126,10 +1129,10 @@ static int __init rt2800pci_init(void)
 
 static void __exit rt2800pci_exit(void)
 {
-#ifdef CONFIG_RT2800PCI_PCI
+#ifdef CONFIG_PCI
         pci_unregister_driver(&rt2800pci_driver);
 #endif
-#ifdef CONFIG_RT2800PCI_SOC
+#if defined(CONFIG_RALINK_RT288X) || defined(CONFIG_RALINK_RT305X)
         platform_driver_unregister(&rt2800soc_driver);
 #endif
 }
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 389ecba8e89..935b76d3ce4 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -307,8 +307,14 @@ static void rt2800usb_write_tx_desc(struct queue_entry *entry,
          * Initialize TXINFO descriptor
          */
         rt2x00_desc_read(txi, 0, &word);
+
+        /*
+         * The size of TXINFO_W0_USB_DMA_TX_PKT_LEN is
+         * TXWI + 802.11 header + L2 pad + payload + pad,
+         * so need to decrease size of TXINFO and USB end pad.
+         */
         rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN,
-                           entry->skb->len - TXINFO_DESC_SIZE);
+                           entry->skb->len - TXINFO_DESC_SIZE - 4);
         rt2x00_set_field32(&word, TXINFO_W0_WIV,
                            !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags));
         rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2);
@@ -326,22 +332,29 @@ static void rt2800usb_write_tx_desc(struct queue_entry *entry,
         skbdesc->desc_len = TXINFO_DESC_SIZE + TXWI_DESC_SIZE;
 }
 
-/*
- * TX data initialization
- */
-static int rt2800usb_get_tx_data_len(struct queue_entry *entry)
+static void rt2800usb_write_tx_data(struct queue_entry *entry,
+                                        struct txentry_desc *txdesc)
 {
-        int length;
+        u8 padding_len;
 
         /*
-         * The length _must_ include 4 bytes padding,
-         * it should always be multiple of 4,
-         * but it must _not_ be a multiple of the USB packet size.
+         * pad(1~3 bytes) is added after each 802.11 payload.
+         * USB end pad(4 bytes) is added at each USB bulk out packet end.
+         * TX frame format is :
+         * | TXINFO | TXWI | 802.11 header | L2 pad | payload | pad | USB end pad |
+         *                 |<------------- tx_pkt_len ------------->|
          */
-        length = roundup(entry->skb->len + 4, 4);
-        length += (4 * !(length % entry->queue->usb_maxpacket));
+        rt2800_write_tx_data(entry, txdesc);
+        padding_len = roundup(entry->skb->len + 4, 4) - entry->skb->len;
+        memset(skb_put(entry->skb, padding_len), 0, padding_len);
+}
 
-        return length;
+/*
+ * TX data initialization
+ */
+static int rt2800usb_get_tx_data_len(struct queue_entry *entry)
+{
+        return entry->skb->len;
 }
 
 /*
@@ -579,7 +592,7 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {
         .link_tuner             = rt2800_link_tuner,
         .watchdog               = rt2800usb_watchdog,
         .write_tx_desc          = rt2800usb_write_tx_desc,
-        .write_tx_data          = rt2800_write_tx_data,
+        .write_tx_data          = rt2800usb_write_tx_data,
         .write_beacon           = rt2800_write_beacon,
         .get_tx_data_len        = rt2800usb_get_tx_data_len,
         .kick_tx_queue          = rt2x00usb_kick_tx_queue,
@@ -641,11 +654,19 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* Abocom */
         { USB_DEVICE(0x07b8, 0x2870), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x07b8, 0x2770), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x07b8, 0x3070), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x07b8, 0x3071), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x07b8, 0x3072), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x1482, 0x3c09), USB_DEVICE_DATA(&rt2800usb_ops) },
+        /* AirTies */
+        { USB_DEVICE(0x1eda, 0x2310), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Allwin */
         { USB_DEVICE(0x8516, 0x2070), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x8516, 0x2770), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x8516, 0x2870), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x8516, 0x3070), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x8516, 0x3071), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x8516, 0x3072), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Amit */
         { USB_DEVICE(0x15c5, 0x0008), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Askey */
@@ -654,8 +675,13 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x0b05, 0x1731), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0b05, 0x1732), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0b05, 0x1742), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0b05, 0x1784), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* AzureWave */
         { USB_DEVICE(0x13d3, 0x3247), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x13d3, 0x3273), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x13d3, 0x3305), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x13d3, 0x3307), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x13d3, 0x3321), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Belkin */
         { USB_DEVICE(0x050d, 0x8053), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x050d, 0x805c), USB_DEVICE_DATA(&rt2800usb_ops) },
@@ -666,6 +692,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x14b2, 0x3c06), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x14b2, 0x3c07), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x14b2, 0x3c09), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x14b2, 0x3c12), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x14b2, 0x3c23), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x14b2, 0x3c25), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x14b2, 0x3c27), USB_DEVICE_DATA(&rt2800usb_ops) },
@@ -674,17 +701,36 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x07aa, 0x002f), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x07aa, 0x003c), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x07aa, 0x003f), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x18c5, 0x0012), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* D-Link */
         { USB_DEVICE(0x07d1, 0x3c09), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x07d1, 0x3c0a), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x07d1, 0x3c0d), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x07d1, 0x3c0e), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x07d1, 0x3c0f), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x07d1, 0x3c11), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x07d1, 0x3c16), USB_DEVICE_DATA(&rt2800usb_ops) },
+        /* Draytek */
+        { USB_DEVICE(0x07fa, 0x7712), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Edimax */
+        { USB_DEVICE(0x7392, 0x7711), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x7392, 0x7717), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x7392, 0x7718), USB_DEVICE_DATA(&rt2800usb_ops) },
+        /* Encore */
+        { USB_DEVICE(0x203d, 0x1480), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x203d, 0x14a9), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* EnGenius */
         { USB_DEVICE(0x1740, 0x9701), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x1740, 0x9702), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1740, 0x9703), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1740, 0x9705), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1740, 0x9706), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1740, 0x9707), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1740, 0x9708), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1740, 0x9709), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Gigabyte */
         { USB_DEVICE(0x1044, 0x800b), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1044, 0x800d), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Hawking */
         { USB_DEVICE(0x0e66, 0x0001), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0e66, 0x0003), USB_DEVICE_DATA(&rt2800usb_ops) },
@@ -693,6 +739,10 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x0e66, 0x0013), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0e66, 0x0017), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0e66, 0x0018), USB_DEVICE_DATA(&rt2800usb_ops) },
+        /* I-O DATA */
+        { USB_DEVICE(0x04bb, 0x0945), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x04bb, 0x0947), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x04bb, 0x0948), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Linksys */
         { USB_DEVICE(0x1737, 0x0070), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x1737, 0x0071), USB_DEVICE_DATA(&rt2800usb_ops) },
@@ -700,17 +750,44 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x0789, 0x0162), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0789, 0x0163), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0789, 0x0164), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0789, 0x0166), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Motorola */
         { USB_DEVICE(0x100d, 0x9031), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* MSI */
+        { USB_DEVICE(0x0db0, 0x3820), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x3821), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x3822), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x3870), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x3871), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0db0, 0x6899), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x821a), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x822a), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x822b), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x822c), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x870a), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x871a), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x871b), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x871c), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0db0, 0x899a), USB_DEVICE_DATA(&rt2800usb_ops) },
+        /* Para */
+        { USB_DEVICE(0x20b8, 0x8888), USB_DEVICE_DATA(&rt2800usb_ops) },
+        /* Pegatron */
+        { USB_DEVICE(0x1d4d, 0x000c), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x1d4d, 0x000e), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Philips */
         { USB_DEVICE(0x0471, 0x200f), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Planex */
+        { USB_DEVICE(0x2019, 0xab25), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x2019, 0xed06), USB_DEVICE_DATA(&rt2800usb_ops) },
+        /* Quanta */
+        { USB_DEVICE(0x1a32, 0x0304), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Ralink */
+        { USB_DEVICE(0x148f, 0x2070), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x148f, 0x2770), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x148f, 0x2870), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x148f, 0x3070), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x148f, 0x3071), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x148f, 0x3072), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Samsung */
         { USB_DEVICE(0x04e8, 0x2018), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Siemens */
@@ -723,13 +800,22 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x0df6, 0x0039), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0df6, 0x003b), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0df6, 0x003d), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0df6, 0x003e), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x0df6, 0x003f), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0df6, 0x0040), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0df6, 0x0042), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0df6, 0x0047), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0df6, 0x0048), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* SMC */
         { USB_DEVICE(0x083a, 0x6618), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x083a, 0x7511), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x083a, 0x7512), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x083a, 0x7522), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x083a, 0x8522), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x083a, 0xa618), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x083a, 0xa701), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x083a, 0xa702), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x083a, 0xa703), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x083a, 0xb522), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Sparklan */
         { USB_DEVICE(0x15a9, 0x0006), USB_DEVICE_DATA(&rt2800usb_ops) },
@@ -743,101 +829,16 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* Zinwell */
         { USB_DEVICE(0x5a57, 0x0280), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x5a57, 0x0282), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x5a57, 0x0283), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x5a57, 0x5257), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Zyxel */
         { USB_DEVICE(0x0586, 0x3416), USB_DEVICE_DATA(&rt2800usb_ops) },
-#ifdef CONFIG_RT2800USB_RT30XX
-        /* Abocom */
-        { USB_DEVICE(0x07b8, 0x3070), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x07b8, 0x3071), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x07b8, 0x3072), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* AirTies */
-        { USB_DEVICE(0x1eda, 0x2310), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Allwin */
-        { USB_DEVICE(0x8516, 0x3070), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x8516, 0x3071), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x8516, 0x3072), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* ASUS */
-        { USB_DEVICE(0x0b05, 0x1784), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* AzureWave */
-        { USB_DEVICE(0x13d3, 0x3273), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x13d3, 0x3305), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x13d3, 0x3307), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x13d3, 0x3321), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Conceptronic */
-        { USB_DEVICE(0x14b2, 0x3c12), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Corega */
-        { USB_DEVICE(0x18c5, 0x0012), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* D-Link */
-        { USB_DEVICE(0x07d1, 0x3c0a), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x07d1, 0x3c0d), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x07d1, 0x3c0e), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x07d1, 0x3c0f), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x07d1, 0x3c16), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Draytek */
-        { USB_DEVICE(0x07fa, 0x7712), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Edimax */
-        { USB_DEVICE(0x7392, 0x7711), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Encore */
-        { USB_DEVICE(0x203d, 0x1480), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x203d, 0x14a9), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* EnGenius */
-        { USB_DEVICE(0x1740, 0x9703), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x1740, 0x9705), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x1740, 0x9706), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x1740, 0x9707), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x1740, 0x9708), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x1740, 0x9709), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Gigabyte */
-        { USB_DEVICE(0x1044, 0x800d), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* I-O DATA */
-        { USB_DEVICE(0x04bb, 0x0945), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x04bb, 0x0947), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x04bb, 0x0948), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Logitec */
-        { USB_DEVICE(0x0789, 0x0166), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* MSI */
-        { USB_DEVICE(0x0db0, 0x3820), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x3821), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x3822), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x3870), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x3871), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x821a), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x822a), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x822b), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x822c), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x870a), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x871a), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x871b), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x871c), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0db0, 0x899a), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Para */
-        { USB_DEVICE(0x20b8, 0x8888), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Pegatron */
-        { USB_DEVICE(0x1d4d, 0x000c), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x1d4d, 0x000e), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Planex */
-        { USB_DEVICE(0x2019, 0xab25), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Quanta */
-        { USB_DEVICE(0x1a32, 0x0304), USB_DEVICE_DATA(&rt2800usb_ops) },
+#ifdef CONFIG_RT2800USB_RT33XX
         /* Ralink */
-        { USB_DEVICE(0x148f, 0x2070), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x148f, 0x3070), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x148f, 0x3071), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x148f, 0x3072), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x148f, 0x3370), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x148f, 0x8070), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Sitecom */
-        { USB_DEVICE(0x0df6, 0x003e), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0df6, 0x0040), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0df6, 0x0042), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0df6, 0x0047), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0df6, 0x0048), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* SMC */
-        { USB_DEVICE(0x083a, 0x7511), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x083a, 0xa701), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x083a, 0xa702), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x083a, 0xa703), USB_DEVICE_DATA(&rt2800usb_ops) },
-        /* Zinwell */
-        { USB_DEVICE(0x5a57, 0x0283), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x5a57, 0x5257), USB_DEVICE_DATA(&rt2800usb_ops) },
+        { USB_DEVICE(0x0df6, 0x0050), USB_DEVICE_DATA(&rt2800usb_ops) },
 #endif
 #ifdef CONFIG_RT2800USB_RT35XX
         /* Allwin */
@@ -851,12 +852,9 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* I-O DATA */
         { USB_DEVICE(0x04bb, 0x0944), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Ralink */
-        { USB_DEVICE(0x148f, 0x3370), USB_DEVICE_DATA(&rt2800usb_ops) },
         { USB_DEVICE(0x148f, 0x3572), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x148f, 0x8070), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Sitecom */
         { USB_DEVICE(0x0df6, 0x0041), USB_DEVICE_DATA(&rt2800usb_ops) },
-        { USB_DEVICE(0x0df6, 0x0050), USB_DEVICE_DATA(&rt2800usb_ops) },
         /* Zinwell */
         { USB_DEVICE(0x5a57, 0x0284), USB_DEVICE_DATA(&rt2800usb_ops) },
 #endif
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 42bd3a96f23..0a55eeff871 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -915,7 +915,7 @@ struct rt2x00_dev {
  * in those cases REGISTER_BUSY_COUNT attempts should be
  * taken with a REGISTER_BUSY_DELAY interval.
  */
-#define REGISTER_BUSY_COUNT     5
+#define REGISTER_BUSY_COUNT     100
 #define REGISTER_BUSY_DELAY     100
 
 /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 3afa2a3ebee..c879f9a7037 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -250,10 +250,9 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(entry->skb);
         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
         enum data_queue_qid qid = skb_get_queue_mapping(entry->skb);
-        unsigned int header_length = ieee80211_get_hdrlen_from_skb(entry->skb);
+        unsigned int header_length, i;
         u8 rate_idx, rate_flags, retry_rates;
         u8 skbdesc_flags = skbdesc->flags;
-        unsigned int i;
         bool success;
 
         /*
@@ -272,6 +271,11 @@ void rt2x00lib_txdone(struct queue_entry *entry,
         skbdesc->flags &= ~SKBDESC_DESC_IN_SKB;
 
         /*
+         * Determine the length of 802.11 header.
+         */
+        header_length = ieee80211_get_hdrlen_from_skb(entry->skb);
+
+        /*
          * Remove L2 padding which was added during
          */
         if (test_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags))
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index dc543174dfa..a3d79c7a21c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -204,8 +204,10 @@ void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length)
         if (!l2pad)
                 return;
 
-        memmove(skb->data + l2pad, skb->data, header_length);
-        skb_pull(skb, l2pad);
+        memmove(skb->data + header_length, skb->data + header_length + l2pad,
+                                skb->len - header_length - l2pad);
+
+        skb_trim(skb, skb->len - l2pad);
 }
 
 static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry,
diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.c b/drivers/net/wireless/rt2x00/rt2x00soc.c
index fc98063de71..2aa5c38022f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00soc.c
+++ b/drivers/net/wireless/rt2x00/rt2x00soc.c
@@ -40,6 +40,8 @@ static void rt2x00soc_free_reg(struct rt2x00_dev *rt2x00dev)
 
         kfree(rt2x00dev->eeprom);
         rt2x00dev->eeprom = NULL;
+
+        iounmap(rt2x00dev->csr.base);
 }
 
 static int rt2x00soc_alloc_reg(struct rt2x00_dev *rt2x00dev)
@@ -51,9 +53,9 @@ static int rt2x00soc_alloc_reg(struct rt2x00_dev *rt2x00dev)
         if (!res)
                 return -ENODEV;
 
-        rt2x00dev->csr.base = (void __iomem *)KSEG1ADDR(res->start);
+        rt2x00dev->csr.base = ioremap(res->start, resource_size(res));
         if (!rt2x00dev->csr.base)
-                goto exit;
+                return -ENOMEM;
 
         rt2x00dev->eeprom = kzalloc(rt2x00dev->ops->eeprom_size, GFP_KERNEL);
         if (!rt2x00dev->eeprom)
diff --git a/drivers/net/wireless/wl12xx/Kconfig b/drivers/net/wireless/wl12xx/Kconfig
index 02ad4bc1597..d2adeb1f72b 100644
--- a/drivers/net/wireless/wl12xx/Kconfig
+++ b/drivers/net/wireless/wl12xx/Kconfig
@@ -1,56 +1,58 @@
-menuconfig WL12XX
+menuconfig WL12XX_MENU
         tristate "TI wl12xx driver support"
         depends on MAC80211 && EXPERIMENTAL
         ---help---
-          This will enable TI wl12xx driver support. The drivers make
-          use of the mac80211 stack.
+          This will enable TI wl12xx driver support for the following chips:
+          wl1271 and wl1273.
+          The drivers make use of the mac80211 stack.
 
-config WL1271
-        tristate "TI wl1271 support"
-        depends on WL12XX && GENERIC_HARDIRQS
+config WL12XX
+        tristate "TI wl12xx support"
+        depends on WL12XX_MENU && GENERIC_HARDIRQS
         depends on INET
         select FW_LOADER
         select CRC7
         ---help---
-          This module adds support for wireless adapters based on the
-          TI wl1271 chipset.
+          This module adds support for wireless adapters based on TI wl1271 and
+          TI wl1273 chipsets. This module does *not* include support for wl1251.
+          For wl1251 support, use the separate homonymous driver instead.
 
-          If you choose to build a module, it'll be called wl1271. Say N if
+          If you choose to build a module, it will be called wl12xx. Say N if
           unsure.
 
-config WL1271_HT
-        bool "TI wl1271 802.11 HT support (EXPERIMENTAL)"
-        depends on WL1271 && EXPERIMENTAL
+config WL12XX_HT
+        bool "TI wl12xx 802.11 HT support (EXPERIMENTAL)"
+        depends on WL12XX && EXPERIMENTAL
         default n
         ---help---
-          This will enable 802.11 HT support for TI wl1271 chipset.
+          This will enable 802.11 HT support in the wl12xx module.
 
           That configuration is temporary due to the code incomplete and
           still in testing process.
 
-config WL1271_SPI
-        tristate "TI wl1271 SPI support"
-        depends on WL1271 && SPI_MASTER
+config WL12XX_SPI
+        tristate "TI wl12xx SPI support"
+        depends on WL12XX && SPI_MASTER
         ---help---
           This module adds support for the SPI interface of adapters using
-          TI wl1271 chipset.  Select this if your platform is using
+          TI wl12xx chipsets.  Select this if your platform is using
           the SPI bus.
 
-          If you choose to build a module, it'll be called wl1251_spi.
+          If you choose to build a module, it'll be called wl12xx_spi.
           Say N if unsure.
 
-config WL1271_SDIO
-        tristate "TI wl1271 SDIO support"
-        depends on WL1271 && MMC
+config WL12XX_SDIO
+        tristate "TI wl12xx SDIO support"
+        depends on WL12XX && MMC
         ---help---
           This module adds support for the SDIO interface of adapters using
-          TI wl1271 chipset.  Select this if your platform is using
+          TI wl12xx chipsets.  Select this if your platform is using
           the SDIO bus.
 
-          If you choose to build a module, it'll be called
-          wl1271_sdio. Say N if unsure.
+          If you choose to build a module, it'll be called wl12xx_sdio.
+          Say N if unsure.
 
 config WL12XX_PLATFORM_DATA
         bool
-        depends on WL1271_SDIO != n || WL1251_SDIO != n
+        depends on WL12XX_SDIO != n || WL1251_SDIO != n
         default y
diff --git a/drivers/net/wireless/wl12xx/Makefile b/drivers/net/wireless/wl12xx/Makefile
index 3a807444b2a..005a758174d 100644
--- a/drivers/net/wireless/wl12xx/Makefile
+++ b/drivers/net/wireless/wl12xx/Makefile
@@ -1,12 +1,13 @@
-wl1271-objs             = wl1271_main.o  wl1271_cmd.o wl1271_io.o \
-                          wl1271_event.o wl1271_tx.o  wl1271_rx.o   \
-                          wl1271_ps.o    wl1271_acx.o wl1271_boot.o \
-                          wl1271_init.o  wl1271_debugfs.o wl1271_scan.o
+wl12xx-objs             = main.o cmd.o io.o event.o tx.o rx.o ps.o acx.o \
+                          boot.o init.o debugfs.o scan.o
 
-wl1271-$(CONFIG_NL80211_TESTMODE)       += wl1271_testmode.o
-obj-$(CONFIG_WL1271)    += wl1271.o
-obj-$(CONFIG_WL1271_SPI)        += wl1271_spi.o
-obj-$(CONFIG_WL1271_SDIO)       += wl1271_sdio.o
+wl12xx_spi-objs = spi.o
+wl12xx_sdio-objs        = sdio.o
+
+wl12xx-$(CONFIG_NL80211_TESTMODE)       += testmode.o
+obj-$(CONFIG_WL12XX)                    += wl12xx.o
+obj-$(CONFIG_WL12XX_SPI)                += wl12xx_spi.o
+obj-$(CONFIG_WL12XX_SDIO)               += wl12xx_sdio.o
 
 # small builtin driver bit
 obj-$(CONFIG_WL12XX_PLATFORM_DATA)      += wl12xx_platform_data.o
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/acx.c
index bd7f95f4eef..7cbaeb6d2a3 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.c
+++ b/drivers/net/wireless/wl12xx/acx.c
@@ -21,7 +21,7 @@
  *
  */
 
-#include "wl1271_acx.h"
+#include "acx.h"
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
@@ -29,10 +29,10 @@
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 
-#include "wl1271.h"
+#include "wl12xx.h"
 #include "wl12xx_80211.h"
-#include "wl1271_reg.h"
-#include "wl1271_ps.h"
+#include "reg.h"
+#include "ps.h"
 
 int wl1271_acx_wake_up_conditions(struct wl1271 *wl)
 {
@@ -862,7 +862,7 @@ out:
         return ret;
 }
 
-int wl1271_acx_frag_threshold(struct wl1271 *wl)
+int wl1271_acx_frag_threshold(struct wl1271 *wl, u16 frag_threshold)
 {
         struct acx_frag_threshold *acx;
         int ret = 0;
@@ -876,7 +876,7 @@ int wl1271_acx_frag_threshold(struct wl1271 *wl)
                 goto out;
         }
 
-        acx->frag_threshold = cpu_to_le16(wl->conf.tx.frag_threshold);
+        acx->frag_threshold = cpu_to_le16(frag_threshold);
         ret = wl1271_cmd_configure(wl, ACX_FRAG_CFG, acx, sizeof(*acx));
         if (ret < 0) {
                 wl1271_warning("Setting of frag threshold failed: %d", ret);
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.h b/drivers/net/wireless/wl12xx/acx.h
index b7c490845f3..75a6306ff55 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.h
+++ b/drivers/net/wireless/wl12xx/acx.h
@@ -22,11 +22,11 @@
  *
  */
 
-#ifndef __WL1271_ACX_H__
-#define __WL1271_ACX_H__
+#ifndef __ACX_H__
+#define __ACX_H__
 
-#include "wl1271.h"
-#include "wl1271_cmd.h"
+#include "wl12xx.h"
+#include "cmd.h"
 
 /*************************************************************************
 
@@ -1161,7 +1161,7 @@ int wl1271_acx_ac_cfg(struct wl1271 *wl, u8 ac, u8 cw_min, u16 cw_max,
 int wl1271_acx_tid_cfg(struct wl1271 *wl, u8 queue_id, u8 channel_type,
                        u8 tsid, u8 ps_scheme, u8 ack_policy,
                        u32 apsd_conf0, u32 apsd_conf1);
-int wl1271_acx_frag_threshold(struct wl1271 *wl);
+int wl1271_acx_frag_threshold(struct wl1271 *wl, u16 frag_threshold);
 int wl1271_acx_tx_config_options(struct wl1271 *wl);
 int wl1271_acx_mem_cfg(struct wl1271 *wl);
 int wl1271_acx_init_mem_config(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/boot.c
index 5b190728ca5..1eafb817583 100644
--- a/drivers/net/wireless/wl12xx/wl1271_boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@ -24,11 +24,11 @@
 #include <linux/gpio.h>
 #include <linux/slab.h>
 
-#include "wl1271_acx.h"
-#include "wl1271_reg.h"
-#include "wl1271_boot.h"
-#include "wl1271_io.h"
-#include "wl1271_event.h"
+#include "acx.h"
+#include "reg.h"
+#include "boot.h"
+#include "io.h"
+#include "event.h"
 
 static struct wl1271_partition_set part_table[PART_TABLE_LEN] = {
         [PART_DOWN] = {
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.h b/drivers/net/wireless/wl12xx/boot.h
index f73b0b15a28..c7d771959f3 100644
--- a/drivers/net/wireless/wl12xx/wl1271_boot.h
+++ b/drivers/net/wireless/wl12xx/boot.h
@@ -24,7 +24,7 @@
 #ifndef __BOOT_H__
 #define __BOOT_H__
 
-#include "wl1271.h"
+#include "wl12xx.h"
 
 int wl1271_boot(struct wl1271 *wl);
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/cmd.c
index 5d3e8485ea4..f3d0541aaad 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/cmd.c
@@ -29,13 +29,13 @@
 #include <linux/ieee80211.h>
 #include <linux/slab.h>
 
-#include "wl1271.h"
-#include "wl1271_reg.h"
-#include "wl1271_io.h"
-#include "wl1271_acx.h"
+#include "wl12xx.h"
+#include "reg.h"
+#include "io.h"
+#include "acx.h"
 #include "wl12xx_80211.h"
-#include "wl1271_cmd.h"
-#include "wl1271_event.h"
+#include "cmd.h"
+#include "event.h"
 
 #define WL1271_CMD_FAST_POLL_COUNT       50
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.h b/drivers/net/wireless/wl12xx/cmd.h
index a0caf4fc37b..16d1bf814e7 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.h
+++ b/drivers/net/wireless/wl12xx/cmd.h
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef __WL1271_CMD_H__
-#define __WL1271_CMD_H__
+#ifndef __CMD_H__
+#define __CMD_H__
 
-#include "wl1271.h"
+#include "wl12xx.h"
 
 struct acx_header;
 
@@ -327,9 +327,6 @@ enum wl1271_channel_tune_bands {
 
 #define WL1271_PD_REFERENCE_POINT_BAND_B_G  0
 
-#define TEST_CMD_P2G_CAL                    0x02
-#define TEST_CMD_CHANNEL_TUNE               0x0d
-#define TEST_CMD_UPDATE_PD_REFERENCE_POINT  0x1d
 #define TEST_CMD_INI_FILE_RADIO_PARAM       0x19
 #define TEST_CMD_INI_FILE_GENERAL_PARAM     0x1E
 #define TEST_CMD_INI_FILE_RF_EXTENDED_PARAM 0x26
@@ -375,51 +372,6 @@ struct wl1271_ext_radio_parms_cmd {
         u8 padding[3];
 } __packed;
 
-struct wl1271_cmd_cal_channel_tune {
-        struct wl1271_cmd_header header;
-
-        struct wl1271_cmd_test_header test;
-
-        u8 band;
-        u8 channel;
-
-        __le16 radio_status;
-} __packed;
-
-struct wl1271_cmd_cal_update_ref_point {
-        struct wl1271_cmd_header header;
-
-        struct wl1271_cmd_test_header test;
-
-        __le32 ref_power;
-        __le32 ref_detector;
-        u8  sub_band;
-        u8  padding[3];
-} __packed;
-
-#define MAX_TLV_LENGTH         400
-#define MAX_NVS_VERSION_LENGTH 12
-
-#define WL1271_CAL_P2G_BAND_B_G BIT(0)
-
-struct wl1271_cmd_cal_p2g {
-        struct wl1271_cmd_header header;
-
-        struct wl1271_cmd_test_header test;
-
-        __le16 len;
-        u8  buf[MAX_TLV_LENGTH];
-        u8  type;
-        u8  padding;
-
-        __le16 radio_status;
-        u8  nvs_version[MAX_NVS_VERSION_LENGTH];
-
-        u8  sub_band_mask;
-        u8  padding2;
-} __packed;
-
-
 /*
  * There are three types of disconnections:
  *
diff --git a/drivers/net/wireless/wl12xx/wl1271_conf.h b/drivers/net/wireless/wl12xx/conf.h
index 5f78a6cb143..a16b3616e43 100644
--- a/drivers/net/wireless/wl12xx/wl1271_conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __WL1271_CONF_H__
-#define __WL1271_CONF_H__
+#ifndef __CONF_H__
+#define __CONF_H__
 
 enum {
         CONF_HW_BIT_RATE_1MBPS   = BIT(0),
diff --git a/drivers/net/wireless/wl12xx/wl1271_debugfs.c b/drivers/net/wireless/wl12xx/debugfs.c
index 3468b849852..dd71b7d2105 100644
--- a/drivers/net/wireless/wl12xx/wl1271_debugfs.c
+++ b/drivers/net/wireless/wl12xx/debugfs.c
@@ -21,15 +21,15 @@
  *
  */
 
-#include "wl1271_debugfs.h"
+#include "debugfs.h"
 
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 
-#include "wl1271.h"
-#include "wl1271_acx.h"
-#include "wl1271_ps.h"
-#include "wl1271_io.h"
+#include "wl12xx.h"
+#include "acx.h"
+#include "ps.h"
+#include "io.h"
 
 /* ms */
 #define WL1271_DEBUGFS_STATS_LIFETIME 1000
diff --git a/drivers/net/wireless/wl12xx/wl1271_debugfs.h b/drivers/net/wireless/wl12xx/debugfs.h
index 00a45b2669a..254c5b292cf 100644
--- a/drivers/net/wireless/wl12xx/wl1271_debugfs.h
+++ b/drivers/net/wireless/wl12xx/debugfs.h
@@ -21,10 +21,10 @@
  *
  */
 
-#ifndef WL1271_DEBUGFS_H
-#define WL1271_DEBUGFS_H
+#ifndef __DEBUGFS_H__
+#define __DEBUGFS_H__
 
-#include "wl1271.h"
+#include "wl12xx.h"
 
 int wl1271_debugfs_init(struct wl1271 *wl);
 void wl1271_debugfs_exit(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.c b/drivers/net/wireless/wl12xx/event.c
index 38ccef7d73a..f9146f5242f 100644
--- a/drivers/net/wireless/wl12xx/wl1271_event.c
+++ b/drivers/net/wireless/wl12xx/event.c
@@ -21,12 +21,12 @@
  *
  */
 
-#include "wl1271.h"
-#include "wl1271_reg.h"
-#include "wl1271_io.h"
-#include "wl1271_event.h"
-#include "wl1271_ps.h"
-#include "wl1271_scan.h"
+#include "wl12xx.h"
+#include "reg.h"
+#include "io.h"
+#include "event.h"
+#include "ps.h"
+#include "scan.h"
 #include "wl12xx_80211.h"
 
 void wl1271_pspoll_work(struct work_struct *work)
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.h b/drivers/net/wireless/wl12xx/event.h
index e4751667cf5..6cce0143adb 100644
--- a/drivers/net/wireless/wl12xx/wl1271_event.h
+++ b/drivers/net/wireless/wl12xx/event.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __WL1271_EVENT_H__
-#define __WL1271_EVENT_H__
+#ifndef __EVENT_H__
+#define __EVENT_H__
 
 /*
  * Mbox events
diff --git a/drivers/net/wireless/wl12xx/wl1271_ini.h b/drivers/net/wireless/wl12xx/ini.h
index 2313047d401..c330a2583df 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ini.h
+++ b/drivers/net/wireless/wl12xx/ini.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __WL1271_INI_H__
-#define __WL1271_INI_H__
+#ifndef __INI_H__
+#define __INI_H__
 
 #define WL1271_INI_MAX_SMART_REFLEX_PARAM 16
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/init.c
index 8044bba70ee..7949d346aad 100644
--- a/drivers/net/wireless/wl12xx/wl1271_init.c
+++ b/drivers/net/wireless/wl12xx/init.c
@@ -25,11 +25,11 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 
-#include "wl1271_init.h"
+#include "init.h"
 #include "wl12xx_80211.h"
-#include "wl1271_acx.h"
-#include "wl1271_cmd.h"
-#include "wl1271_reg.h"
+#include "acx.h"
+#include "cmd.h"
+#include "reg.h"
 
 static int wl1271_init_hwenc_config(struct wl1271 *wl)
 {
@@ -290,7 +290,7 @@ int wl1271_hw_init(struct wl1271 *wl)
                 goto out_free_memmap;
 
         /* Default fragmentation threshold */
-        ret = wl1271_acx_frag_threshold(wl);
+        ret = wl1271_acx_frag_threshold(wl, wl->conf.tx.frag_threshold);
         if (ret < 0)
                 goto out_free_memmap;
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.h b/drivers/net/wireless/wl12xx/init.h
index bc26f8c53b9..7762421f860 100644
--- a/drivers/net/wireless/wl12xx/wl1271_init.h
+++ b/drivers/net/wireless/wl12xx/init.h
@@ -21,10 +21,10 @@
  *
  */
 
-#ifndef __WL1271_INIT_H__
-#define __WL1271_INIT_H__
+#ifndef __INIT_H__
+#define __INIT_H__
 
-#include "wl1271.h"
+#include "wl12xx.h"
 
 int wl1271_hw_init_power_auth(struct wl1271 *wl);
 int wl1271_init_templates_config(struct wl1271 *wl);
diff --git a/drivers/net/wireless/wl12xx/wl1271_io.c b/drivers/net/wireless/wl12xx/io.c
index c8759acef13..35c2f1aca6b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_io.c
+++ b/drivers/net/wireless/wl12xx/io.c
@@ -26,9 +26,9 @@
 #include <linux/crc7.h>
 #include <linux/spi/spi.h>
 
-#include "wl1271.h"
+#include "wl12xx.h"
 #include "wl12xx_80211.h"
-#include "wl1271_io.h"
+#include "io.h"
 
 #define OCP_CMD_LOOP  32
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_io.h b/drivers/net/wireless/wl12xx/io.h
index c1f92e65ded..844b32b170b 100644
--- a/drivers/net/wireless/wl12xx/wl1271_io.h
+++ b/drivers/net/wireless/wl12xx/io.h
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef __WL1271_IO_H__
-#define __WL1271_IO_H__
+#ifndef __IO_H__
+#define __IO_H__
 
-#include "wl1271_reg.h"
+#include "reg.h"
 
 #define HW_ACCESS_MEMORY_MAX_RANGE      0x1FFC0
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/main.c
index f5b1d19bc88..708ffe304c6 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -31,20 +31,20 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include "wl1271.h"
+#include "wl12xx.h"
 #include "wl12xx_80211.h"
-#include "wl1271_reg.h"
-#include "wl1271_io.h"
-#include "wl1271_event.h"
-#include "wl1271_tx.h"
-#include "wl1271_rx.h"
-#include "wl1271_ps.h"
-#include "wl1271_init.h"
-#include "wl1271_debugfs.h"
-#include "wl1271_cmd.h"
-#include "wl1271_boot.h"
-#include "wl1271_testmode.h"
-#include "wl1271_scan.h"
+#include "reg.h"
+#include "io.h"
+#include "event.h"
+#include "tx.h"
+#include "rx.h"
+#include "ps.h"
+#include "init.h"
+#include "debugfs.h"
+#include "cmd.h"
+#include "boot.h"
+#include "testmode.h"
+#include "scan.h"
 
 #define WL1271_BOOT_RETRIES 3
 
@@ -335,6 +335,27 @@ out:
         return NOTIFY_OK;
 }
 
+static int wl1271_reg_notify(struct wiphy *wiphy,
+                             struct regulatory_request *request) {
+        struct ieee80211_supported_band *band;
+        struct ieee80211_channel *ch;
+        int i;
+
+        band = wiphy->bands[IEEE80211_BAND_5GHZ];
+        for (i = 0; i < band->n_channels; i++) {
+                ch = &band->channels[i];
+                if (ch->flags & IEEE80211_CHAN_DISABLED)
+                        continue;
+
+                if (ch->flags & IEEE80211_CHAN_RADAR)
+                        ch->flags |= IEEE80211_CHAN_NO_IBSS |
+                                     IEEE80211_CHAN_PASSIVE_SCAN;
+
+        }
+
+        return 0;
+}
+
 static void wl1271_conf_init(struct wl1271 *wl)
 {
 
@@ -404,7 +425,7 @@ static int wl1271_plt_init(struct wl1271 *wl)
                 goto out_free_memmap;
 
         /* Default fragmentation threshold */
-        ret = wl1271_acx_frag_threshold(wl);
+        ret = wl1271_acx_frag_threshold(wl, wl->conf.tx.frag_threshold);
         if (ret < 0)
                 goto out_free_memmap;
 
@@ -884,7 +905,7 @@ static int wl1271_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
                 set_bit(WL1271_FLAG_STA_RATES_CHANGED, &wl->flags);
         }
 
-#ifdef CONFIG_WL1271_HT
+#ifdef CONFIG_WL12XX_HT
         if (sta &&
             sta->ht_cap.ht_supported &&
             ((wl->sta_rate_set >> HW_HT_RATES_OFFSET) !=
@@ -1724,6 +1745,34 @@ out:
         return ret;
 }
 
+static int wl1271_op_set_frag_threshold(struct ieee80211_hw *hw, u32 value)
+{
+        struct wl1271 *wl = hw->priv;
+        int ret = 0;
+
+        mutex_lock(&wl->mutex);
+
+        if (unlikely(wl->state == WL1271_STATE_OFF)) {
+                ret = -EAGAIN;
+                goto out;
+        }
+
+        ret = wl1271_ps_elp_wakeup(wl, false);
+        if (ret < 0)
+                goto out;
+
+        ret = wl1271_acx_frag_threshold(wl, (u16)value);
+        if (ret < 0)
+                wl1271_warning("wl1271_op_set_frag_threshold failed: %d", ret);
+
+        wl1271_ps_elp_sleep(wl);
+
+out:
+        mutex_unlock(&wl->mutex);
+
+        return ret;
+}
+
 static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
 {
         struct wl1271 *wl = hw->priv;
@@ -1962,9 +2011,12 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw,
 
                         /* Disable the keep-alive feature */
                         ret = wl1271_acx_keep_alive_mode(wl, false);
-
                         if (ret < 0)
                                 goto out_sleep;
+
+                        /* restore the bssid filter and go to dummy bssid */
+                        wl1271_unjoin(wl);
+                        wl1271_dummy_join(wl);
                 }
 
         }
@@ -2194,24 +2246,21 @@ static struct ieee80211_rate wl1271_rates[] = {
           .hw_value_short = CONF_HW_BIT_RATE_54MBPS, },
 };
 
-/*
- * Can't be const, mac80211 writes to this. The order of the channels here
- * is designed to improve scanning.
- */
+/* can't be const, mac80211 writes to this */
 static struct ieee80211_channel wl1271_channels[] = {
         { .hw_value = 1, .center_freq = 2412, .max_power = 25 },
-        { .hw_value = 5, .center_freq = 2432, .max_power = 25 },
-        { .hw_value = 9, .center_freq = 2452, .max_power = 25 },
-        { .hw_value = 13, .center_freq = 2472, .max_power = 25 },
-        { .hw_value = 4, .center_freq = 2427, .max_power = 25 },
-        { .hw_value = 8, .center_freq = 2447, .max_power = 25 },
-        { .hw_value = 12, .center_freq = 2467, .max_power = 25 },
-        { .hw_value = 3, .center_freq = 2422, .max_power = 25 },
-        { .hw_value = 7, .center_freq = 2442, .max_power = 25 },
-        { .hw_value = 11, .center_freq = 2462, .max_power = 25 },
         { .hw_value = 2, .center_freq = 2417, .max_power = 25 },
+        { .hw_value = 3, .center_freq = 2422, .max_power = 25 },
+        { .hw_value = 4, .center_freq = 2427, .max_power = 25 },
+        { .hw_value = 5, .center_freq = 2432, .max_power = 25 },
         { .hw_value = 6, .center_freq = 2437, .max_power = 25 },
+        { .hw_value = 7, .center_freq = 2442, .max_power = 25 },
+        { .hw_value = 8, .center_freq = 2447, .max_power = 25 },
+        { .hw_value = 9, .center_freq = 2452, .max_power = 25 },
         { .hw_value = 10, .center_freq = 2457, .max_power = 25 },
+        { .hw_value = 11, .center_freq = 2462, .max_power = 25 },
+        { .hw_value = 12, .center_freq = 2467, .max_power = 25 },
+        { .hw_value = 13, .center_freq = 2472, .max_power = 25 },
 };
 
 /* mapping to indexes for wl1271_rates */
@@ -2247,8 +2296,8 @@ static const u8 wl1271_rate_to_idx_2ghz[] = {
 /* 11n STA capabilities */
 #define HW_RX_HIGHEST_RATE      72
 
-#ifdef CONFIG_WL1271_HT
-#define WL1271_HT_CAP { \
+#ifdef CONFIG_WL12XX_HT
+#define WL12XX_HT_CAP { \
         .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20, \
         .ht_supported = true, \
         .ampdu_factor = IEEE80211_HT_MAX_AMPDU_8K, \
@@ -2260,7 +2309,7 @@ static const u8 wl1271_rate_to_idx_2ghz[] = {
                 }, \
 }
 #else
-#define WL1271_HT_CAP { \
+#define WL12XX_HT_CAP { \
         .ht_supported = false, \
 }
 #endif
@@ -2271,7 +2320,7 @@ static struct ieee80211_supported_band wl1271_band_2ghz = {
         .n_channels = ARRAY_SIZE(wl1271_channels),
         .bitrates = wl1271_rates,
         .n_bitrates = ARRAY_SIZE(wl1271_rates),
-        .ht_cap = WL1271_HT_CAP,
+        .ht_cap = WL12XX_HT_CAP,
 };
 
 /* 5 GHz data rates for WL1273 */
@@ -2302,52 +2351,49 @@ static struct ieee80211_rate wl1271_rates_5ghz[] = {
           .hw_value_short = CONF_HW_BIT_RATE_54MBPS, },
 };
 
-/*
- * 5 GHz band channels for WL1273 - can't be const, mac80211 writes to this.
- * The order of the channels here is designed to improve scanning.
- */
+/* 5 GHz band channels for WL1273 */
 static struct ieee80211_channel wl1271_channels_5ghz[] = {
         { .hw_value = 183, .center_freq = 4915},
-        { .hw_value = 188, .center_freq = 4940},
-        { .hw_value = 8, .center_freq = 5040},
-        { .hw_value = 34, .center_freq = 5170},
-        { .hw_value = 44, .center_freq = 5220},
-        { .hw_value = 60, .center_freq = 5300},
-        { .hw_value = 112, .center_freq = 5560},
-        { .hw_value = 132, .center_freq = 5660},
-        { .hw_value = 157, .center_freq = 5785},
         { .hw_value = 184, .center_freq = 4920},
+        { .hw_value = 185, .center_freq = 4925},
+        { .hw_value = 187, .center_freq = 4935},
+        { .hw_value = 188, .center_freq = 4940},
         { .hw_value = 189, .center_freq = 4945},
-        { .hw_value = 9, .center_freq = 5045},
-        { .hw_value = 36, .center_freq = 5180},
-        { .hw_value = 46, .center_freq = 5230},
-        { .hw_value = 64, .center_freq = 5320},
-        { .hw_value = 116, .center_freq = 5580},
-        { .hw_value = 136, .center_freq = 5680},
         { .hw_value = 192, .center_freq = 4960},
-        { .hw_value = 11, .center_freq = 5055},
-        { .hw_value = 38, .center_freq = 5190},
-        { .hw_value = 48, .center_freq = 5240},
-        { .hw_value = 100, .center_freq = 5500},
-        { .hw_value = 120, .center_freq = 5600},
-        { .hw_value = 140, .center_freq = 5700},
-        { .hw_value = 185, .center_freq = 4925},
         { .hw_value = 196, .center_freq = 4980},
-        { .hw_value = 12, .center_freq = 5060},
-        { .hw_value = 40, .center_freq = 5200},
-        { .hw_value = 52, .center_freq = 5260},
-        { .hw_value = 104, .center_freq = 5520},
-        { .hw_value = 124, .center_freq = 5620},
-        { .hw_value = 149, .center_freq = 5745},
-        { .hw_value = 161, .center_freq = 5805},
-        { .hw_value = 187, .center_freq = 4935},
         { .hw_value = 7, .center_freq = 5035},
+        { .hw_value = 8, .center_freq = 5040},
+        { .hw_value = 9, .center_freq = 5045},
+        { .hw_value = 11, .center_freq = 5055},
+        { .hw_value = 12, .center_freq = 5060},
         { .hw_value = 16, .center_freq = 5080},
+        { .hw_value = 34, .center_freq = 5170},
+        { .hw_value = 36, .center_freq = 5180},
+        { .hw_value = 38, .center_freq = 5190},
+        { .hw_value = 40, .center_freq = 5200},
         { .hw_value = 42, .center_freq = 5210},
+        { .hw_value = 44, .center_freq = 5220},
+        { .hw_value = 46, .center_freq = 5230},
+        { .hw_value = 48, .center_freq = 5240},
+        { .hw_value = 52, .center_freq = 5260},
         { .hw_value = 56, .center_freq = 5280},
+        { .hw_value = 60, .center_freq = 5300},
+        { .hw_value = 64, .center_freq = 5320},
+        { .hw_value = 100, .center_freq = 5500},
+        { .hw_value = 104, .center_freq = 5520},
         { .hw_value = 108, .center_freq = 5540},
+        { .hw_value = 112, .center_freq = 5560},
+        { .hw_value = 116, .center_freq = 5580},
+        { .hw_value = 120, .center_freq = 5600},
+        { .hw_value = 124, .center_freq = 5620},
         { .hw_value = 128, .center_freq = 5640},
+        { .hw_value = 132, .center_freq = 5660},
+        { .hw_value = 136, .center_freq = 5680},
+        { .hw_value = 140, .center_freq = 5700},
+        { .hw_value = 149, .center_freq = 5745},
         { .hw_value = 153, .center_freq = 5765},
+        { .hw_value = 157, .center_freq = 5785},
+        { .hw_value = 161, .center_freq = 5805},
         { .hw_value = 165, .center_freq = 5825},
 };
 
@@ -2386,7 +2432,7 @@ static struct ieee80211_supported_band wl1271_band_5ghz = {
         .n_channels = ARRAY_SIZE(wl1271_channels_5ghz),
         .bitrates = wl1271_rates_5ghz,
         .n_bitrates = ARRAY_SIZE(wl1271_rates_5ghz),
-        .ht_cap = WL1271_HT_CAP,
+        .ht_cap = WL12XX_HT_CAP,
 };
 
 static const u8 *wl1271_band_rate_to_idx[] = {
@@ -2406,6 +2452,7 @@ static const struct ieee80211_ops wl1271_ops = {
         .set_key = wl1271_op_set_key,
         .hw_scan = wl1271_op_hw_scan,
         .bss_info_changed = wl1271_op_bss_info_changed,
+        .set_frag_threshold = wl1271_op_set_frag_threshold,
         .set_rts_threshold = wl1271_op_set_rts_threshold,
         .conf_tx = wl1271_op_conf_tx,
         .get_tsf = wl1271_op_get_tsf,
@@ -2590,6 +2637,8 @@ int wl1271_init_ieee80211(struct wl1271 *wl)
         wl->hw->queues = 4;
         wl->hw->max_rates = 1;
 
+        wl->hw->wiphy->reg_notifier = wl1271_reg_notify;
+
         SET_IEEE80211_DEV(wl->hw, wl1271_wl_to_dev(wl));
 
         return 0;
diff --git a/drivers/net/wireless/wl12xx/wl1271_ps.c b/drivers/net/wireless/wl12xx/ps.c
index e3c332e2f97..60a3738eadb 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ps.c
+++ b/drivers/net/wireless/wl12xx/ps.c
@@ -21,9 +21,9 @@
  *
  */
 
-#include "wl1271_reg.h"
-#include "wl1271_ps.h"
-#include "wl1271_io.h"
+#include "reg.h"
+#include "ps.h"
+#include "io.h"
 
 #define WL1271_WAKEUP_TIMEOUT 500
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_ps.h b/drivers/net/wireless/wl12xx/ps.h
index 6ba7b032736..8415060f08e 100644
--- a/drivers/net/wireless/wl12xx/wl1271_ps.h
+++ b/drivers/net/wireless/wl12xx/ps.h
@@ -21,11 +21,11 @@
  *
  */
 
-#ifndef __WL1271_PS_H__
-#define __WL1271_PS_H__
+#ifndef __PS_H__
+#define __PS_H__
 
-#include "wl1271.h"
-#include "wl1271_acx.h"
+#include "wl12xx.h"
+#include "acx.h"
 
 int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode,
                        u32 rates, bool send);
diff --git a/drivers/net/wireless/wl12xx/wl1271_reg.h b/drivers/net/wireless/wl12xx/reg.h
index 99096077152..99096077152 100644
--- a/drivers/net/wireless/wl12xx/wl1271_reg.h
+++ b/drivers/net/wireless/wl12xx/reg.h
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.c b/drivers/net/wireless/wl12xx/rx.c
index cacfee56a0d..682304c30b8 100644
--- a/drivers/net/wireless/wl12xx/wl1271_rx.c
+++ b/drivers/net/wireless/wl12xx/rx.c
@@ -23,11 +23,11 @@
 
 #include <linux/gfp.h>
 
-#include "wl1271.h"
-#include "wl1271_acx.h"
-#include "wl1271_reg.h"
-#include "wl1271_rx.h"
-#include "wl1271_io.h"
+#include "wl12xx.h"
+#include "acx.h"
+#include "reg.h"
+#include "rx.h"
+#include "io.h"
 
 static u8 wl1271_rx_get_mem_block(struct wl1271_fw_status *status,
                                   u32 drv_rx_counter)
@@ -61,7 +61,7 @@ static void wl1271_rx_status(struct wl1271 *wl,
 
         status->rate_idx = wl1271_rate_to_idx(desc->rate, desc_band);
 
-#ifdef CONFIG_WL1271_HT
+#ifdef CONFIG_WL12XX_HT
         /* 11n support */
         if (desc->rate <= CONF_HW_RXTX_RATE_MCS0)
                 status->flag |= RX_FLAG_HT;
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.h b/drivers/net/wireless/wl12xx/rx.h
index 6d41981ce53..3abb26fe036 100644
--- a/drivers/net/wireless/wl12xx/wl1271_rx.h
+++ b/drivers/net/wireless/wl12xx/rx.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __WL1271_RX_H__
-#define __WL1271_RX_H__
+#ifndef __RX_H__
+#define __RX_H__
 
 #include <linux/bitops.h>
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.c b/drivers/net/wireless/wl12xx/scan.c
index e0661a543a3..f3f2c5b011e 100644
--- a/drivers/net/wireless/wl12xx/wl1271_scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
@@ -23,10 +23,10 @@
 
 #include <linux/ieee80211.h>
 
-#include "wl1271.h"
-#include "wl1271_cmd.h"
-#include "wl1271_scan.h"
-#include "wl1271_acx.h"
+#include "wl12xx.h"
+#include "cmd.h"
+#include "scan.h"
+#include "acx.h"
 
 void wl1271_scan_complete_work(struct work_struct *work)
 {
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.h b/drivers/net/wireless/wl12xx/scan.h
index 6d57127b5e6..421a750add5 100644
--- a/drivers/net/wireless/wl12xx/wl1271_scan.h
+++ b/drivers/net/wireless/wl12xx/scan.h
@@ -21,10 +21,10 @@
  *
  */
 
-#ifndef __WL1271_SCAN_H__
-#define __WL1271_SCAN_H__
+#ifndef __SCAN_H__
+#define __SCAN_H__
 
-#include "wl1271.h"
+#include "wl12xx.h"
 
 int wl1271_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
                 struct cfg80211_scan_request *req);
diff --git a/drivers/net/wireless/wl12xx/wl1271_sdio.c b/drivers/net/wireless/wl12xx/sdio.c
index 784ef343264..93cbb8d5aba 100644
--- a/drivers/net/wireless/wl12xx/wl1271_sdio.c
+++ b/drivers/net/wireless/wl12xx/sdio.c
@@ -32,9 +32,9 @@
 #include <linux/wl12xx.h>
 #include <linux/pm_runtime.h>
 
-#include "wl1271.h"
+#include "wl12xx.h"
 #include "wl12xx_80211.h"
-#include "wl1271_io.h"
+#include "io.h"
 
 #ifndef SDIO_VENDOR_ID_TI
 #define SDIO_VENDOR_ID_TI               0x0097
diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/spi.c
index ef801680773..46714910f98 100644
--- a/drivers/net/wireless/wl12xx/wl1271_spi.c
+++ b/drivers/net/wireless/wl12xx/spi.c
@@ -28,11 +28,11 @@
 #include <linux/wl12xx.h>
 #include <linux/slab.h>
 
-#include "wl1271.h"
+#include "wl12xx.h"
 #include "wl12xx_80211.h"
-#include "wl1271_io.h"
+#include "io.h"
 
-#include "wl1271_reg.h"
+#include "reg.h"
 
 #define WSPI_CMD_READ                 0x40000000
 #define WSPI_CMD_WRITE                0x00000000
diff --git a/drivers/net/wireless/wl12xx/wl1271_testmode.c b/drivers/net/wireless/wl12xx/testmode.c
index 55ec4428922..e64403b6896 100644
--- a/drivers/net/wireless/wl12xx/wl1271_testmode.c
+++ b/drivers/net/wireless/wl12xx/testmode.c
@@ -20,13 +20,13 @@
  * 02110-1301 USA
  *
  */
-#include "wl1271_testmode.h"
+#include "testmode.h"
 
 #include <linux/slab.h>
 #include <net/genetlink.h>
 
-#include "wl1271.h"
-#include "wl1271_acx.h"
+#include "wl12xx.h"
+#include "acx.h"
 
 #define WL1271_TM_MAX_DATA_LENGTH 1024
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_testmode.h b/drivers/net/wireless/wl12xx/testmode.h
index c196d28f9d9..8071654259e 100644
--- a/drivers/net/wireless/wl12xx/wl1271_testmode.h
+++ b/drivers/net/wireless/wl12xx/testmode.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef __WL1271_TESTMODE_H__
-#define __WL1271_TESTMODE_H__
+#ifndef __TESTMODE_H__
+#define __TESTMODE_H__
 
 #include <net/mac80211.h>
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.c b/drivers/net/wireless/wl12xx/tx.c
index 279be5b98d9..d332b3f6d0f 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -24,11 +24,11 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include "wl1271.h"
-#include "wl1271_io.h"
-#include "wl1271_reg.h"
-#include "wl1271_ps.h"
-#include "wl1271_tx.h"
+#include "wl12xx.h"
+#include "io.h"
+#include "reg.h"
+#include "ps.h"
+#include "tx.h"
 
 static int wl1271_alloc_tx_id(struct wl1271 *wl, struct sk_buff *skb)
 {
@@ -209,7 +209,7 @@ u32 wl1271_tx_enabled_rates_get(struct wl1271 *wl, u32 rate_set)
                 rate_set >>= 1;
         }
 
-#ifdef CONFIG_WL1271_HT
+#ifdef CONFIG_WL12XX_HT
         /* MCS rates indication are on bits 16 - 23 */
         rate_set >>= HW_HT_RATES_OFFSET - band->n_bitrates;
 
diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.h b/drivers/net/wireless/wl12xx/tx.h
index 9dc6f228c0d..903e5dc69b7 100644
--- a/drivers/net/wireless/wl12xx/wl1271_tx.h
+++ b/drivers/net/wireless/wl12xx/tx.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __WL1271_TX_H__
-#define __WL1271_TX_H__
+#ifndef __TX_H__
+#define __TX_H__
 
 #define TX_HW_BLOCK_SPARE                2
 #define TX_HW_BLOCK_SIZE                 252
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl12xx.h
index ab53162b434..3c836e6063e 100644
--- a/drivers/net/wireless/wl12xx/wl1271.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __WL1271_H__
-#define __WL1271_H__
+#ifndef __WL12XX_H__
+#define __WL12XX_H__
 
 #include <linux/mutex.h>
 #include <linux/completion.h>
@@ -32,8 +32,8 @@
 #include <linux/bitops.h>
 #include <net/mac80211.h>
 
-#include "wl1271_conf.h"
-#include "wl1271_ini.h"
+#include "conf.h"
+#include "ini.h"
 
 #define DRIVER_NAME "wl1271"
 #define DRIVER_PREFIX DRIVER_NAME ": "
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 87a95bcfee5..30f8d404958 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1448,7 +1448,7 @@ int zd_rfwritev_locked(struct zd_chip *chip,
  */
 int zd_rfwrite_cr_locked(struct zd_chip *chip, u32 value)
 {
-        struct zd_ioreq16 ioreqs[] = {
+        const struct zd_ioreq16 ioreqs[] = {
                 { CR244, (value >> 16) & 0xff },
                 { CR243, (value >>  8) & 0xff },
                 { CR242,  value        & 0xff },
@@ -1475,7 +1475,7 @@ int zd_rfwritev_cr_locked(struct zd_chip *chip,
 int zd_chip_set_multicast_hash(struct zd_chip *chip,
                                struct zd_mc_hash *hash)
 {
-        struct zd_ioreq32 ioreqs[] = {
+        const struct zd_ioreq32 ioreqs[] = {
                 { CR_GROUP_HASH_P1, hash->low },
                 { CR_GROUP_HASH_P2, hash->high },
         };
diff --git a/drivers/ssb/b43_pci_bridge.c b/drivers/ssb/b43_pci_bridge.c
index ef9c6a04ad8..744d3f6e470 100644
--- a/drivers/ssb/b43_pci_bridge.c
+++ b/drivers/ssb/b43_pci_bridge.c
@@ -24,6 +24,7 @@ static const struct pci_device_id b43_pci_bridge_tbl[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4312) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4315) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4318) },
+        { PCI_DEVICE(PCI_VENDOR_ID_BCM_GVC,  0x4318) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4319) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4320) },
         { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4321) },
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 6e88d2b603b..f52966305e0 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -573,37 +573,34 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
         ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
         memset(out->et0mac, 0xFF, 6);           /* preset et0 and et1 mac */
         memset(out->et1mac, 0xFF, 6);
+
         if ((bus->chip_id & 0xFF00) == 0x4400) {
                 /* Workaround: The BCM44XX chip has a stupid revision
                  * number stored in the SPROM.
                  * Always extract r1. */
                 out->revision = 1;
+                ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
+        }
+
+        switch (out->revision) {
+        case 1:
+        case 2:
+        case 3:
                 sprom_extract_r123(out, in);
-        } else if (bus->chip_id == 0x4321) {
-                /* the BCM4328 has a chipid == 0x4321 and a rev 4 SPROM */
-                out->revision = 4;
+                break;
+        case 4:
+        case 5:
                 sprom_extract_r45(out, in);
-        } else {
-                switch (out->revision) {
-                case 1:
-                case 2:
-                case 3:
-                        sprom_extract_r123(out, in);
-                        break;
-                case 4:
-                case 5:
-                        sprom_extract_r45(out, in);
-                        break;
-                case 8:
-                        sprom_extract_r8(out, in);
-                        break;
-                default:
-                        ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
-                                   "  revision %d detected. Will extract"
-                                   " v1\n", out->revision);
-                        out->revision = 1;
-                        sprom_extract_r123(out, in);
-                }
+                break;
+        case 8:
+                sprom_extract_r8(out, in);
+                break;
+        default:
+                ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
+                           "  revision %d detected. Will extract"
+                           " v1\n", out->revision);
+                out->revision = 1;
+                sprom_extract_r123(out, in);
         }
 
         if (out->boardflags_lo == 0xFFFF)
@@ -618,7 +615,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
                              struct ssb_sprom *sprom)
 {
         const struct ssb_sprom *fallback;
-        int err = -ENOMEM;
+        int err;
         u16 *buf;
 
         if (!ssb_is_sprom_available(bus)) {
@@ -645,7 +642,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
 
         buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
         if (!buf)
-                goto out;
+                return -ENOMEM;
         bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;
         sprom_do_read(bus, buf);
         err = sprom_check_crc(buf, bus->sprom_size);
@@ -655,7 +652,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
                 buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
                               GFP_KERNEL);
                 if (!buf)
-                        goto out;
+                        return -ENOMEM;
                 bus->sprom_size = SSB_SPROMSIZE_WORDS_R4;
                 sprom_do_read(bus, buf);
                 err = sprom_check_crc(buf, bus->sprom_size);
@@ -677,7 +674,6 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
 
 out_free:
         kfree(buf);
-out:
         return err;
 }
 
diff --git a/include/linux/average.h b/include/linux/average.h
new file mode 100644
index 00000000000..7706e40f95f
--- /dev/null
+++ b/include/linux/average.h
@@ -0,0 +1,32 @@
+#ifndef _LINUX_AVERAGE_H
+#define _LINUX_AVERAGE_H
+
+#include <linux/kernel.h>
+
+/* Exponentially weighted moving average (EWMA) */
+
+/* For more documentation see lib/average.c */
+
+struct ewma {
+        unsigned long internal;
+        unsigned long factor;
+        unsigned long weight;
+};
+
+extern void ewma_init(struct ewma *avg, unsigned long factor,
+                      unsigned long weight);
+
+extern struct ewma *ewma_add(struct ewma *avg, unsigned long val);
+
+/**
+ * ewma_read() - Get average value
+ * @avg: Average structure
+ *
+ * Returns the average value held in @avg.
+ */
+static inline unsigned long ewma_read(const struct ewma *avg)
+{
+        return DIV_ROUND_CLOSEST(avg->internal, avg->factor);
+}
+
+#endif /* _LINUX_AVERAGE_H */
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h
index fb877b5621b..d706bf3badc 100644
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
@@ -804,6 +804,30 @@ enum nl80211_commands {
  * @NL80211_ATTR_SUPPORT_IBSS_RSN: The device supports IBSS RSN, which mostly
  *      means support for per-station GTKs.
  *
+ * @NL80211_ATTR_WIPHY_ANTENNA_TX: Bitmap of allowed antennas for transmitting.
+ *      This can be used to mask out antennas which are not attached or should
+ *      not be used for transmitting. If an antenna is not selected in this
+ *      bitmap the hardware is not allowed to transmit on this antenna.
+ *
+ *      Each bit represents one antenna, starting with antenna 1 at the first
+ *      bit. Depending on which antennas are selected in the bitmap, 802.11n
+ *      drivers can derive which chainmasks to use (if all antennas belonging to
+ *      a particular chain are disabled this chain should be disabled) and if
+ *      a chain has diversity antennas wether diversity should be used or not.
+ *      HT capabilities (STBC, TX Beamforming, Antenna selection) can be
+ *      derived from the available chains after applying the antenna mask.
+ *      Non-802.11n drivers can derive wether to use diversity or not.
+ *      Drivers may reject configurations or RX/TX mask combinations they cannot
+ *      support by returning -EINVAL.
+ *
+ * @NL80211_ATTR_WIPHY_ANTENNA_RX: Bitmap of allowed antennas for receiving.
+ *      This can be used to mask out antennas which are not attached or should
+ *      not be used for receiving. If an antenna is not selected in this bitmap
+ *      the hardware should not be configured to receive on this antenna.
+ *      For a more detailed descripton see @NL80211_ATTR_WIPHY_ANTENNA_TX.
+ *
+ * @NL80211_ATTR_MCAST_RATE: Multicast tx rate (in 100 kbps) for IBSS
+ *
  * @NL80211_ATTR_MAX: highest attribute number currently defined
  * @__NL80211_ATTR_AFTER_LAST: internal use
  */
@@ -973,6 +997,11 @@ enum nl80211_attrs {
 
         NL80211_ATTR_SUPPORT_IBSS_RSN,
 
+        NL80211_ATTR_WIPHY_ANTENNA_TX,
+        NL80211_ATTR_WIPHY_ANTENNA_RX,
+
+        NL80211_ATTR_MCAST_RATE,
+
         /* add attributes here, update the policy in nl80211.c */
 
         __NL80211_ATTR_AFTER_LAST,
@@ -1790,6 +1819,8 @@ enum nl80211_ps_state {
  *      the minimum amount the RSSI level must change after an event before a
  *      new event may be issued (to reduce effects of RSSI oscillation).
  * @NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT: RSSI threshold event
+ * @NL80211_ATTR_CQM_PKT_LOSS_EVENT: a u32 value indicating that this many
+ *      consecutive packets were not acknowledged by the peer
  * @__NL80211_ATTR_CQM_AFTER_LAST: internal
  * @NL80211_ATTR_CQM_MAX: highest key attribute
  */
@@ -1798,6 +1829,7 @@ enum nl80211_attr_cqm {
         NL80211_ATTR_CQM_RSSI_THOLD,
         NL80211_ATTR_CQM_RSSI_HYST,
         NL80211_ATTR_CQM_RSSI_THRESHOLD_EVENT,
+        NL80211_ATTR_CQM_PKT_LOSS_EVENT,
 
         /* keep last */
         __NL80211_ATTR_CQM_AFTER_LAST,
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c6bcfe93b9c..32bd5694960 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2047,6 +2047,7 @@
 #define PCI_DEVICE_ID_AFAVLAB_P030      0x2182
 #define PCI_SUBDEVICE_ID_AFAVLAB_P061           0x2150
 
+#define PCI_VENDOR_ID_BCM_GVC          0x14a4
 #define PCI_VENDOR_ID_BROADCOM          0x14e4
 #define PCI_DEVICE_ID_TIGON3_5752       0x1600
 #define PCI_DEVICE_ID_TIGON3_5752M      0x1601
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 772dea243e5..0663945cfa4 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -923,6 +923,7 @@ struct cfg80211_disassoc_request {
  * @privacy: this is a protected network, keys will be configured
  *      after joining
  * @basic_rates: bitmap of basic rates to use when creating the IBSS
+ * @mcast_rate: per-band multicast rate index + 1 (0: disabled)
  */
 struct cfg80211_ibss_params {
         u8 *ssid;
@@ -934,6 +935,7 @@ struct cfg80211_ibss_params {
         u32 basic_rates;
         bool channel_fixed;
         bool privacy;
+        int mcast_rate[IEEE80211_NUM_BANDS];
 };
 
 /**
@@ -1304,6 +1306,9 @@ struct cfg80211_ops {
         void    (*mgmt_frame_register)(struct wiphy *wiphy,
                                        struct net_device *dev,
                                        u16 frame_type, bool reg);
+
+        int     (*set_antenna)(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant);
+        int     (*get_antenna)(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant);
 };
 
 /*
@@ -2596,6 +2601,18 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev,
                               enum nl80211_cqm_rssi_threshold_event rssi_event,
                               gfp_t gfp);
 
+/**
+ * cfg80211_cqm_pktloss_notify - notify userspace about packetloss to peer
+ * @dev: network device
+ * @peer: peer's MAC address
+ * @num_packets: how many packets were lost -- should be a fixed threshold
+ *      but probably no less than maybe 50, or maybe a throughput dependent
+ *      threshold (to account for temporary interference)
+ * @gfp: context flags
+ */
+void cfg80211_cqm_pktloss_notify(struct net_device *dev,
+                                 const u8 *peer, u32 num_packets, gfp_t gfp);
+
 /* Logging, debugging and troubleshooting/diagnostic helpers. */
 
 /* wiphy_printk helpers, similar to dev_printk */
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 9fdf982d128..eaa4affd40c 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -97,6 +97,20 @@ enum ieee80211_max_queues {
 };
 
 /**
+ * enum ieee80211_ac_numbers - AC numbers as used in mac80211
+ * @IEEE80211_AC_VO: voice
+ * @IEEE80211_AC_VI: video
+ * @IEEE80211_AC_BE: best effort
+ * @IEEE80211_AC_BK: background
+ */
+enum ieee80211_ac_numbers {
+        IEEE80211_AC_VO         = 0,
+        IEEE80211_AC_VI         = 1,
+        IEEE80211_AC_BE         = 2,
+        IEEE80211_AC_BK         = 3,
+};
+
+/**
  * struct ieee80211_tx_queue_params - transmit queue configuration
  *
  * The information provided in this structure is required for QoS
@@ -205,6 +219,7 @@ enum ieee80211_bss_change {
  * @basic_rates: bitmap of basic rates, each bit stands for an
  *      index into the rate table configured by the driver in
  *      the current band.
+ * @mcast_rate: per-band multicast rate index + 1 (0: disabled)
  * @bssid: The BSSID for this BSS
  * @enable_beacon: whether beaconing should be enabled or not
  * @channel_type: Channel type for this BSS -- the hardware might be
@@ -244,6 +259,7 @@ struct ieee80211_bss_conf {
         u16 assoc_capability;
         u64 timestamp;
         u32 basic_rates;
+        int mcast_rate[IEEE80211_NUM_BANDS];
         u16 ht_operation_mode;
         s32 cqm_rssi_thold;
         u32 cqm_rssi_hyst;
@@ -1652,6 +1668,11 @@ enum ieee80211_ampdu_mlme_action {
  *      and IV16) for the given key from hardware.
  *      The callback must be atomic.
  *
+ * @set_frag_threshold: Configuration of fragmentation threshold. Assign this
+ *      if the device does fragmentation by itself; if this callback is
+ *      implemented then the stack will not do fragmentation.
+ *      The callback can sleep.
+ *
  * @set_rts_threshold: Configuration of RTS threshold (if device needs it)
  *      The callback can sleep.
  *
@@ -1724,6 +1745,13 @@ enum ieee80211_ampdu_mlme_action {
  *      completion of the channel switch.
  *
  * @napi_poll: Poll Rx queue for incoming data frames.
+ *
+ * @set_antenna: Set antenna configuration (tx_ant, rx_ant) on the device.
+ *      Parameters are bitmaps of allowed antennas to use for TX/RX. Drivers may
+ *      reject TX/RX mask combinations they cannot support by returning -EINVAL
+ *      (also see nl80211.h @NL80211_ATTR_WIPHY_ANTENNA_TX).
+ *
+ * @get_antenna: Get current antenna configuration from device (tx_ant, rx_ant).
  */
 struct ieee80211_ops {
         int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
@@ -1765,6 +1793,7 @@ struct ieee80211_ops {
                          struct ieee80211_low_level_stats *stats);
         void (*get_tkip_seq)(struct ieee80211_hw *hw, u8 hw_key_idx,
                              u32 *iv32, u16 *iv16);
+        int (*set_frag_threshold)(struct ieee80211_hw *hw, u32 value);
         int (*set_rts_threshold)(struct ieee80211_hw *hw, u32 value);
         int (*sta_add)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                        struct ieee80211_sta *sta);
@@ -1793,6 +1822,8 @@ struct ieee80211_ops {
         void (*channel_switch)(struct ieee80211_hw *hw,
                                struct ieee80211_channel_switch *ch_switch);
         int (*napi_poll)(struct ieee80211_hw *hw, int budget);
+        int (*set_antenna)(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant);
+        int (*get_antenna)(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);
 };
 
 /**
@@ -2501,6 +2532,21 @@ void ieee80211_sta_block_awake(struct ieee80211_hw *hw,
                                struct ieee80211_sta *pubsta, bool block);
 
 /**
+ * ieee80211_ap_probereq_get - retrieve a Probe Request template
+ * @hw: pointer obtained from ieee80211_alloc_hw().
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
+ *
+ * Creates a Probe Request template which can, for example, be uploaded to
+ * hardware. The template is filled with bssid, ssid and supported rate
+ * information. This function must only be called from within the
+ * .bss_info_changed callback function and only in managed mode. The function
+ * is only useful when the interface is associated, otherwise it will return
+ * NULL.
+ */
+struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
+                                          struct ieee80211_vif *vif);
+
+/**
  * ieee80211_beacon_loss - inform hardware does not receive beacons
  *
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
@@ -2640,7 +2686,7 @@ enum rate_control_changed {
  * @rate_idx_mask: user-requested rate mask (not MCS for now)
  * @skb: the skb that will be transmitted, the control information in it needs
  *      to be filled in
- * @ap: whether this frame is sent out in AP mode
+ * @bss: whether this frame is sent out in AP or IBSS mode
  */
 struct ieee80211_tx_rate_control {
         struct ieee80211_hw *hw;
@@ -2651,7 +2697,7 @@ struct ieee80211_tx_rate_control {
         bool rts, short_preamble;
         u8 max_rate_idx;
         u32 rate_idx_mask;
-        bool ap;
+        bool bss;
 };
 
 struct rate_control_ops {
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 9e103a4e91e..356d6e3dc20 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -43,6 +43,12 @@ enum environment_cap {
  * @intersect: indicates whether the wireless core should intersect
  *      the requested regulatory domain with the presently set regulatory
  *      domain.
+ * @processed: indicates whether or not this requests has already been
+ *      processed. When the last request is processed it means that the
+ *      currently regulatory domain set on cfg80211 is updated from
+ *      CRDA and can be used by other regulatory requests. When a
+ *      the last request is not yet processed we must yield until it
+ *      is processed before processing any new requests.
  * @country_ie_checksum: checksum of the last processed and accepted
  *      country IE
  * @country_ie_env: lets us know if the AP is telling us we are outdoor,
@@ -54,6 +60,7 @@ struct regulatory_request {
         enum nl80211_reg_initiator initiator;
         char alpha2[2];
         bool intersect;
+        bool processed;
         enum environment_cap country_ie_env;
         struct list_head list;
 };
diff --git a/lib/Kconfig b/lib/Kconfig
index fa9bf2c0619..3116aa631af 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -210,4 +210,7 @@ config GENERIC_ATOMIC64
 config LRU_CACHE
         tristate
 
+config AVERAGE
+        bool
+
 endmenu
diff --git a/lib/Makefile b/lib/Makefile
index e6a3763b821..76d3b851490 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -106,6 +106,8 @@ obj-$(CONFIG_GENERIC_ATOMIC64) += atomic64.o
 
 obj-$(CONFIG_ATOMIC64_SELFTEST) += atomic64_test.o
 
+obj-$(CONFIG_AVERAGE) += average.o
+
 hostprogs-y     := gen_crc32table
 clean-files     := crc32table.h
 
diff --git a/lib/average.c b/lib/average.c
new file mode 100644
index 00000000000..f1d1b4660c4
--- /dev/null
+++ b/lib/average.c
@@ -0,0 +1,57 @@
+/*
+ * lib/average.c
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#include <linux/module.h>
+#include <linux/average.h>
+#include <linux/bug.h>
+
+/**
+ * DOC: Exponentially Weighted Moving Average (EWMA)
+ *
+ * These are generic functions for calculating Exponentially Weighted Moving
+ * Averages (EWMA). We keep a structure with the EWMA parameters and a scaled
+ * up internal representation of the average value to prevent rounding errors.
+ * The factor for scaling up and the exponential weight (or decay rate) have to
+ * be specified thru the init fuction. The structure should not be accessed
+ * directly but only thru the helper functions.
+ */
+
+/**
+ * ewma_init() - Initialize EWMA parameters
+ * @avg: Average structure
+ * @factor: Factor to use for the scaled up internal value. The maximum value
+ *      of averages can be ULONG_MAX/(factor*weight).
+ * @weight: Exponential weight, or decay rate. This defines how fast the
+ *      influence of older values decreases. Has to be bigger than 1.
+ *
+ * Initialize the EWMA parameters for a given struct ewma @avg.
+ */
+void ewma_init(struct ewma *avg, unsigned long factor, unsigned long weight)
+{
+        WARN_ON(weight <= 1 || factor == 0);
+        avg->internal = 0;
+        avg->weight = weight;
+        avg->factor = factor;
+}
+EXPORT_SYMBOL(ewma_init);
+
+/**
+ * ewma_add() - Exponentially weighted moving average (EWMA)
+ * @avg: Average structure
+ * @val: Current value
+ *
+ * Add a sample to the average.
+ */
+struct ewma *ewma_add(struct ewma *avg, unsigned long val)
+{
+        avg->internal = avg->internal  ?
+                (((avg->internal * (avg->weight - 1)) +
+                        (val * avg->factor)) / avg->weight) :
+                (val * avg->factor);
+        return avg;
+}
+EXPORT_SYMBOL(ewma_add);
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 18bd0e55060..0c544074479 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1299,6 +1299,13 @@ static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
         struct ieee80211_local *local = wiphy_priv(wiphy);
         int err;
 
+        if (changed & WIPHY_PARAM_FRAG_THRESHOLD) {
+                err = drv_set_frag_threshold(local, wiphy->frag_threshold);
+
+                if (err)
+                        return err;
+        }
+
         if (changed & WIPHY_PARAM_COVERAGE_CLASS) {
                 err = drv_set_coverage_class(local, wiphy->coverage_class);
 
@@ -1621,6 +1628,23 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
         ieee80211_queue_work(&local->hw, &local->reconfig_filter);
 }
 
+static int ieee80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+
+        if (local->started)
+                return -EOPNOTSUPP;
+
+        return drv_set_antenna(local, tx_ant, rx_ant);
+}
+
+static int ieee80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+
+        return drv_get_antenna(local, tx_ant, rx_ant);
+}
+
 struct cfg80211_ops mac80211_config_ops = {
         .add_virtual_intf = ieee80211_add_iface,
         .del_virtual_intf = ieee80211_del_iface,
@@ -1673,4 +1697,6 @@ struct cfg80211_ops mac80211_config_ops = {
         .mgmt_tx = ieee80211_mgmt_tx,
         .set_cqm_rssi_config = ieee80211_set_cqm_rssi_config,
         .mgmt_frame_register = ieee80211_mgmt_frame_register,
+        .set_antenna = ieee80211_set_antenna,
+        .get_antenna = ieee80211_get_antenna,
 };
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 16983825f8e..4244554d218 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -233,6 +233,20 @@ static inline void drv_get_tkip_seq(struct ieee80211_local *local,
         trace_drv_get_tkip_seq(local, hw_key_idx, iv32, iv16);
 }
 
+static inline int drv_set_frag_threshold(struct ieee80211_local *local,
+                                        u32 value)
+{
+        int ret = 0;
+
+        might_sleep();
+
+        trace_drv_set_frag_threshold(local, value);
+        if (local->ops->set_frag_threshold)
+                ret = local->ops->set_frag_threshold(&local->hw, value);
+        trace_drv_return_int(local, ret);
+        return ret;
+}
+
 static inline int drv_set_rts_threshold(struct ieee80211_local *local,
                                         u32 value)
 {
@@ -428,4 +442,27 @@ static inline void drv_channel_switch(struct ieee80211_local *local,
         trace_drv_return_void(local);
 }
 
+
+static inline int drv_set_antenna(struct ieee80211_local *local,
+                                  u32 tx_ant, u32 rx_ant)
+{
+        int ret = -EOPNOTSUPP;
+        might_sleep();
+        if (local->ops->set_antenna)
+                ret = local->ops->set_antenna(&local->hw, tx_ant, rx_ant);
+        trace_drv_set_antenna(local, tx_ant, rx_ant, ret);
+        return ret;
+}
+
+static inline int drv_get_antenna(struct ieee80211_local *local,
+                                  u32 *tx_ant, u32 *rx_ant)
+{
+        int ret = -EOPNOTSUPP;
+        might_sleep();
+        if (local->ops->get_antenna)
+                ret = local->ops->get_antenna(&local->hw, tx_ant, rx_ant);
+        trace_drv_get_antenna(local, *tx_ant, *rx_ant, ret);
+        return ret;
+}
+
 #endif /* __MAC80211_DRIVER_OPS */
diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index 6831fb1641c..c2772f23ac9 100644
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -531,6 +531,27 @@ TRACE_EVENT(drv_get_tkip_seq,
         )
 );
 
+TRACE_EVENT(drv_set_frag_threshold,
+        TP_PROTO(struct ieee80211_local *local, u32 value),
+
+        TP_ARGS(local, value),
+
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+                __field(u32, value)
+        ),
+
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+                __entry->value = value;
+        ),
+
+        TP_printk(
+                LOCAL_PR_FMT " value:%d",
+                LOCAL_PR_ARG, __entry->value
+        )
+);
+
 TRACE_EVENT(drv_set_rts_threshold,
         TP_PROTO(struct ieee80211_local *local, u32 value),
 
@@ -862,6 +883,56 @@ TRACE_EVENT(drv_channel_switch,
         )
 );
 
+TRACE_EVENT(drv_set_antenna,
+        TP_PROTO(struct ieee80211_local *local, u32 tx_ant, u32 rx_ant, int ret),
+
+        TP_ARGS(local, tx_ant, rx_ant, ret),
+
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+                __field(u32, tx_ant)
+                __field(u32, rx_ant)
+                __field(int, ret)
+        ),
+
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+                __entry->tx_ant = tx_ant;
+                __entry->rx_ant = rx_ant;
+                __entry->ret = ret;
+        ),
+
+        TP_printk(
+                LOCAL_PR_FMT " tx_ant:%d rx_ant:%d ret:%d",
+                LOCAL_PR_ARG, __entry->tx_ant, __entry->rx_ant, __entry->ret
+        )
+);
+
+TRACE_EVENT(drv_get_antenna,
+        TP_PROTO(struct ieee80211_local *local, u32 tx_ant, u32 rx_ant, int ret),
+
+        TP_ARGS(local, tx_ant, rx_ant, ret),
+
+        TP_STRUCT__entry(
+                LOCAL_ENTRY
+                __field(u32, tx_ant)
+                __field(u32, rx_ant)
+                __field(int, ret)
+        ),
+
+        TP_fast_assign(
+                LOCAL_ASSIGN;
+                __entry->tx_ant = tx_ant;
+                __entry->rx_ant = rx_ant;
+                __entry->ret = ret;
+        ),
+
+        TP_printk(
+                LOCAL_PR_FMT " tx_ant:%d rx_ant:%d ret:%d",
+                LOCAL_PR_ARG, __entry->tx_ant, __entry->rx_ant, __entry->ret
+        )
+);
+
 /*
  * Tracing for API calls that drivers call.
  */
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 239c4836a94..410d104b134 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -915,6 +915,8 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
 
         sdata->u.ibss.privacy = params->privacy;
         sdata->u.ibss.basic_rates = params->basic_rates;
+        memcpy(sdata->vif.bss_conf.mcast_rate, params->mcast_rate,
+               sizeof(params->mcast_rate));
 
         sdata->vif.bss_conf.beacon_int = params->beacon_interval;
 
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index b80c3868992..5bc0745368f 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -349,6 +349,7 @@ struct ieee80211_if_managed {
         struct work_struct chswitch_work;
         struct work_struct beacon_connection_loss_work;
 
+        unsigned long beacon_timeout;
         unsigned long probe_timeout;
         int probe_send_count;
 
@@ -1264,6 +1265,8 @@ void ieee80211_send_nullfunc(struct ieee80211_local *local,
                              int powersave);
 void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,
                              struct ieee80211_hdr *hdr);
+void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata,
+                             struct ieee80211_hdr *hdr);
 void ieee80211_beacon_connection_loss_work(struct work_struct *work);
 
 void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,
@@ -1278,6 +1281,9 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local,
                                struct sk_buff *skb);
 int ieee80211_add_pending_skbs(struct ieee80211_local *local,
                                struct sk_buff_head *skbs);
+int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
+                                  struct sk_buff_head *skbs,
+                                  void (*fn)(void *data), void *data);
 
 void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
                          u16 transaction, u16 auth_alg,
@@ -1287,6 +1293,10 @@ int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer,
                              const u8 *ie, size_t ie_len,
                              enum ieee80211_band band, u32 rate_mask,
                              u8 channel);
+struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata,
+                                          u8 *dst,
+                                          const u8 *ssid, size_t ssid_len,
+                                          const u8 *ie, size_t ie_len);
 void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
                               const u8 *ssid, size_t ssid_len,
                               const u8 *ie, size_t ie_len);
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index ccd676b2f59..72df1ca7299 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -84,10 +84,17 @@ static int ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
                 goto out_unsupported;
 
         sdata = key->sdata;
-        if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
+        if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) {
+                /*
+                 * The driver doesn't know anything about VLAN interfaces.
+                 * Hence, don't send GTKs for VLAN interfaces to the driver.
+                 */
+                if (!(key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE))
+                        goto out_unsupported;
                 sdata = container_of(sdata->bss,
                                      struct ieee80211_sub_if_data,
                                      u.ap);
+        }
 
         ret = drv_set_key(key->local, SET_KEY, sdata, sta, &key->conf);
 
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index a3a9421555a..79480791494 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -28,13 +28,19 @@
 #include "rate.h"
 #include "led.h"
 
+#define IEEE80211_MAX_NULLFUNC_TRIES 2
 #define IEEE80211_MAX_PROBE_TRIES 5
 
 /*
- * beacon loss detection timeout
- * XXX: should depend on beacon interval
+ * Beacon loss timeout is calculated as N frames times the
+ * advertised beacon interval.  This may need to be somewhat
+ * higher than what hardware might detect to account for
+ * delays in the host processing frames. But since we also
+ * probe on beacon miss before declaring the connection lost
+ * default to what we want.
  */
-#define IEEE80211_BEACON_LOSS_TIME      (2 * HZ)
+#define IEEE80211_BEACON_LOSS_COUNT     7
+
 /*
  * Time the connection can be idle before we probe
  * it to see if we can still talk to the AP.
@@ -121,7 +127,7 @@ void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata)
                 return;
 
         mod_timer(&sdata->u.mgd.bcn_mon_timer,
-                  round_jiffies_up(jiffies + IEEE80211_BEACON_LOSS_TIME));
+                  round_jiffies_up(jiffies + sdata->u.mgd.beacon_timeout));
 }
 
 void ieee80211_sta_reset_conn_monitor(struct ieee80211_sub_if_data *sdata)
@@ -871,6 +877,9 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
         bss_info_changed |= ieee80211_handle_bss_capability(sdata,
                 cbss->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));
+
         sdata->u.mgd.associated = cbss;
         memcpy(sdata->u.mgd.bssid, cbss->bssid, ETH_ALEN);
 
@@ -1026,6 +1035,51 @@ void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,
         ieee80211_sta_reset_conn_monitor(sdata);
 }
 
+static void ieee80211_reset_ap_probe(struct ieee80211_sub_if_data *sdata)
+{
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+
+        if (!(ifmgd->flags & (IEEE80211_STA_BEACON_POLL |
+                              IEEE80211_STA_CONNECTION_POLL)))
+            return;
+
+        ifmgd->flags &= ~(IEEE80211_STA_CONNECTION_POLL |
+                          IEEE80211_STA_BEACON_POLL);
+        mutex_lock(&sdata->local->iflist_mtx);
+        ieee80211_recalc_ps(sdata->local, -1);
+        mutex_unlock(&sdata->local->iflist_mtx);
+
+        if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)
+                return;
+
+        /*
+         * We've received a probe response, but are not sure whether
+         * we have or will be receiving any beacons or data, so let's
+         * schedule the timers again, just in case.
+         */
+        ieee80211_sta_reset_beacon_monitor(sdata);
+
+        mod_timer(&ifmgd->conn_mon_timer,
+                  round_jiffies_up(jiffies +
+                                   IEEE80211_CONNECTION_IDLE_TIME));
+}
+
+void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata,
+                             struct ieee80211_hdr *hdr)
+{
+        if (!ieee80211_is_data(hdr->frame_control) &&
+            !ieee80211_is_nullfunc(hdr->frame_control))
+            return;
+
+        ieee80211_sta_reset_conn_monitor(sdata);
+
+        if (ieee80211_is_nullfunc(hdr->frame_control) &&
+            sdata->u.mgd.probe_send_count > 0) {
+                sdata->u.mgd.probe_send_count = 0;
+                ieee80211_queue_work(&sdata->local->hw, &sdata->work);
+        }
+}
+
 static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
@@ -1041,8 +1095,19 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata)
         if (ifmgd->probe_send_count >= unicast_limit)
                 dst = NULL;
 
-        ssid = ieee80211_bss_get_ie(ifmgd->associated, WLAN_EID_SSID);
-        ieee80211_send_probe_req(sdata, dst, ssid + 2, ssid[1], NULL, 0);
+        /*
+         * When the hardware reports an accurate Tx ACK status, it's
+         * better to send a nullfunc frame instead of a probe request,
+         * as it will kick us off the AP quickly if we aren't associated
+         * anymore. The timeout will be reset if the frame is ACKed by
+         * the AP.
+         */
+        if (sdata->local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
+                ieee80211_send_nullfunc(sdata->local, sdata, 0);
+        else {
+                ssid = ieee80211_bss_get_ie(ifmgd->associated, WLAN_EID_SSID);
+                ieee80211_send_probe_req(sdata, dst, ssid + 2, ssid[1], NULL, 0);
+        }
 
         ifmgd->probe_send_count++;
         ifmgd->probe_timeout = jiffies + IEEE80211_PROBE_WAIT;
@@ -1108,6 +1173,30 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
         mutex_unlock(&ifmgd->mtx);
 }
 
+struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
+                                          struct ieee80211_vif *vif)
+{
+        struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif);
+        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
+        struct sk_buff *skb;
+        const u8 *ssid;
+
+        if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION))
+                return NULL;
+
+        ASSERT_MGD_MTX(ifmgd);
+
+        if (!ifmgd->associated)
+                return NULL;
+
+        ssid = ieee80211_bss_get_ie(ifmgd->associated, WLAN_EID_SSID);
+        skb = ieee80211_build_probe_req(sdata, ifmgd->associated->bssid,
+                                        ssid + 2, ssid[1], NULL, 0);
+
+        return skb;
+}
+EXPORT_SYMBOL(ieee80211_ap_probereq_get);
+
 static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata)
 {
         struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
@@ -1485,29 +1574,8 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
         ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, false);
 
         if (ifmgd->associated &&
-            memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN) == 0 &&
-            ifmgd->flags & (IEEE80211_STA_BEACON_POLL |
-                            IEEE80211_STA_CONNECTION_POLL)) {
-                ifmgd->flags &= ~(IEEE80211_STA_CONNECTION_POLL |
-                                  IEEE80211_STA_BEACON_POLL);
-                mutex_lock(&sdata->local->iflist_mtx);
-                ieee80211_recalc_ps(sdata->local, -1);
-                mutex_unlock(&sdata->local->iflist_mtx);
-
-                if (sdata->local->hw.flags & IEEE80211_HW_CONNECTION_MONITOR)
-                        return;
-
-                /*
-                 * We've received a probe response, but are not sure whether
-                 * we have or will be receiving any beacons or data, so let's
-                 * schedule the timers again, just in case.
-                 */
-                ieee80211_sta_reset_beacon_monitor(sdata);
-
-                mod_timer(&ifmgd->conn_mon_timer,
-                          round_jiffies_up(jiffies +
-                                           IEEE80211_CONNECTION_IDLE_TIME));
-        }
+            memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN) == 0)
+                ieee80211_reset_ap_probe(sdata);
 }
 
 /*
@@ -1857,12 +1925,23 @@ void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata)
                             IEEE80211_STA_CONNECTION_POLL) &&
             ifmgd->associated) {
                 u8 bssid[ETH_ALEN];
+                int max_tries;
 
                 memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);
-                if (time_is_after_jiffies(ifmgd->probe_timeout))
+
+                if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)
+                        max_tries = IEEE80211_MAX_NULLFUNC_TRIES;
+                else
+                        max_tries = IEEE80211_MAX_PROBE_TRIES;
+
+                /* ACK received for nullfunc probing frame */
+                if (!ifmgd->probe_send_count)
+                        ieee80211_reset_ap_probe(sdata);
+
+                else if (time_is_after_jiffies(ifmgd->probe_timeout))
                         run_again(ifmgd, ifmgd->probe_timeout);
 
-                else if (ifmgd->probe_send_count < IEEE80211_MAX_PROBE_TRIES) {
+                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"
@@ -1988,6 +2067,8 @@ void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata)
                 add_timer(&ifmgd->timer);
         if (test_and_clear_bit(TMR_RUNNING_CHANSW, &ifmgd->timers_running))
                 add_timer(&ifmgd->chswitch_timer);
+        ieee80211_sta_reset_beacon_monitor(sdata);
+        ieee80211_restart_sta_timer(sdata);
 }
 #endif
 
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 33f76993da0..3d5a2cb835c 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -211,7 +211,8 @@ static bool rc_no_data_or_no_ack(struct ieee80211_tx_rate_control *txrc)
         return (info->flags & IEEE80211_TX_CTL_NO_ACK) || !ieee80211_is_data(fc);
 }
 
-static void rc_send_low_broadcast(s8 *idx, u32 basic_rates, u8 max_rate_idx)
+static void rc_send_low_broadcast(s8 *idx, u32 basic_rates,
+                                  struct ieee80211_supported_band *sband)
 {
         u8 i;
 
@@ -222,7 +223,7 @@ static void rc_send_low_broadcast(s8 *idx, u32 basic_rates, u8 max_rate_idx)
         if (basic_rates & (1 << *idx))
                 return; /* selected rate is a basic rate */
 
-        for (i = *idx + 1; i <= max_rate_idx; i++) {
+        for (i = *idx + 1; i <= sband->n_bitrates; i++) {
                 if (basic_rates & (1 << i)) {
                         *idx = i;
                         return;
@@ -237,16 +238,25 @@ bool rate_control_send_low(struct ieee80211_sta *sta,
                            struct ieee80211_tx_rate_control *txrc)
 {
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txrc->skb);
+        struct ieee80211_supported_band *sband = txrc->sband;
+        int mcast_rate;
 
         if (!sta || !priv_sta || rc_no_data_or_no_ack(txrc)) {
                 info->control.rates[0].idx = rate_lowest_index(txrc->sband, sta);
                 info->control.rates[0].count =
                         (info->flags & IEEE80211_TX_CTL_NO_ACK) ?
                         1 : txrc->hw->max_rate_tries;
-                if (!sta && txrc->ap)
+                if (!sta && txrc->bss) {
+                        mcast_rate = txrc->bss_conf->mcast_rate[sband->band];
+                        if (mcast_rate > 0) {
+                                info->control.rates[0].idx = mcast_rate - 1;
+                                return true;
+                        }
+
                         rc_send_low_broadcast(&info->control.rates[0].idx,
                                               txrc->bss_conf->basic_rates,
-                                              txrc->sband->n_bitrates);
+                                              sband);
+                }
                 return true;
         }
         return false;
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
index 2d6f0259e0c..4ad7a362fcc 100644
--- a/net/mac80211/rc80211_minstrel_ht.c
+++ b/net/mac80211/rc80211_minstrel_ht.c
@@ -371,6 +371,9 @@ minstrel_aggr_check(struct minstrel_priv *mp, struct ieee80211_sta *pubsta, stru
         if (likely(sta->ampdu_mlme.tid_tx[tid]))
                 return;
 
+        if (skb_get_queue_mapping(skb) == IEEE80211_AC_VO)
+                return;
+
         ieee80211_start_tx_ba_session(pubsta, tid);
 }
 
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 902b03ee8f6..d2fcd22ab06 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1102,8 +1102,6 @@ static void ap_sta_ps_end(struct sta_info *sta)
 
         atomic_dec(&sdata->bss->num_sta_ps);
 
-        clear_sta_flags(sta, WLAN_STA_PS_STA);
-
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
         printk(KERN_DEBUG "%s: STA %pM aid %d exits power save mode\n",
                sdata->name, sta->sta.addr, sta->sta.aid);
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 6d8f897d876..eff58571fd7 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -199,8 +199,11 @@ static void sta_unblock(struct work_struct *wk)
 
         if (!test_sta_flags(sta, WLAN_STA_PS_STA))
                 ieee80211_sta_ps_deliver_wakeup(sta);
-        else if (test_and_clear_sta_flags(sta, WLAN_STA_PSPOLL))
+        else if (test_and_clear_sta_flags(sta, WLAN_STA_PSPOLL)) {
+                clear_sta_flags(sta, WLAN_STA_PS_DRIVER);
                 ieee80211_sta_ps_deliver_poll_response(sta);
+        } else
+                clear_sta_flags(sta, WLAN_STA_PS_DRIVER);
 }
 
 static int sta_prepare_rate_control(struct ieee80211_local *local,
@@ -880,6 +883,13 @@ struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_vif *vif,
 }
 EXPORT_SYMBOL(ieee80211_find_sta);
 
+static void clear_sta_ps_flags(void *_sta)
+{
+        struct sta_info *sta = _sta;
+
+        clear_sta_flags(sta, WLAN_STA_PS_DRIVER | WLAN_STA_PS_STA);
+}
+
 /* powersave support code */
 void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
 {
@@ -894,7 +904,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
 
         /* Send all buffered frames to the station */
         sent = ieee80211_add_pending_skbs(local, &sta->tx_filtered);
-        buffered = ieee80211_add_pending_skbs(local, &sta->ps_tx_buf);
+        buffered = ieee80211_add_pending_skbs_fn(local, &sta->ps_tx_buf,
+                                                 clear_sta_ps_flags, sta);
         sent += buffered;
         local->total_ps_buffered -= buffered;
 
@@ -973,7 +984,7 @@ void ieee80211_sta_block_awake(struct ieee80211_hw *hw,
 
         if (block)
                 set_sta_flags(sta, WLAN_STA_PS_DRIVER);
-        else
+        else if (test_sta_flags(sta, WLAN_STA_PS_DRIVER))
                 ieee80211_queue_work(hw, &sta->drv_unblock_wk);
 }
 EXPORT_SYMBOL(ieee80211_sta_block_awake);
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 9265acadef3..b562d9b6a70 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -248,6 +248,7 @@ enum plink_state {
  * @sta: station information we share with the driver
  * @dead: set to true when sta is unlinked
  * @uploaded: set to true when sta is uploaded to the driver
+ * @lost_packets: number of consecutive lost packets
  */
 struct sta_info {
         /* General information, mostly static */
@@ -335,6 +336,8 @@ struct sta_info {
         } debugfs;
 #endif
 
+        unsigned int lost_packets;
+
         /* keep last! */
         struct ieee80211_sta sta;
 };
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 3153c19893b..bed7e32ed90 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -155,8 +155,21 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb)
 
                 ieee80211_queue_work(&local->hw, &local->recalc_smps);
         }
+
+        if ((sdata->vif.type == NL80211_IFTYPE_STATION) &&
+            (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS))
+                ieee80211_sta_tx_notify(sdata, (void *) skb->data);
 }
 
+/*
+ * Use a static threshold for now, best value to be determined
+ * by testing ...
+ * Should it depend on:
+ *  - on # of retransmissions
+ *  - current throughput (higher value for higher tpt)?
+ */
+#define STA_LOST_PKT_THRESHOLD  50
+
 void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
 {
         struct sk_buff *skb2;
@@ -243,6 +256,19 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
                 if (!(info->flags & IEEE80211_TX_CTL_INJECTED) &&
                     (info->flags & IEEE80211_TX_STAT_ACK))
                         ieee80211_frame_acked(sta, skb);
+
+                if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) {
+                        if (info->flags & IEEE80211_TX_STAT_ACK) {
+                                if (sta->lost_packets)
+                                        sta->lost_packets = 0;
+                        } else if (++sta->lost_packets >= STA_LOST_PKT_THRESHOLD) {
+                                cfg80211_cqm_pktloss_notify(sta->sdata->dev,
+                                                            sta->sta.addr,
+                                                            sta->lost_packets,
+                                                            GFP_ATOMIC);
+                                sta->lost_packets = 0;
+                        }
+                }
         }
 
         rcu_read_unlock();
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 96c59430950..e69483647f3 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -622,7 +622,8 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
                 txrc.max_rate_idx = -1;
         else
                 txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
-        txrc.ap = tx->sdata->vif.type == NL80211_IFTYPE_AP;
+        txrc.bss = (tx->sdata->vif.type == NL80211_IFTYPE_AP ||
+                    tx->sdata->vif.type == NL80211_IFTYPE_ADHOC);
 
         /* set up RTS protection if desired */
         if (len > tx->local->hw.wiphy->rts_threshold) {
@@ -1033,6 +1034,7 @@ static bool __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx,
         struct ieee80211_radiotap_header *rthdr =
                 (struct ieee80211_radiotap_header *) skb->data;
         struct ieee80211_supported_band *sband;
+        bool hw_frag;
         struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
         int ret = ieee80211_radiotap_iterator_init(&iterator, rthdr, skb->len,
                                                    NULL);
@@ -1042,6 +1044,9 @@ static bool __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx,
         info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
         tx->flags &= ~IEEE80211_TX_FRAGMENTED;
 
+        /* packet is fragmented in HW if we have a non-NULL driver callback */
+        hw_frag = (tx->local->ops->set_frag_threshold != NULL);
+
         /*
          * for every radiotap entry that is present
          * (ieee80211_radiotap_iterator_next returns -ENOENT when no more
@@ -1078,7 +1083,8 @@ static bool __ieee80211_parse_tx_radiotap(struct ieee80211_tx_data *tx,
                         }
                         if (*iterator.this_arg & IEEE80211_RADIOTAP_F_WEP)
                                 info->flags &= ~IEEE80211_TX_INTFL_DONT_ENCRYPT;
-                        if (*iterator.this_arg & IEEE80211_RADIOTAP_F_FRAG)
+                        if ((*iterator.this_arg & IEEE80211_RADIOTAP_F_FRAG) &&
+                                                                !hw_frag)
                                 tx->flags |= IEEE80211_TX_FRAGMENTED;
                         break;
 
@@ -1181,8 +1187,10 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata,
         /*
          * Set this flag (used below to indicate "automatic fragmentation"),
          * it will be cleared/left by radiotap as desired.
+         * Only valid when fragmentation is done by the stack.
          */
-        tx->flags |= IEEE80211_TX_FRAGMENTED;
+        if (!local->ops->set_frag_threshold)
+                tx->flags |= IEEE80211_TX_FRAGMENTED;
 
         /* process and remove the injection radiotap header */
         if (unlikely(info->flags & IEEE80211_TX_INTFL_HAS_RADIOTAP)) {
@@ -2301,7 +2309,7 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw,
                 txrc.max_rate_idx = -1;
         else
                 txrc.max_rate_idx = fls(txrc.rate_idx_mask) - 1;
-        txrc.ap = true;
+        txrc.bss = true;
         rate_control_get_rate(sdata, NULL, &txrc);
 
         info->control.vif = vif;
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 0b6fc92bc0d..e497476174c 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -368,8 +368,9 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local,
         spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
 }
 
-int ieee80211_add_pending_skbs(struct ieee80211_local *local,
-                               struct sk_buff_head *skbs)
+int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,
+                                  struct sk_buff_head *skbs,
+                                  void (*fn)(void *data), void *data)
 {
         struct ieee80211_hw *hw = &local->hw;
         struct sk_buff *skb;
@@ -394,6 +395,9 @@ int ieee80211_add_pending_skbs(struct ieee80211_local *local,
                 __skb_queue_tail(&local->pending[queue], skb);
         }
 
+        if (fn)
+                fn(data);
+
         for (i = 0; i < hw->queues; i++)
                 __ieee80211_wake_queue(hw, i,
                         IEEE80211_QUEUE_STOP_REASON_SKB_ADD);
@@ -402,6 +406,12 @@ int ieee80211_add_pending_skbs(struct ieee80211_local *local,
         return ret;
 }
 
+int ieee80211_add_pending_skbs(struct ieee80211_local *local,
+                               struct sk_buff_head *skbs)
+{
+        return ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL);
+}
+
 void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw,
                                     enum queue_stop_reason reason)
 {
@@ -1011,9 +1021,10 @@ int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer,
         return pos - buffer;
 }
 
-void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
-                              const u8 *ssid, size_t ssid_len,
-                              const u8 *ie, size_t ie_len)
+struct sk_buff *ieee80211_build_probe_req(struct ieee80211_sub_if_data *sdata,
+                                          u8 *dst,
+                                          const u8 *ssid, size_t ssid_len,
+                                          const u8 *ie, size_t ie_len)
 {
         struct ieee80211_local *local = sdata->local;
         struct sk_buff *skb;
@@ -1027,7 +1038,7 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
         if (!buf) {
                 printk(KERN_DEBUG "%s: failed to allocate temporary IE "
                        "buffer\n", sdata->name);
-                return;
+                return NULL;
         }
 
         chan = ieee80211_frequency_to_channel(
@@ -1050,8 +1061,20 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
         }
 
         IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
-        ieee80211_tx_skb(sdata, skb);
         kfree(buf);
+
+        return skb;
+}
+
+void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
+                              const u8 *ssid, size_t ssid_len,
+                              const u8 *ie, size_t ie_len)
+{
+        struct sk_buff *skb;
+
+        skb = ieee80211_build_probe_req(sdata, dst, ssid, ssid_len, ie, ie_len);
+        if (skb)
+                ieee80211_tx_skb(sdata, skb);
 }
 
 u32 ieee80211_sta_get_rates(struct ieee80211_local *local,
@@ -1152,6 +1175,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         }
         mutex_unlock(&local->sta_mtx);
 
+        /* setup fragmentation threshold */
+        drv_set_frag_threshold(local, hw->wiphy->frag_threshold);
+
         /* setup RTS threshold */
         drv_set_rts_threshold(local, hw->wiphy->rts_threshold);
 
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c
index 34e6d02da77..58e75bbc1f9 100644
--- a/net/mac80211/wme.c
+++ b/net/mac80211/wme.c
@@ -21,7 +21,16 @@
 /* Default mapping in classifier to work with default
  * queue setup.
  */
-const int ieee802_1d_to_ac[8] = { 2, 3, 3, 2, 1, 1, 0, 0 };
+const int ieee802_1d_to_ac[8] = {
+        IEEE80211_AC_BE,
+        IEEE80211_AC_BK,
+        IEEE80211_AC_BK,
+        IEEE80211_AC_BE,
+        IEEE80211_AC_VI,
+        IEEE80211_AC_VI,
+        IEEE80211_AC_VO,
+        IEEE80211_AC_VO
+};
 
 static int wme_downgrade_ac(struct sk_buff *skb)
 {
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 9c21ebf9780..630bcf0a2f0 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -4,6 +4,8 @@
  * Copyright 2006-2010          Johannes Berg <johannes@sipsolutions.net>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/if.h>
 #include <linux/module.h>
 #include <linux/err.h>
@@ -216,8 +218,7 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
                             rdev->wiphy.debugfsdir,
                             rdev->wiphy.debugfsdir->d_parent,
                             newname))
-                printk(KERN_ERR "cfg80211: failed to rename debugfs dir to %s!\n",
-                       newname);
+                pr_err("failed to rename debugfs dir to %s!\n", newname);
 
         nl80211_notify_dev_rename(rdev);
 
@@ -699,8 +700,7 @@ static int cfg80211_netdev_notifier_call(struct notifier_block * nb,
 
                 if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj,
                                       "phy80211")) {
-                        printk(KERN_ERR "wireless: failed to add phy80211 "
-                                "symlink to netdev!\n");
+                        pr_err("failed to add phy80211 symlink to netdev!\n");
                 }
                 wdev->netdev = dev;
                 wdev->sme_state = CFG80211_SME_IDLE;
diff --git a/net/wireless/lib80211.c b/net/wireless/lib80211.c
index 97d411f7450..3268fac5ab2 100644
--- a/net/wireless/lib80211.c
+++ b/net/wireless/lib80211.c
@@ -13,6 +13,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/ieee80211.h>
@@ -224,8 +226,8 @@ int lib80211_unregister_crypto_ops(struct lib80211_crypto_ops *ops)
         return -EINVAL;
 
       found:
-        printk(KERN_DEBUG "lib80211_crypt: unregistered algorithm "
-               "'%s'\n", ops->name);
+        printk(KERN_DEBUG "lib80211_crypt: unregistered algorithm '%s'\n",
+               ops->name);
         list_del(&alg->list);
         spin_unlock_irqrestore(&lib80211_crypto_lock, flags);
         kfree(alg);
@@ -270,7 +272,7 @@ static struct lib80211_crypto_ops lib80211_crypt_null = {
 
 static int __init lib80211_init(void)
 {
-        printk(KERN_INFO DRV_NAME ": " DRV_DESCRIPTION "\n");
+        pr_info(DRV_DESCRIPTION "\n");
         return lib80211_register_crypto_ops(&lib80211_crypt_null);
 }
 
diff --git a/net/wireless/lib80211_crypt_tkip.c b/net/wireless/lib80211_crypt_tkip.c
index 0fe40510e2c..7ea4f2b0770 100644
--- a/net/wireless/lib80211_crypt_tkip.c
+++ b/net/wireless/lib80211_crypt_tkip.c
@@ -10,6 +10,8 @@
  * more details.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -99,8 +101,7 @@ static void *lib80211_tkip_init(int key_idx)
         priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
                                                 CRYPTO_ALG_ASYNC);
         if (IS_ERR(priv->tx_tfm_arc4)) {
-                printk(KERN_DEBUG "lib80211_crypt_tkip: could not allocate "
-                       "crypto API arc4\n");
+                printk(KERN_DEBUG pr_fmt("could not allocate crypto API arc4\n"));
                 priv->tx_tfm_arc4 = NULL;
                 goto fail;
         }
@@ -108,8 +109,7 @@ static void *lib80211_tkip_init(int key_idx)
         priv->tx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
                                                  CRYPTO_ALG_ASYNC);
         if (IS_ERR(priv->tx_tfm_michael)) {
-                printk(KERN_DEBUG "lib80211_crypt_tkip: could not allocate "
-                       "crypto API michael_mic\n");
+                printk(KERN_DEBUG pr_fmt("could not allocate crypto API michael_mic\n"));
                 priv->tx_tfm_michael = NULL;
                 goto fail;
         }
@@ -117,8 +117,7 @@ static void *lib80211_tkip_init(int key_idx)
         priv->rx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,
                                                 CRYPTO_ALG_ASYNC);
         if (IS_ERR(priv->rx_tfm_arc4)) {
-                printk(KERN_DEBUG "lib80211_crypt_tkip: could not allocate "
-                       "crypto API arc4\n");
+                printk(KERN_DEBUG pr_fmt("could not allocate crypto API arc4\n"));
                 priv->rx_tfm_arc4 = NULL;
                 goto fail;
         }
@@ -126,8 +125,7 @@ static void *lib80211_tkip_init(int key_idx)
         priv->rx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
                                                  CRYPTO_ALG_ASYNC);
         if (IS_ERR(priv->rx_tfm_michael)) {
-                printk(KERN_DEBUG "lib80211_crypt_tkip: could not allocate "
-                       "crypto API michael_mic\n");
+                printk(KERN_DEBUG pr_fmt("could not allocate crypto API michael_mic\n"));
                 priv->rx_tfm_michael = NULL;
                 goto fail;
         }
@@ -536,7 +534,7 @@ static int michael_mic(struct crypto_hash *tfm_michael, u8 * key, u8 * hdr,
         struct scatterlist sg[2];
 
         if (tfm_michael == NULL) {
-                printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
+                pr_warn("%s(): tfm_michael == NULL\n", __func__);
                 return -1;
         }
         sg_init_table(sg, 2);
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index 26838d903b9..6980a0c315b 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -1028,3 +1028,15 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev,
         nl80211_send_cqm_rssi_notify(rdev, dev, rssi_event, gfp);
 }
 EXPORT_SYMBOL(cfg80211_cqm_rssi_notify);
+
+void cfg80211_cqm_pktloss_notify(struct net_device *dev,
+                                 const u8 *peer, u32 num_packets, gfp_t gfp)
+{
+        struct wireless_dev *wdev = dev->ieee80211_ptr;
+        struct wiphy *wiphy = wdev->wiphy;
+        struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
+
+        /* Indicate roaming trigger event to user space */
+        nl80211_send_cqm_pktloss_notify(rdev, dev, peer, num_packets, gfp);
+}
+EXPORT_SYMBOL(cfg80211_cqm_pktloss_notify);
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 4e78e3f2679..67ff7e92cb9 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -166,7 +166,13 @@ static const struct nla_policy nl80211_policy[NL80211_ATTR_MAX+1] = {
 
         [NL80211_ATTR_WIPHY_TX_POWER_SETTING] = { .type = NLA_U32 },
         [NL80211_ATTR_WIPHY_TX_POWER_LEVEL] = { .type = NLA_U32 },
+
         [NL80211_ATTR_FRAME_TYPE] = { .type = NLA_U16 },
+
+        [NL80211_ATTR_WIPHY_ANTENNA_TX] = { .type = NLA_U32 },
+        [NL80211_ATTR_WIPHY_ANTENNA_RX] = { .type = NLA_U32 },
+
+        [NL80211_ATTR_MCAST_RATE] = { .type = NLA_U32 },
 };
 
 /* policy for the key attributes */
@@ -526,7 +532,6 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
                     dev->wiphy.rts_threshold);
         NLA_PUT_U8(msg, NL80211_ATTR_WIPHY_COVERAGE_CLASS,
                     dev->wiphy.coverage_class);
-
         NLA_PUT_U8(msg, NL80211_ATTR_MAX_NUM_SCAN_SSIDS,
                    dev->wiphy.max_scan_ssids);
         NLA_PUT_U16(msg, NL80211_ATTR_MAX_SCAN_IE_LEN,
@@ -545,6 +550,16 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
         if (dev->wiphy.flags & WIPHY_FLAG_CONTROL_PORT_PROTOCOL)
                 NLA_PUT_FLAG(msg, NL80211_ATTR_CONTROL_PORT_ETHERTYPE);
 
+        if (dev->ops->get_antenna) {
+                u32 tx_ant = 0, rx_ant = 0;
+                int res;
+                res = dev->ops->get_antenna(&dev->wiphy, &tx_ant, &rx_ant);
+                if (!res) {
+                        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_ANTENNA_TX, tx_ant);
+                        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_ANTENNA_RX, rx_ant);
+                }
+        }
+
         nl_modes = nla_nest_start(msg, NL80211_ATTR_SUPPORTED_IFTYPES);
         if (!nl_modes)
                 goto nla_put_failure;
@@ -1024,6 +1039,22 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)
                         goto bad_res;
         }
 
+        if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] &&
+            info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) {
+                u32 tx_ant, rx_ant;
+                if (!rdev->ops->set_antenna) {
+                        result = -EOPNOTSUPP;
+                        goto bad_res;
+                }
+
+                tx_ant = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX]);
+                rx_ant = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]);
+
+                result = rdev->ops->set_antenna(&rdev->wiphy, tx_ant, rx_ant);
+                if (result)
+                        goto bad_res;
+        }
+
         changed = 0;
 
         if (info->attrs[NL80211_ATTR_WIPHY_RETRY_SHORT]) {
@@ -3569,6 +3600,34 @@ static int nl80211_disassociate(struct sk_buff *skb, struct genl_info *info)
                                       local_state_change);
 }
 
+static bool
+nl80211_parse_mcast_rate(struct cfg80211_registered_device *rdev,
+                         int mcast_rate[IEEE80211_NUM_BANDS],
+                         int rateval)
+{
+        struct wiphy *wiphy = &rdev->wiphy;
+        bool found = false;
+        int band, i;
+
+        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
+                struct ieee80211_supported_band *sband;
+
+                sband = wiphy->bands[band];
+                if (!sband)
+                        continue;
+
+                for (i = 0; i < sband->n_bitrates; i++) {
+                        if (sband->bitrates[i].bitrate == rateval) {
+                                mcast_rate[band] = i + 1;
+                                found = true;
+                                break;
+                        }
+                }
+        }
+
+        return found;
+}
+
 static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
 {
         struct cfg80211_registered_device *rdev = info->user_ptr[0];
@@ -3653,6 +3712,11 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info)
                 }
         }
 
+        if (info->attrs[NL80211_ATTR_MCAST_RATE] &&
+            !nl80211_parse_mcast_rate(rdev, ibss.mcast_rate,
+                        nla_get_u32(info->attrs[NL80211_ATTR_MCAST_RATE])))
+                return -EINVAL;
+
         if (ibss.privacy && info->attrs[NL80211_ATTR_KEYS]) {
                 connkeys = nl80211_parse_connkeys(rdev,
                                         info->attrs[NL80211_ATTR_KEYS]);
@@ -5651,6 +5715,51 @@ nl80211_send_cqm_rssi_notify(struct cfg80211_registered_device *rdev,
         nlmsg_free(msg);
 }
 
+void
+nl80211_send_cqm_pktloss_notify(struct cfg80211_registered_device *rdev,
+                                struct net_device *netdev, const u8 *peer,
+                                u32 num_packets, gfp_t gfp)
+{
+        struct sk_buff *msg;
+        struct nlattr *pinfoattr;
+        void *hdr;
+
+        msg = nlmsg_new(NLMSG_GOODSIZE, gfp);
+        if (!msg)
+                return;
+
+        hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_NOTIFY_CQM);
+        if (!hdr) {
+                nlmsg_free(msg);
+                return;
+        }
+
+        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx);
+        NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex);
+        NLA_PUT(msg, NL80211_ATTR_MAC, ETH_ALEN, peer);
+
+        pinfoattr = nla_nest_start(msg, NL80211_ATTR_CQM);
+        if (!pinfoattr)
+                goto nla_put_failure;
+
+        NLA_PUT_U32(msg, NL80211_ATTR_CQM_PKT_LOSS_EVENT, num_packets);
+
+        nla_nest_end(msg, pinfoattr);
+
+        if (genlmsg_end(msg, hdr) < 0) {
+                nlmsg_free(msg);
+                return;
+        }
+
+        genlmsg_multicast_netns(wiphy_net(&rdev->wiphy), msg, 0,
+                                nl80211_mlme_mcgrp.id, gfp);
+        return;
+
+ nla_put_failure:
+        genlmsg_cancel(msg, hdr);
+        nlmsg_free(msg);
+}
+
 static int nl80211_netlink_notify(struct notifier_block * nb,
                                   unsigned long state,
                                   void *_notify)
diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h
index 30d2f939150..16c2f719076 100644
--- a/net/wireless/nl80211.h
+++ b/net/wireless/nl80211.h
@@ -87,5 +87,9 @@ nl80211_send_cqm_rssi_notify(struct cfg80211_registered_device *rdev,
                              struct net_device *netdev,
                              enum nl80211_cqm_rssi_threshold_event rssi_event,
                              gfp_t gfp);
+void
+nl80211_send_cqm_pktloss_notify(struct cfg80211_registered_device *rdev,
+                                struct net_device *netdev, const u8 *peer,
+                                u32 num_packets, gfp_t gfp);
 
 #endif /* __NET_WIRELESS_NL80211_H */
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 3be18d9a944..5ed615f94e0 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -32,6 +32,9 @@
  * rely on some SHA1 checksum of the regdomain for example.
  *
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/list.h>
@@ -48,7 +51,7 @@
 #ifdef CONFIG_CFG80211_REG_DEBUG
 #define REG_DBG_PRINT(format, args...) \
         do { \
-                printk(KERN_DEBUG "cfg80211: " format , ## args); \
+                printk(KERN_DEBUG pr_fmt(format), ##args);      \
         } while (0)
 #else
 #define REG_DBG_PRINT(args...)
@@ -96,6 +99,9 @@ struct reg_beacon {
         struct ieee80211_channel chan;
 };
 
+static void reg_todo(struct work_struct *work);
+static DECLARE_WORK(reg_work, reg_todo);
+
 /* We keep a static world regulatory domain in case of the absence of CRDA */
 static const struct ieee80211_regdomain world_regdom = {
         .n_reg_rules = 5,
@@ -367,11 +373,10 @@ static int call_crda(const char *alpha2)
         };
 
         if (!is_world_regdom((char *) alpha2))
-                printk(KERN_INFO "cfg80211: Calling CRDA for country: %c%c\n",
+                pr_info("Calling CRDA for country: %c%c\n",
                         alpha2[0], alpha2[1]);
         else
-                printk(KERN_INFO "cfg80211: Calling CRDA to update world "
-                        "regulatory domain\n");
+                pr_info("Calling CRDA to update world regulatory domain\n");
 
         /* query internal regulatory database (if it exists) */
         reg_regdb_query(alpha2);
@@ -1317,6 +1322,21 @@ static int ignore_request(struct wiphy *wiphy,
         return -EINVAL;
 }
 
+static void reg_set_request_processed(void)
+{
+        bool need_more_processing = false;
+
+        last_request->processed = true;
+
+        spin_lock(&reg_requests_lock);
+        if (!list_empty(&reg_requests_list))
+                need_more_processing = true;
+        spin_unlock(&reg_requests_lock);
+
+        if (need_more_processing)
+                schedule_work(&reg_work);
+}
+
 /**
  * __regulatory_hint - hint to the wireless core a regulatory domain
  * @wiphy: if the hint comes from country information from an AP, this
@@ -1392,8 +1412,10 @@ new_request:
                  * have applied the requested regulatory domain before we just
                  * inform userspace we have processed the request
                  */
-                if (r == -EALREADY)
+                if (r == -EALREADY) {
                         nl80211_send_reg_change_event(last_request);
+                        reg_set_request_processed();
+                }
                 return r;
         }
 
@@ -1409,16 +1431,13 @@ static void reg_process_hint(struct regulatory_request *reg_request)
 
         BUG_ON(!reg_request->alpha2);
 
-        mutex_lock(&cfg80211_mutex);
-        mutex_lock(&reg_mutex);
-
         if (wiphy_idx_valid(reg_request->wiphy_idx))
                 wiphy = wiphy_idx_to_wiphy(reg_request->wiphy_idx);
 
         if (reg_request->initiator == NL80211_REGDOM_SET_BY_DRIVER &&
             !wiphy) {
                 kfree(reg_request);
-                goto out;
+                return;
         }
 
         r = __regulatory_hint(wiphy, reg_request);
@@ -1426,28 +1445,46 @@ static void reg_process_hint(struct regulatory_request *reg_request)
         if (r == -EALREADY && wiphy &&
             wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY)
                 wiphy_update_regulatory(wiphy, initiator);
-out:
-        mutex_unlock(&reg_mutex);
-        mutex_unlock(&cfg80211_mutex);
 }
 
-/* Processes regulatory hints, this is all the NL80211_REGDOM_SET_BY_* */
+/*
+ * Processes regulatory hints, this is all the NL80211_REGDOM_SET_BY_*
+ * Regulatory hints come on a first come first serve basis and we
+ * must process each one atomically.
+ */
 static void reg_process_pending_hints(void)
-        {
+{
         struct regulatory_request *reg_request;
 
+        mutex_lock(&cfg80211_mutex);
+        mutex_lock(&reg_mutex);
+
+        /* When last_request->processed becomes true this will be rescheduled */
+        if (last_request && !last_request->processed) {
+                REG_DBG_PRINT("Pending regulatory request, waiting "
+                              "for it to be processed...");
+                goto out;
+        }
+
         spin_lock(&reg_requests_lock);
-        while (!list_empty(&reg_requests_list)) {
-                reg_request = list_first_entry(&reg_requests_list,
-                                               struct regulatory_request,
-                                               list);
-                list_del_init(&reg_request->list);
 
+        if (list_empty(&reg_requests_list)) {
                 spin_unlock(&reg_requests_lock);
-                reg_process_hint(reg_request);
-                spin_lock(&reg_requests_lock);
+                goto out;
         }
+
+        reg_request = list_first_entry(&reg_requests_list,
+                                       struct regulatory_request,
+                                       list);
+        list_del_init(&reg_request->list);
+
         spin_unlock(&reg_requests_lock);
+
+        reg_process_hint(reg_request);
+
+out:
+        mutex_unlock(&reg_mutex);
+        mutex_unlock(&cfg80211_mutex);
 }
 
 /* Processes beacon hints -- this has nothing to do with country IEs */
@@ -1494,8 +1531,6 @@ static void reg_todo(struct work_struct *work)
         reg_process_pending_beacon_hints();
 }
 
-static DECLARE_WORK(reg_work, reg_todo);
-
 static void queue_regulatory_request(struct regulatory_request *request)
 {
         if (isalpha(request->alpha2[0]))
@@ -1530,12 +1565,7 @@ static int regulatory_hint_core(const char *alpha2)
         request->alpha2[1] = alpha2[1];
         request->initiator = NL80211_REGDOM_SET_BY_CORE;
 
-        /*
-         * This ensures last_request is populated once modules
-         * come swinging in and calling regulatory hints and
-         * wiphy_apply_custom_regulatory().
-         */
-        reg_process_hint(request);
+        queue_regulatory_request(request);
 
         return 0;
 }
@@ -1823,8 +1853,7 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd)
         const struct ieee80211_freq_range *freq_range = NULL;
         const struct ieee80211_power_rule *power_rule = NULL;
 
-        printk(KERN_INFO "    (start_freq - end_freq @ bandwidth), "
-                "(max_antenna_gain, max_eirp)\n");
+        pr_info("    (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp)\n");
 
         for (i = 0; i < rd->n_reg_rules; i++) {
                 reg_rule = &rd->reg_rules[i];
@@ -1836,16 +1865,14 @@ static void print_rd_rules(const struct ieee80211_regdomain *rd)
                  * in certain regions
                  */
                 if (power_rule->max_antenna_gain)
-                        printk(KERN_INFO "    (%d KHz - %d KHz @ %d KHz), "
-                                "(%d mBi, %d mBm)\n",
+                        pr_info("    (%d KHz - %d KHz @ %d KHz), (%d mBi, %d mBm)\n",
                                 freq_range->start_freq_khz,
                                 freq_range->end_freq_khz,
                                 freq_range->max_bandwidth_khz,
                                 power_rule->max_antenna_gain,
                                 power_rule->max_eirp);
                 else
-                        printk(KERN_INFO "    (%d KHz - %d KHz @ %d KHz), "
-                                "(N/A, %d mBm)\n",
+                        pr_info("    (%d KHz - %d KHz @ %d KHz), (N/A, %d mBm)\n",
                                 freq_range->start_freq_khz,
                                 freq_range->end_freq_khz,
                                 freq_range->max_bandwidth_khz,
@@ -1864,27 +1891,20 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
                         rdev = cfg80211_rdev_by_wiphy_idx(
                                 last_request->wiphy_idx);
                         if (rdev) {
-                                printk(KERN_INFO "cfg80211: Current regulatory "
-                                        "domain updated by AP to: %c%c\n",
+                                pr_info("Current regulatory domain updated by AP to: %c%c\n",
                                         rdev->country_ie_alpha2[0],
                                         rdev->country_ie_alpha2[1]);
                         } else
-                                printk(KERN_INFO "cfg80211: Current regulatory "
-                                        "domain intersected:\n");
+                                pr_info("Current regulatory domain intersected:\n");
                 } else
-                        printk(KERN_INFO "cfg80211: Current regulatory "
-                                "domain intersected:\n");
+                        pr_info("Current regulatory domain intersected:\n");
         } else if (is_world_regdom(rd->alpha2))
-                printk(KERN_INFO "cfg80211: World regulatory "
-                        "domain updated:\n");
+                pr_info("World regulatory domain updated:\n");
         else {
                 if (is_unknown_alpha2(rd->alpha2))
-                        printk(KERN_INFO "cfg80211: Regulatory domain "
-                                "changed to driver built-in settings "
-                                "(unknown country)\n");
+                        pr_info("Regulatory domain changed to driver built-in settings (unknown country)\n");
                 else
-                        printk(KERN_INFO "cfg80211: Regulatory domain "
-                                "changed to country: %c%c\n",
+                        pr_info("Regulatory domain changed to country: %c%c\n",
                                 rd->alpha2[0], rd->alpha2[1]);
         }
         print_rd_rules(rd);
@@ -1892,8 +1912,7 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
 
 static void print_regdomain_info(const struct ieee80211_regdomain *rd)
 {
-        printk(KERN_INFO "cfg80211: Regulatory domain: %c%c\n",
-                rd->alpha2[0], rd->alpha2[1]);
+        pr_info("Regulatory domain: %c%c\n", rd->alpha2[0], rd->alpha2[1]);
         print_rd_rules(rd);
 }
 
@@ -1944,8 +1963,7 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
                 return -EINVAL;
 
         if (!is_valid_rd(rd)) {
-                printk(KERN_ERR "cfg80211: Invalid "
-                        "regulatory domain detected:\n");
+                pr_err("Invalid regulatory domain detected:\n");
                 print_regdomain_info(rd);
                 return -EINVAL;
         }
@@ -2061,6 +2079,8 @@ int set_regdom(const struct ieee80211_regdomain *rd)
 
         nl80211_send_reg_change_event(last_request);
 
+        reg_set_request_processed();
+
         mutex_unlock(&reg_mutex);
 
         return r;
@@ -2117,8 +2137,7 @@ int __init regulatory_init(void)
                  * early boot for call_usermodehelper(). For now treat these
                  * errors as non-fatal.
                  */
-                printk(KERN_ERR "cfg80211: kobject_uevent_env() was unable "
-                        "to call CRDA during init");
+                pr_err("kobject_uevent_env() was unable to call CRDA during init\n");
 #ifdef CONFIG_CFG80211_REG_DEBUG
                 /* We want to find out exactly why when debugging */
                 WARN_ON(err);
diff --git a/net/wireless/util.c b/net/wireless/util.c
index 76120aeda57..fee020b15a4 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -502,7 +502,7 @@ int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
                         skb_orphan(skb);
 
                 if (pskb_expand_head(skb, head_need, 0, GFP_ATOMIC)) {
-                        printk(KERN_ERR "failed to reallocate Tx buffer\n");
+                        pr_err("failed to reallocate Tx buffer\n");
                         return -ENOMEM;
                 }
                 skb->truesize += head_need;
@@ -685,20 +685,17 @@ void cfg80211_upload_connect_keys(struct wireless_dev *wdev)
                         continue;
                 if (rdev->ops->add_key(wdev->wiphy, dev, i, false, NULL,
                                         &wdev->connect_keys->params[i])) {
-                        printk(KERN_ERR "%s: failed to set key %d\n",
-                                dev->name, i);
+                        netdev_err(dev, "failed to set key %d\n", i);
                         continue;
                 }
                 if (wdev->connect_keys->def == i)
                         if (rdev->ops->set_default_key(wdev->wiphy, dev, i)) {
-                                printk(KERN_ERR "%s: failed to set defkey %d\n",
-                                        dev->name, i);
+                                netdev_err(dev, "failed to set defkey %d\n", i);
                                 continue;
                         }
                 if (wdev->connect_keys->defmgmt == i)
                         if (rdev->ops->set_default_mgmt_key(wdev->wiphy, dev, i))
-                                printk(KERN_ERR "%s: failed to set mgtdef %d\n",
-                                        dev->name, i);
+                                netdev_err(dev, "failed to set mgtdef %d\n", i);
         }
 
         kfree(wdev->connect_keys);
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
index dc675a3daa3..fdbc23c10d8 100644
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -467,8 +467,8 @@ void wireless_send_event(struct net_device *	dev,
                  * The best the driver could do is to log an error message.
                  * We will do it ourselves instead...
                  */
-                printk(KERN_ERR "%s (WE) : Invalid/Unknown Wireless Event (0x%04X)\n",
-                       dev->name, cmd);
+                netdev_err(dev, "(WE) : Invalid/Unknown Wireless Event (0x%04X)\n",
+                           cmd);
                 return;
         }
 
@@ -476,11 +476,13 @@ void wireless_send_event(struct net_device *	dev,
         if (descr->header_type == IW_HEADER_TYPE_POINT) {
                 /* Check if number of token fits within bounds */
                 if (wrqu->data.length > descr->max_tokens) {
-                        printk(KERN_ERR "%s (WE) : Wireless Event too big (%d)\n", dev->name, wrqu->data.length);
+                        netdev_err(dev, "(WE) : Wireless Event too big (%d)\n",
+                                   wrqu->data.length);
                         return;
                 }
                 if (wrqu->data.length < descr->min_tokens) {
-                        printk(KERN_ERR "%s (WE) : Wireless Event too small (%d)\n", dev->name, wrqu->data.length);
+                        netdev_err(dev, "(WE) : Wireless Event too small (%d)\n",
+                                   wrqu->data.length);
                         return;
                 }
                 /* Calculate extra_len - extra is NULL for restricted events */