staging: brcm80211: prepared header files for file rename
[deliverable/linux.git] / drivers / staging / brcm80211 / brcmsmac / wlc_main.c
index ab7ab850e199275703e5dfca1826a9e681ae4f8e..7c86abc1e0470d51f532dbe183abe4e2ee6b967f 100644 (file)
 #include <linux/kernel.h>
 #include <linux/ctype.h>
 #include <linux/etherdevice.h>
+#include <linux/pci_ids.h>
 #include <net/mac80211.h>
 
 #include <bcmdefs.h>
 #include <bcmdevs.h>
-#include <bcmutils.h>
-#include <bcmwifi.h>
-#include <siutils.h>
-#include <pcicfg.h>
+#include <brcmu_utils.h>
+#include <brcmu_wifi.h>
+#include <aiutils.h>
 #include <bcmsrom.h>
-#include <wlioctl.h>
-#include <sbhnddma.h>
-#include <hnddma.h>
-#include <hndpmu.h>
+#include "bcmdma.h"
+#include <bcmdma.h>
 
+#include "wlc_pmu.h"
 #include "d11.h"
 #include "wlc_types.h"
 #include "wlc_cfg.h"
 #include "wlc_main.h"
 #include "wlc_bmac.h"
 #include "wlc_phy_hal.h"
-#include "wlc_phy_shim.h"
 #include "wlc_antsel.h"
 #include "wlc_stf.h"
 #include "wlc_ampdu.h"
-#include "wl_export.h"
 #include "wlc_alloc.h"
-#include "wl_dbg.h"
-
-/*
- *     Disable statistics counting for WME
- */
-#define WLCNTSET(a, b)
-#define WLCNTINCR(a)
-#define WLCNTADD(a, b)
+#include "brcms_mac80211.h"
 
 /*
  * WPA(2) definitions
@@ -74,7 +64,6 @@
 #define ALLPRIO                -1
 
 /*
- * buffer length needed for wlc_format_ssid
  * 32 SSID chars, max of 4 chars for each SSID char "\xFF", plus NULL.
  */
 #define SSID_FMT_BUF_LEN       ((4 * IEEE80211_MAX_SSID_LEN) + 1)
 
 #define        TBTT_ALIGN_LEEWAY_US    100     /* min leeway before first TBTT in us */
 
+/* Software feature flag defines used by wlfeatureflag */
+#define WL_SWFL_NOHWRADIO      0x0004
+#define WL_SWFL_FLOWCONTROL     0x0008 /* Enable backpressure to OS stack */
+#define WL_SWFL_WLBSSSORT      0x0010  /* Per-port supports sorting of BSS */
+
+/* n-mode support capability */
+/* 2x2 includes both 1x1 & 2x2 devices
+ * reserved #define 2 for future when we want to separate 1x1 & 2x2 and
+ * control it independently
+ */
+#define WL_11N_2x2                     1
+#define WL_11N_3x3                     3
+#define WL_11N_4x4                     4
+
+/* define 11n feature disable flags */
+#define WLFEATURE_DISABLE_11N          0x00000001
+#define WLFEATURE_DISABLE_11N_STBC_TX  0x00000002
+#define WLFEATURE_DISABLE_11N_STBC_RX  0x00000004
+#define WLFEATURE_DISABLE_11N_SGI_TX   0x00000008
+#define WLFEATURE_DISABLE_11N_SGI_RX   0x00000010
+#define WLFEATURE_DISABLE_11N_AMPDU_TX 0x00000020
+#define WLFEATURE_DISABLE_11N_AMPDU_RX 0x00000040
+#define WLFEATURE_DISABLE_11N_GF       0x00000080
+
+#define EDCF_ACI_MASK                0x60
+#define EDCF_ACI_SHIFT               5
+#define EDCF_ECWMIN_MASK             0x0f
+#define EDCF_ECWMAX_SHIFT            4
+#define EDCF_AIFSN_MASK              0x0f
+#define EDCF_AIFSN_MAX               15
+#define EDCF_ECWMAX_MASK             0xf0
+
+#define EDCF_AC_BE_TXOP_STA          0x0000
+#define EDCF_AC_BK_TXOP_STA          0x0000
+#define EDCF_AC_VO_ACI_STA           0x62
+#define EDCF_AC_VO_ECW_STA           0x32
+#define EDCF_AC_VI_ACI_STA           0x42
+#define EDCF_AC_VI_ECW_STA           0x43
+#define EDCF_AC_BK_ECW_STA           0xA4
+#define EDCF_AC_VI_TXOP_STA          0x005e
+#define EDCF_AC_VO_TXOP_STA          0x002f
+#define EDCF_AC_BE_ACI_STA           0x03
+#define EDCF_AC_BE_ECW_STA           0xA4
+#define EDCF_AC_BK_ACI_STA           0x27
+#define EDCF_AC_VO_TXOP_AP           0x002f
+
+#define EDCF_TXOP2USEC(txop)         ((txop) << 5)
+#define EDCF_ECW2CW(exp)             ((1 << (exp)) - 1)
+
+#define APHY_SYMBOL_TIME       4
+#define APHY_PREAMBLE_TIME     16
+#define APHY_SIGNAL_TIME       4
+#define APHY_SIFS_TIME         16
+#define APHY_SERVICE_NBITS     16
+#define APHY_TAIL_NBITS                6
+#define BPHY_SIFS_TIME         10
+#define BPHY_PLCP_SHORT_TIME   96
+
+#define PREN_PREAMBLE          24
+#define PREN_MM_EXT            12
+#define PREN_PREAMBLE_EXT      4
+
+#define DOT11_MAC_HDR_LEN              24
+#define        DOT11_ACK_LEN           10
+#define DOT11_BA_LEN           4
+#define DOT11_OFDM_SIGNAL_EXTENSION    6
+#define DOT11_MIN_FRAG_LEN             256
+#define        DOT11_RTS_LEN           16
+#define        DOT11_CTS_LEN           10
+#define DOT11_BA_BITMAP_LEN            128
+#define DOT11_MIN_BEACON_PERIOD                1
+#define DOT11_MAX_BEACON_PERIOD                0xFFFF
+#define        DOT11_MAXNUMFRAGS       16
+#define DOT11_MAX_FRAG_LEN             2346
+
+#define BPHY_PLCP_TIME         192
+#define RIFS_11N_TIME          2
+
+#define WME_VER                        1
+#define WME_SUBTYPE_PARAM_IE   1
+#define WME_TYPE               2
+#define WME_OUI                        "\x00\x50\xf2"
+
+#define AC_BE                  0
+#define AC_BK                  1
+#define AC_VI                  2
+#define AC_VO                  3
+
 /*
  * driver maintains internal 'tick'(wlc->pub->now) which increments in 1s OS timer(soft
  * watchdog) it is not a wall clock and won't increment when driver is in "down" state
  * calibration and scb update
  */
 
-/* watchdog trigger mode: OSL timer or TBTT */
-#define WLC_WATCHDOG_TBTT(wlc) \
-       (wlc->stas_associated > 0 && wlc->PM != PM_OFF && wlc->pub->align_wd_tbtt)
-
 /* To inform the ucode of the last mcast frame posted so that it can clear moredata bit */
 #define BCMCFID(wlc, fid) wlc_bmac_write_shm((wlc)->hw, M_BCMC_FID, (fid))
 
                                (!AP_ENAB(wlc->pub)) && (wlc->war16165))
 
 /* debug/trace */
-uint wl_msg_level =
+uint brcm_msg_level =
 #if defined(BCMDBG)
-    WL_ERROR_VAL;
+       LOG_ERROR_VAL;
 #else
-    0;
+       0;
 #endif                         /* BCMDBG */
 
 /* Find basic rate for a given rate */
@@ -142,28 +215,6 @@ uint wl_msg_level =
 static struct wlc_info *wlc_info_dbg = (struct wlc_info *) (NULL);
 #endif
 
-/* IOVar table */
-
-/* Parameter IDs, for use only internally to wlc -- in the wlc_iovars
- * table and by the wlc_doiovar() function.  No ordering is imposed:
- * the table is keyed by name, and the function uses a switch.
- */
-enum {
-       IOV_MPC = 1,
-       IOV_RTSTHRESH,
-       IOV_QTXPOWER,
-       IOV_BCN_LI_BCN,         /* Beacon listen interval in # of beacons */
-       IOV_LAST                /* In case of a need to check max ID number */
-};
-
-const bcm_iovar_t wlc_iovars[] = {
-       {"mpc", IOV_MPC, (0), IOVT_BOOL, 0},
-       {"rtsthresh", IOV_RTSTHRESH, (IOVF_WHL), IOVT_UINT16, 0},
-       {"qtxpower", IOV_QTXPOWER, (IOVF_WHL), IOVT_UINT32, 0},
-       {"bcn_li_bcn", IOV_BCN_LI_BCN, (0), IOVT_UINT8, 0},
-       {NULL, 0, 0, 0, 0}
-};
-
 const u8 prio2fifo[NUMPRIO] = {
        TX_AC_BE_FIFO,          /* 0    BE      AC_BE   Best Effort */
        TX_AC_BK_FIFO,          /* 1    BK      AC_BK   Background */
@@ -242,7 +293,7 @@ static const u8 acbitmap2maxprio[] = {
 #define WLC_REPLAY_CNTRS_VALUE WPA_CAP_16_REPLAY_CNTRS
 
 /* local prototypes */
-static u16 BCMFASTPATH wlc_d11hdrs_mac80211(struct wlc_info *wlc,
+static u16 wlc_d11hdrs_mac80211(struct wlc_info *wlc,
                                               struct ieee80211_hw *hw,
                                               struct sk_buff *p,
                                               struct scb *scb, uint frag,
@@ -250,8 +301,6 @@ static u16 BCMFASTPATH wlc_d11hdrs_mac80211(struct wlc_info *wlc,
                                               uint next_frag_len,
                                               wsec_key_t *key,
                                               ratespec_t rspec_override);
-
-static void wlc_ctrupd_cache(u16 cur_stat, u16 *macstat_snapshot, u32 *macstat);
 static void wlc_bss_default_init(struct wlc_info *wlc);
 static void wlc_ucode_mac_upd(struct wlc_info *wlc);
 static ratespec_t mac80211_wlc_set_nrate(struct wlc_info *wlc,
@@ -261,8 +310,6 @@ static void wlc_watchdog(void *arg);
 static void wlc_watchdog_by_timer(void *arg);
 static u16 wlc_rate_shm_offset(struct wlc_info *wlc, u8 rate);
 static int wlc_set_rateset(struct wlc_info *wlc, wlc_rateset_t *rs_arg);
-static int wlc_iovar_rangecheck(struct wlc_info *wlc, u32 val,
-                               const bcm_iovar_t *vi);
 static u8 wlc_local_constraint_qdbm(struct wlc_info *wlc);
 
 /* send and receive */
@@ -273,13 +320,13 @@ static void wlc_txflowcontrol_signal(struct wlc_info *wlc,
                                     struct wlc_txq_info *qi,
                                     bool on, int prio);
 static void wlc_txflowcontrol_reset(struct wlc_info *wlc);
-static u16 wlc_compute_airtime(struct wlc_info *wlc, ratespec_t rspec,
-                                 uint length);
-static void wlc_compute_cck_plcp(ratespec_t rate, uint length, u8 *plcp);
+static void wlc_compute_cck_plcp(struct wlc_info *wlc, ratespec_t rate,
+                                uint length, u8 *plcp);
 static void wlc_compute_ofdm_plcp(ratespec_t rate, uint length, u8 *plcp);
 static void wlc_compute_mimo_plcp(ratespec_t rate, uint length, u8 *plcp);
 static u16 wlc_compute_frame_dur(struct wlc_info *wlc, ratespec_t rate,
                                    u8 preamble_type, uint next_frag_len);
+static u64 wlc_recover_tsf64(struct wlc_info *wlc, struct wlc_d11rxhdr *rxh);
 static void wlc_recvctl(struct wlc_info *wlc,
                        d11rxhdr_t *rxh, struct sk_buff *p);
 static uint wlc_calc_frame_len(struct wlc_info *wlc, ratespec_t rate,
@@ -320,35 +367,6 @@ static void wlc_ofdm_rateset_war(struct wlc_info *wlc);
 static int _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
                      struct wlc_if *wlcif);
 
-#if defined(BCMDBG)
-void wlc_get_rcmta(struct wlc_info *wlc, int idx, u8 *addr)
-{
-       d11regs_t *regs = wlc->regs;
-       u32 v32;
-
-       WL_TRACE("wl%d: %s\n", WLCWLUNIT(wlc), __func__);
-
-       W_REG(&regs->objaddr, (OBJADDR_RCMTA_SEL | (idx * 2)));
-       (void)R_REG(&regs->objaddr);
-       v32 = R_REG(&regs->objdata);
-       addr[0] = (u8) v32;
-       addr[1] = (u8) (v32 >> 8);
-       addr[2] = (u8) (v32 >> 16);
-       addr[3] = (u8) (v32 >> 24);
-       W_REG(&regs->objaddr, (OBJADDR_RCMTA_SEL | ((idx * 2) + 1)));
-       (void)R_REG(&regs->objaddr);
-       v32 = R_REG(&regs->objdata);
-       addr[4] = (u8) v32;
-       addr[5] = (u8) (v32 >> 8);
-}
-#endif                         /* defined(BCMDBG) */
-
-/* keep the chip awake if needed */
-bool wlc_stay_awake(struct wlc_info *wlc)
-{
-       return true;
-}
-
 /* conditions under which the PM bit should be set in outgoing frames and STAY_AWAKE is meaningful
  */
 bool wlc_ps_allowed(struct wlc_info *wlc)
@@ -357,14 +375,12 @@ bool wlc_ps_allowed(struct wlc_info *wlc)
        struct wlc_bsscfg *cfg;
 
        /* disallow PS when one of the following global conditions meets */
-       if (!wlc->pub->associated || !wlc->PMenabled || wlc->PM_override)
+       if (!wlc->pub->associated)
                return false;
 
        /* disallow PS when one of these meets when not scanning */
-       if (!wlc->PMblocked) {
-               if (AP_ACTIVE(wlc) || wlc->monitor)
-                       return false;
-       }
+       if (AP_ACTIVE(wlc) || wlc->monitor)
+               return false;
 
        FOREACH_AS_STA(wlc, idx, cfg) {
                /* disallow PS when one of the following bsscfg specific conditions meets */
@@ -380,9 +396,7 @@ bool wlc_ps_allowed(struct wlc_info *wlc)
 
 void wlc_reset(struct wlc_info *wlc)
 {
-       WL_TRACE("wl%d: wlc_reset\n", wlc->pub->unit);
-
-       wlc->check_for_unaligned_tbtt = false;
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
        /* slurp up hw mac counters before core reset */
        wlc_statsupd(wlc);
@@ -392,15 +406,13 @@ void wlc_reset(struct wlc_info *wlc)
                sizeof(macstat_t));
 
        wlc_bmac_reset(wlc->hw);
-       wlc_ampdu_reset(wlc->ampdu);
-       wlc->txretried = 0;
-
 }
 
 void wlc_fatal_error(struct wlc_info *wlc)
 {
-       WL_ERROR("wl%d: fatal error, reinitializing\n", wlc->pub->unit);
-       wl_init(wlc->wl);
+       wiphy_err(wlc->wiphy, "wl%d: fatal error, reinitializing\n",
+                 wlc->pub->unit);
+       brcms_init(wlc->wl);
 }
 
 /* Return the channel the driver should initialize during wlc_init.
@@ -414,11 +426,6 @@ static chanspec_t wlc_init_chanspec(struct wlc_info *wlc)
            1 | WL_CHANSPEC_BW_20 | WL_CHANSPEC_CTL_SB_NONE |
            WL_CHANSPEC_BAND_2G;
 
-       /* make sure the channel is on the supported band if we are band-restricted */
-       if (wlc->bandlocked || NBANDS(wlc) == 1) {
-               ASSERT(CHSPEC_WLCBANDUNIT(chanspec) == wlc->band->bandunit);
-       }
-       ASSERT(wlc_valid_chanspec_db(wlc->cmi, chanspec));
        return chanspec;
 }
 
@@ -440,7 +447,7 @@ void wlc_init(struct wlc_info *wlc)
        struct wlc_bsscfg *bsscfg;
        bool mute = false;
 
-       WL_TRACE("wl%d: wlc_init\n", wlc->pub->unit);
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
        regs = wlc->regs;
 
@@ -454,16 +461,8 @@ void wlc_init(struct wlc_info *wlc)
 
        wlc_bmac_init(wlc->hw, chanspec, mute);
 
-       wlc->seckeys = wlc_bmac_read_shm(wlc->hw, M_SECRXKEYS_PTR) * 2;
-       if (wlc->machwcap & MCAP_TKIPMIC)
-               wlc->tkmickeys =
-                   wlc_bmac_read_shm(wlc->hw, M_TKMICKEYS_PTR) * 2;
-
        /* update beacon listen interval */
        wlc_bcn_li_upd(wlc);
-       wlc->bcn_wait_prd =
-           (u8) (wlc_bmac_read_shm(wlc->hw, M_NOSLPZNATDTIM) >> 10);
-       ASSERT(wlc->bcn_wait_prd > 0);
 
        /* the world is new again, so is our reported rate */
        wlc_reprate_init(wlc);
@@ -524,7 +523,7 @@ void wlc_init(struct wlc_info *wlc)
        /* Enable EDCF mode (while the MAC is suspended) */
        if (EDCF_ENAB(wlc->pub)) {
                OR_REG(&regs->ifs_ctl, IFS_USEEDCF);
-               wlc_edcf_setparams(wlc->cfg, false);
+               wlc_edcf_setparams(wlc, false);
        }
 
        /* Init precedence maps for empty FIFOs */
@@ -559,7 +558,6 @@ void wlc_init(struct wlc_info *wlc)
        if (WLC_WME_RETRY_SHORT_GET(wlc, 0) == 0) {     /* Uninitialized; read from HW */
                int ac;
 
-               ASSERT(wlc->clk);
                for (ac = 0; ac < AC_COUNT; ac++) {
                        wlc->wme_retries[ac] =
                            wlc_read_shm(wlc, M_AC_TXLMT_ADDR(ac));
@@ -591,7 +589,7 @@ void wlc_mac_promisc(struct wlc_info *wlc)
         * Note: APs get all BSS traffic without the need to set the MCTL_PROMISC bit
         * since all BSS data traffic is directed at the AP
         */
-       if (PROMISC_ENAB(wlc->pub) && !AP_ENAB(wlc->pub) && !wlc->wet)
+       if (PROMISC_ENAB(wlc->pub) && !AP_ENAB(wlc->pub))
                promisc_bits |= MCTL_PROMISC;
 
        /* monitor mode needs both MCTL_PROMISC and MCTL_KEEPCONTROL
@@ -604,82 +602,27 @@ void wlc_mac_promisc(struct wlc_info *wlc)
        wlc_mctrl(wlc, MCTL_PROMISC | MCTL_KEEPCONTROL, promisc_bits);
 }
 
-/* check if hps and wake states of sw and hw are in sync */
-bool wlc_ps_check(struct wlc_info *wlc)
-{
-       bool res = true;
-       bool hps, wake;
-       bool wake_ok;
-
-       if (!AP_ACTIVE(wlc)) {
-               u32 tmp;
-               tmp = R_REG(&wlc->regs->maccontrol);
-
-               /*
-                * If deviceremoved is detected, then don't take any action as
-                * this can be called in any context. Assume that caller will
-                * take care of the condition. This is just to avoid assert
-                */
-               if (tmp == 0xffffffff) {
-                       WL_ERROR("wl%d: %s: dead chip\n",
-                                wlc->pub->unit, __func__);
-                       return DEVICEREMOVED(wlc);
-               }
-
-               hps = PS_ALLOWED(wlc);
-
-               if (hps != ((tmp & MCTL_HPS) != 0)) {
-                       int idx;
-                       struct wlc_bsscfg *cfg;
-                       WL_ERROR("wl%d: hps not sync, sw %d, maccontrol 0x%x\n",
-                                wlc->pub->unit, hps, tmp);
-                       FOREACH_BSS(wlc, idx, cfg) {
-                               if (!BSSCFG_STA(cfg))
-                                       continue;
-                       }
-
-                       res = false;
-               }
-               /* For a monolithic build the wake check can be exact since it looks at wake
-                * override bits. The MCTL_WAKE bit should match the 'wake' value.
-                */
-               wake = STAY_AWAKE(wlc) || wlc->hw->wake_override;
-               wake_ok = (wake == ((tmp & MCTL_WAKE) != 0));
-               if (hps && !wake_ok) {
-                       WL_ERROR("wl%d: wake not sync, sw %d maccontrol 0x%x\n",
-                                wlc->pub->unit, wake, tmp);
-                       res = false;
-               }
-       }
-       ASSERT(res);
-       return res;
-}
-
 /* push sw hps and wake state through hardware */
 void wlc_set_ps_ctrl(struct wlc_info *wlc)
 {
        u32 v1, v2;
-       bool hps, wake;
+       bool hps;
        bool awake_before;
 
        hps = PS_ALLOWED(wlc);
-       wake = hps ? (STAY_AWAKE(wlc)) : true;
 
-       WL_TRACE("wl%d: wlc_set_ps_ctrl: hps %d wake %d\n",
-                wlc->pub->unit, hps, wake);
+       BCMMSG(wlc->wiphy, "wl%d: hps %d\n", wlc->pub->unit, hps);
 
        v1 = R_REG(&wlc->regs->maccontrol);
-       v2 = 0;
+       v2 = MCTL_WAKE;
        if (hps)
                v2 |= MCTL_HPS;
-       if (wake)
-               v2 |= MCTL_WAKE;
 
        wlc_mctrl(wlc, MCTL_WAKE | MCTL_HPS, v2);
 
        awake_before = ((v1 & MCTL_WAKE) || ((v1 & MCTL_HPS) == 0));
 
-       if (wake && !awake_before)
+       if (!awake_before)
                wlc_bmac_wait_for_wake(wlc->hw);
 
 }
@@ -730,8 +673,6 @@ void wlc_switch_shortslot(struct wlc_info *wlc, bool shortslot)
        int idx;
        struct wlc_bsscfg *cfg;
 
-       ASSERT(wlc->band->gmode);
-
        /* use the override if it is set */
        if (wlc->shortslot_override != WLC_SHORTSLOT_AUTO)
                shortslot = (wlc->shortslot_override == WLC_SHORTSLOT_ON);
@@ -762,8 +703,8 @@ static u8 wlc_local_constraint_qdbm(struct wlc_info *wlc)
 
        local = WLC_TXPWR_MAX;
        if (wlc->pub->associated &&
-           (wf_chspec_ctlchan(wlc->chanspec) ==
-            wf_chspec_ctlchan(wlc->home_chanspec))) {
+           (brcmu_chspec_ctlchan(wlc->chanspec) ==
+            brcmu_chspec_ctlchan(wlc->home_chanspec))) {
 
                /* get the local power constraint if we are on the AP's
                 * channel [802.11h, 7.3.2.13]
@@ -826,9 +767,8 @@ void wlc_set_chanspec(struct wlc_info *wlc, chanspec_t chanspec)
        chanspec_t old_chanspec = wlc->chanspec;
 
        if (!wlc_valid_chanspec_db(wlc->cmi, chanspec)) {
-               WL_ERROR("wl%d: %s: Bad channel %d\n",
-                        wlc->pub->unit, __func__, CHSPEC_CHANNEL(chanspec));
-               ASSERT(wlc_valid_chanspec_db(wlc->cmi, chanspec));
+               wiphy_err(wlc->wiphy, "wl%d: %s: Bad channel %d\n",
+                         wlc->pub->unit, __func__, CHSPEC_CHANNEL(chanspec));
                return;
        }
 
@@ -838,9 +778,10 @@ void wlc_set_chanspec(struct wlc_info *wlc, chanspec_t chanspec)
                if (wlc->band->bandunit != bandunit || wlc->bandinit_pending) {
                        switchband = true;
                        if (wlc->bandlocked) {
-                               WL_ERROR("wl%d: %s: chspec %d band is locked!\n",
-                                        wlc->pub->unit, __func__,
-                                        CHSPEC_CHANNEL(chanspec));
+                               wiphy_err(wlc->wiphy, "wl%d: %s: chspec %d "
+                                         "band is locked!\n",
+                                         wlc->pub->unit, __func__,
+                                         CHSPEC_CHANNEL(chanspec));
                                return;
                        }
                        /* BMAC_NOTE: should the setband call come after the wlc_bmac_chanspec() ?
@@ -852,8 +793,6 @@ void wlc_set_chanspec(struct wlc_info *wlc, chanspec_t chanspec)
                }
        }
 
-       ASSERT(N_ENAB(wlc->pub) || !CHSPEC_IS40(chanspec));
-
        /* sync up phy/radio chanspec */
        wlc_set_phy_chanspec(wlc, chanspec);
 
@@ -874,234 +813,16 @@ void wlc_set_chanspec(struct wlc_info *wlc, chanspec_t chanspec)
        wlc_ucode_mac_upd(wlc);
 }
 
-#if defined(BCMDBG)
-static int wlc_get_current_txpwr(struct wlc_info *wlc, void *pwr, uint len)
-{
-       txpwr_limits_t txpwr;
-       tx_power_t power;
-       tx_power_legacy_t *old_power = NULL;
-       int r, c;
-       uint qdbm;
-       bool override;
-
-       if (len == sizeof(tx_power_legacy_t))
-               old_power = (tx_power_legacy_t *) pwr;
-       else if (len < sizeof(tx_power_t))
-               return BCME_BUFTOOSHORT;
-
-       memset(&power, 0, sizeof(tx_power_t));
-
-       power.chanspec = WLC_BAND_PI_RADIO_CHANSPEC;
-       if (wlc->pub->associated)
-               power.local_chanspec = wlc->home_chanspec;
-
-       /* Return the user target tx power limits for the various rates.  Note  wlc_phy.c's
-        * public interface only implements getting and setting a single value for all of
-        * rates, so we need to fill the array ourselves.
-        */
-       wlc_phy_txpower_get(wlc->band->pi, &qdbm, &override);
-       for (r = 0; r < WL_TX_POWER_RATES; r++) {
-               power.user_limit[r] = (u8) qdbm;
-       }
-
-       power.local_max = wlc->txpwr_local_max * WLC_TXPWR_DB_FACTOR;
-       power.local_constraint =
-           wlc->txpwr_local_constraint * WLC_TXPWR_DB_FACTOR;
-
-       power.antgain[0] = wlc->bandstate[BAND_2G_INDEX]->antgain;
-       power.antgain[1] = wlc->bandstate[BAND_5G_INDEX]->antgain;
-
-       wlc_channel_reg_limits(wlc->cmi, power.chanspec, &txpwr);
-
-#if WL_TX_POWER_CCK_NUM != WLC_NUM_RATES_CCK
-#error "WL_TX_POWER_CCK_NUM != WLC_NUM_RATES_CCK"
-#endif
-
-       /* CCK tx power limits */
-       for (c = 0, r = WL_TX_POWER_CCK_FIRST; c < WL_TX_POWER_CCK_NUM;
-            c++, r++)
-               power.reg_limit[r] = txpwr.cck[c];
-
-#if WL_TX_POWER_OFDM_NUM != WLC_NUM_RATES_OFDM
-#error "WL_TX_POWER_OFDM_NUM != WLC_NUM_RATES_OFDM"
-#endif
-
-       /* 20 MHz OFDM SISO tx power limits */
-       for (c = 0, r = WL_TX_POWER_OFDM_FIRST; c < WL_TX_POWER_OFDM_NUM;
-            c++, r++)
-               power.reg_limit[r] = txpwr.ofdm[c];
-
-       if (WLC_PHY_11N_CAP(wlc->band)) {
-
-               /* 20 MHz OFDM CDD tx power limits */
-               for (c = 0, r = WL_TX_POWER_OFDM20_CDD_FIRST;
-                    c < WL_TX_POWER_OFDM_NUM; c++, r++)
-                       power.reg_limit[r] = txpwr.ofdm_cdd[c];
-
-               /* 40 MHz OFDM SISO tx power limits */
-               for (c = 0, r = WL_TX_POWER_OFDM40_SISO_FIRST;
-                    c < WL_TX_POWER_OFDM_NUM; c++, r++)
-                       power.reg_limit[r] = txpwr.ofdm_40_siso[c];
-
-               /* 40 MHz OFDM CDD tx power limits */
-               for (c = 0, r = WL_TX_POWER_OFDM40_CDD_FIRST;
-                    c < WL_TX_POWER_OFDM_NUM; c++, r++)
-                       power.reg_limit[r] = txpwr.ofdm_40_cdd[c];
-
-#if WL_TX_POWER_MCS_1_STREAM_NUM != WLC_NUM_RATES_MCS_1_STREAM
-#error "WL_TX_POWER_MCS_1_STREAM_NUM != WLC_NUM_RATES_MCS_1_STREAM"
-#endif
-
-               /* 20MHz MCS0-7 SISO tx power limits */
-               for (c = 0, r = WL_TX_POWER_MCS20_SISO_FIRST;
-                    c < WLC_NUM_RATES_MCS_1_STREAM; c++, r++)
-                       power.reg_limit[r] = txpwr.mcs_20_siso[c];
-
-               /* 20MHz MCS0-7 CDD tx power limits */
-               for (c = 0, r = WL_TX_POWER_MCS20_CDD_FIRST;
-                    c < WLC_NUM_RATES_MCS_1_STREAM; c++, r++)
-                       power.reg_limit[r] = txpwr.mcs_20_cdd[c];
-
-               /* 20MHz MCS0-7 STBC tx power limits */
-               for (c = 0, r = WL_TX_POWER_MCS20_STBC_FIRST;
-                    c < WLC_NUM_RATES_MCS_1_STREAM; c++, r++)
-                       power.reg_limit[r] = txpwr.mcs_20_stbc[c];
-
-               /* 40MHz MCS0-7 SISO tx power limits */
-               for (c = 0, r = WL_TX_POWER_MCS40_SISO_FIRST;
-                    c < WLC_NUM_RATES_MCS_1_STREAM; c++, r++)
-                       power.reg_limit[r] = txpwr.mcs_40_siso[c];
-
-               /* 40MHz MCS0-7 CDD tx power limits */
-               for (c = 0, r = WL_TX_POWER_MCS40_CDD_FIRST;
-                    c < WLC_NUM_RATES_MCS_1_STREAM; c++, r++)
-                       power.reg_limit[r] = txpwr.mcs_40_cdd[c];
-
-               /* 40MHz MCS0-7 STBC tx power limits */
-               for (c = 0, r = WL_TX_POWER_MCS40_STBC_FIRST;
-                    c < WLC_NUM_RATES_MCS_1_STREAM; c++, r++)
-                       power.reg_limit[r] = txpwr.mcs_40_stbc[c];
-
-#if WL_TX_POWER_MCS_2_STREAM_NUM != WLC_NUM_RATES_MCS_2_STREAM
-#error "WL_TX_POWER_MCS_2_STREAM_NUM != WLC_NUM_RATES_MCS_2_STREAM"
-#endif
-
-               /* 20MHz MCS8-15 SDM tx power limits */
-               for (c = 0, r = WL_TX_POWER_MCS20_SDM_FIRST;
-                    c < WLC_NUM_RATES_MCS_2_STREAM; c++, r++)
-                       power.reg_limit[r] = txpwr.mcs_20_mimo[c];
-
-               /* 40MHz MCS8-15 SDM tx power limits */
-               for (c = 0, r = WL_TX_POWER_MCS40_SDM_FIRST;
-                    c < WLC_NUM_RATES_MCS_2_STREAM; c++, r++)
-                       power.reg_limit[r] = txpwr.mcs_40_mimo[c];
-
-               /* MCS 32 */
-               power.reg_limit[WL_TX_POWER_MCS_32] = txpwr.mcs32;
-       }
-
-       wlc_phy_txpower_get_current(wlc->band->pi, &power,
-                                   CHSPEC_CHANNEL(power.chanspec));
-
-       /* copy the tx_power_t struct to the return buffer,
-        * or convert to a tx_power_legacy_t struct
-        */
-       if (!old_power) {
-               memcpy(pwr, &power, sizeof(tx_power_t));
-       } else {
-               int band_idx = CHSPEC_IS2G(power.chanspec) ? 0 : 1;
-
-               memset(old_power, 0, sizeof(tx_power_legacy_t));
-
-               old_power->txpwr_local_max = power.local_max;
-               old_power->txpwr_local_constraint = power.local_constraint;
-               if (CHSPEC_IS2G(power.chanspec)) {
-                       old_power->txpwr_chan_reg_max = txpwr.cck[0];
-                       old_power->txpwr_est_Pout[band_idx] =
-                           power.est_Pout_cck;
-                       old_power->txpwr_est_Pout_gofdm = power.est_Pout[0];
-               } else {
-                       old_power->txpwr_chan_reg_max = txpwr.ofdm[0];
-                       old_power->txpwr_est_Pout[band_idx] = power.est_Pout[0];
-               }
-               old_power->txpwr_antgain[0] = power.antgain[0];
-               old_power->txpwr_antgain[1] = power.antgain[1];
-
-               for (r = 0; r < NUM_PWRCTRL_RATES; r++) {
-                       old_power->txpwr_band_max[r] = power.user_limit[r];
-                       old_power->txpwr_limit[r] = power.reg_limit[r];
-                       old_power->txpwr_target[band_idx][r] = power.target[r];
-                       if (CHSPEC_IS2G(power.chanspec))
-                               old_power->txpwr_bphy_cck_max[r] =
-                                   power.board_limit[r];
-                       else
-                               old_power->txpwr_aphy_max[r] =
-                                   power.board_limit[r];
-               }
-       }
-
-       return 0;
-}
-#endif                         /* defined(BCMDBG) */
-
-static u32 wlc_watchdog_backup_bi(struct wlc_info *wlc)
-{
-       u32 bi;
-       bi = 2 * wlc->cfg->current_bss->dtim_period *
-           wlc->cfg->current_bss->beacon_period;
-       if (wlc->bcn_li_dtim)
-               bi *= wlc->bcn_li_dtim;
-       else if (wlc->bcn_li_bcn)
-               /* recalculate bi based on bcn_li_bcn */
-               bi = 2 * wlc->bcn_li_bcn * wlc->cfg->current_bss->beacon_period;
-
-       if (bi < 2 * TIMER_INTERVAL_WATCHDOG)
-               bi = 2 * TIMER_INTERVAL_WATCHDOG;
-       return bi;
-}
-
-/* Change to run the watchdog either from a periodic timer or from tbtt handler.
- * Call watchdog from tbtt handler if tbtt is true, watchdog timer otherwise.
- */
-void wlc_watchdog_upd(struct wlc_info *wlc, bool tbtt)
-{
-       /* make sure changing watchdog driver is allowed */
-       if (!wlc->pub->up || !wlc->pub->align_wd_tbtt)
-               return;
-       if (!tbtt && wlc->WDarmed) {
-               wl_del_timer(wlc->wl, wlc->wdtimer);
-               wlc->WDarmed = false;
-       }
-
-       /* stop watchdog timer and use tbtt interrupt to drive watchdog */
-       if (tbtt && wlc->WDarmed) {
-               wl_del_timer(wlc->wl, wlc->wdtimer);
-               wlc->WDarmed = false;
-               wlc->WDlast = OSL_SYSUPTIME();
-       }
-       /* arm watchdog timer and drive the watchdog there */
-       else if (!tbtt && !wlc->WDarmed) {
-               wl_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG,
-                            true);
-               wlc->WDarmed = true;
-       }
-       if (tbtt && !wlc->WDarmed) {
-               wl_add_timer(wlc->wl, wlc->wdtimer, wlc_watchdog_backup_bi(wlc),
-                            true);
-               wlc->WDarmed = true;
-       }
-}
-
 ratespec_t wlc_lowest_basic_rspec(struct wlc_info *wlc, wlc_rateset_t *rs)
 {
        ratespec_t lowest_basic_rspec;
        uint i;
 
        /* Use the lowest basic rate */
-       lowest_basic_rspec = rs->rates[0] & RATE_MASK;
+       lowest_basic_rspec = rs->rates[0] & WLC_RATE_MASK;
        for (i = 0; i < rs->count; i++) {
                if (rs->rates[i] & WLC_RATE_FLAG) {
-                       lowest_basic_rspec = rs->rates[i] & RATE_MASK;
+                       lowest_basic_rspec = rs->rates[i] & WLC_RATE_MASK;
                        break;
                }
        }
@@ -1141,7 +862,7 @@ void wlc_beacon_phytxctl_txant_upd(struct wlc_info *wlc, ratespec_t bcn_rspec)
 */
 void wlc_protection_upd(struct wlc_info *wlc, uint idx, int val)
 {
-       WL_TRACE("wlc_protection_upd: idx %d, val %d\n", idx, val);
+       BCMMSG(wlc->wiphy, "idx %d, val %d\n", idx, val);
 
        switch (idx) {
        case WLC_PROT_G_SPEC:
@@ -1179,7 +900,6 @@ void wlc_protection_upd(struct wlc_info *wlc, uint idx, int val)
                break;
 
        default:
-               ASSERT(0);
                break;
        }
 
@@ -1252,14 +972,12 @@ static void wlc_bandinit_ordered(struct wlc_info *wlc, chanspec_t chanspec)
        uint parkband;
        uint i, band_order[2];
 
-       WL_TRACE("wl%d: wlc_bandinit_ordered\n", wlc->pub->unit);
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
        /*
         * We might have been bandlocked during down and the chip power-cycled (hibernate).
         * figure out the right band to park on
         */
        if (wlc->bandlocked || NBANDS(wlc) == 1) {
-               ASSERT(CHSPEC_WLCBANDUNIT(chanspec) == wlc->band->bandunit);
-
                parkband = wlc->band->bandunit; /* updated in wlc_bandlock() */
                band_order[0] = band_order[1] = parkband;
        } else {
@@ -1281,7 +999,7 @@ static void wlc_bandinit_ordered(struct wlc_info *wlc, chanspec_t chanspec)
 
                /* fill in hw_rate */
                wlc_rateset_filter(&default_rateset, &wlc->band->hw_rateset,
-                                  false, WLC_RATES_CCK_OFDM, RATE_MASK,
+                                  false, WLC_RATES_CCK_OFDM, WLC_RATE_MASK,
                                   (bool) N_ENAB(wlc->pub));
 
                /* init basic rate lookup */
@@ -1295,7 +1013,7 @@ static void wlc_bandinit_ordered(struct wlc_info *wlc, chanspec_t chanspec)
 /* band-specific init */
 static void WLBANDINITFN(wlc_bsinit) (struct wlc_info *wlc)
 {
-       WL_TRACE("wl%d: wlc_bsinit: bandunit %d\n",
+       BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n",
                 wlc->pub->unit, wlc->band->bandunit);
 
        /* write ucode ACK/CTS rate table */
@@ -1315,17 +1033,12 @@ static void WLBANDINITFN(wlc_setband) (struct wlc_info *wlc, uint bandunit)
        int idx;
        struct wlc_bsscfg *cfg;
 
-       ASSERT(NBANDS(wlc) > 1);
-       ASSERT(!wlc->bandlocked);
-       ASSERT(bandunit != wlc->band->bandunit || wlc->bandinit_pending);
-
        wlc->band = wlc->bandstate[bandunit];
 
        if (!wlc->pub->up)
                return;
 
        /* wait for at least one beacon before entering sleeping state */
-       wlc->PMawakebcn = true;
        FOREACH_AS_STA(wlc, idx, cfg)
            cfg->PMawakebcn = true;
        wlc_set_ps_ctrl(wlc);
@@ -1355,41 +1068,26 @@ void wlc_wme_initparams_sta(struct wlc_info *wlc, wme_param_ie_t *pe)
                  cpu_to_le16(EDCF_AC_VO_TXOP_STA)}
                 }
        };
-
-       ASSERT(sizeof(*pe) == WME_PARAM_IE_LEN);
        memcpy(pe, &stadef, sizeof(*pe));
 }
 
-void wlc_wme_setparams(struct wlc_info *wlc, u16 aci, void *arg, bool suspend)
+void wlc_wme_setparams(struct wlc_info *wlc, u16 aci,
+                      const struct ieee80211_tx_queue_params *params,
+                      bool suspend)
 {
        int i;
        shm_acparams_t acp_shm;
        u16 *shm_entry;
-       struct ieee80211_tx_queue_params *params = arg;
-
-       ASSERT(wlc);
 
        /* Only apply params if the core is out of reset and has clocks */
        if (!wlc->clk) {
-               WL_ERROR("wl%d: %s : no-clock\n", wlc->pub->unit, __func__);
+               wiphy_err(wlc->wiphy, "wl%d: %s : no-clock\n", wlc->pub->unit,
+                         __func__);
                return;
        }
 
-       /*
-        * AP uses AC params from wme_param_ie_ap.
-        * AP advertises AC params from wme_param_ie.
-        * STA uses AC params from wme_param_ie.
-        */
-
-       wlc->wme_admctl = 0;
-
        do {
                memset((char *)&acp_shm, 0, sizeof(shm_acparams_t));
-               /* find out which ac this set of params applies to */
-               ASSERT(aci < AC_COUNT);
-               /* set the admission control policy for this AC */
-               /* wlc->wme_admctl |= 1 << aci; *//* should be set ??  seems like off by default */
-
                /* fill in shm ac params struct */
                acp_shm.txop = le16_to_cpu(params->txop);
                /* convert from units of 32us to us for ucode */
@@ -1403,8 +1101,8 @@ void wlc_wme_setparams(struct wlc_info *wlc, u16 aci, void *arg, bool suspend)
 
                if (acp_shm.aifs < EDCF_AIFSN_MIN
                    || acp_shm.aifs > EDCF_AIFSN_MAX) {
-                       WL_ERROR("wl%d: wlc_edcf_setparams: bad aifs %d\n",
-                                wlc->pub->unit, acp_shm.aifs);
+                       wiphy_err(wlc->wiphy, "wl%d: wlc_edcf_setparams: bad "
+                                 "aifs %d\n", wlc->pub->unit, acp_shm.aifs);
                        continue;
                }
 
@@ -1439,20 +1137,14 @@ void wlc_wme_setparams(struct wlc_info *wlc, u16 aci, void *arg, bool suspend)
 
 }
 
-void wlc_edcf_setparams(struct wlc_bsscfg *cfg, bool suspend)
+void wlc_edcf_setparams(struct wlc_info *wlc, bool suspend)
 {
-       struct wlc_info *wlc = cfg->wlc;
-       uint aci, i, j;
+       u16 aci;
+       int i_ac;
        edcf_acparam_t *edcf_acp;
-       shm_acparams_t acp_shm;
-       u16 *shm_entry;
-
-       ASSERT(cfg);
-       ASSERT(wlc);
 
-       /* Only apply params if the core is out of reset and has clocks */
-       if (!wlc->clk)
-               return;
+       struct ieee80211_tx_queue_params txq_pars;
+       struct ieee80211_tx_queue_params *params = &txq_pars;
 
        /*
         * AP uses AC params from wme_param_ie_ap.
@@ -1462,59 +1154,20 @@ void wlc_edcf_setparams(struct wlc_bsscfg *cfg, bool suspend)
 
        edcf_acp = (edcf_acparam_t *) &wlc->wme_param_ie.acparam[0];
 
-       wlc->wme_admctl = 0;
-
-       for (i = 0; i < AC_COUNT; i++, edcf_acp++) {
-               memset((char *)&acp_shm, 0, sizeof(shm_acparams_t));
+       for (i_ac = 0; i_ac < AC_COUNT; i_ac++, edcf_acp++) {
                /* find out which ac this set of params applies to */
                aci = (edcf_acp->ACI & EDCF_ACI_MASK) >> EDCF_ACI_SHIFT;
-               ASSERT(aci < AC_COUNT);
-               /* set the admission control policy for this AC */
-               if (edcf_acp->ACI & EDCF_ACM_MASK) {
-                       wlc->wme_admctl |= 1 << aci;
-               }
 
                /* fill in shm ac params struct */
-               acp_shm.txop = le16_to_cpu(edcf_acp->TXOP);
-               /* convert from units of 32us to us for ucode */
-               wlc->edcf_txop[aci] = acp_shm.txop =
-                   EDCF_TXOP2USEC(acp_shm.txop);
-               acp_shm.aifs = (edcf_acp->ACI & EDCF_AIFSN_MASK);
-
-               if (aci == AC_VI && acp_shm.txop == 0
-                   && acp_shm.aifs < EDCF_AIFSN_MAX)
-                       acp_shm.aifs++;
-
-               if (acp_shm.aifs < EDCF_AIFSN_MIN
-                   || acp_shm.aifs > EDCF_AIFSN_MAX) {
-                       WL_ERROR("wl%d: wlc_edcf_setparams: bad aifs %d\n",
-                                wlc->pub->unit, acp_shm.aifs);
-                       continue;
-               }
+               params->txop = edcf_acp->TXOP;
+               params->aifs = edcf_acp->ACI;
 
                /* CWmin = 2^(ECWmin) - 1 */
-               acp_shm.cwmin = EDCF_ECW2CW(edcf_acp->ECW & EDCF_ECWMIN_MASK);
+               params->cw_min = EDCF_ECW2CW(edcf_acp->ECW & EDCF_ECWMIN_MASK);
                /* CWmax = 2^(ECWmax) - 1 */
-               acp_shm.cwmax = EDCF_ECW2CW((edcf_acp->ECW & EDCF_ECWMAX_MASK)
+               params->cw_max = EDCF_ECW2CW((edcf_acp->ECW & EDCF_ECWMAX_MASK)
                                            >> EDCF_ECWMAX_SHIFT);
-               acp_shm.cwcur = acp_shm.cwmin;
-               acp_shm.bslots =
-                   R_REG(&wlc->regs->tsf_random) & acp_shm.cwcur;
-               acp_shm.reggap = acp_shm.bslots + acp_shm.aifs;
-               /* Indicate the new params to the ucode */
-               acp_shm.status = wlc_read_shm(wlc, (M_EDCF_QINFO +
-                                                   wme_shmemacindex(aci) *
-                                                   M_EDCF_QLEN +
-                                                   M_EDCF_STATUS_OFF));
-               acp_shm.status |= WME_STATUS_NEWAC;
-
-               /* Fill in shm acparam table */
-               shm_entry = (u16 *) &acp_shm;
-               for (j = 0; j < (int)sizeof(shm_acparams_t); j += 2)
-                       wlc_write_shm(wlc,
-                                     M_EDCF_QINFO +
-                                     wme_shmemacindex(aci) * M_EDCF_QLEN + j,
-                                     *shm_entry++);
+               wlc_wme_setparams(wlc, aci, params, suspend);
        }
 
        if (suspend)
@@ -1532,17 +1185,19 @@ void wlc_edcf_setparams(struct wlc_bsscfg *cfg, bool suspend)
 
 bool wlc_timers_init(struct wlc_info *wlc, int unit)
 {
-       wlc->wdtimer = wl_init_timer(wlc->wl, wlc_watchdog_by_timer,
+       wlc->wdtimer = brcms_init_timer(wlc->wl, wlc_watchdog_by_timer,
                wlc, "watchdog");
        if (!wlc->wdtimer) {
-               WL_ERROR("wl%d:  wl_init_timer for wdtimer failed\n", unit);
+               wiphy_err(wlc->wiphy, "wl%d:  wl_init_timer for wdtimer "
+                         "failed\n", unit);
                goto fail;
        }
 
-       wlc->radio_timer = wl_init_timer(wlc->wl, wlc_radio_timer,
+       wlc->radio_timer = brcms_init_timer(wlc->wl, wlc_radio_timer,
                wlc, "radio");
        if (!wlc->radio_timer) {
-               WL_ERROR("wl%d:  wl_init_timer for radio_timer failed\n", unit);
+               wiphy_err(wlc->wiphy, "wl%d:  wl_init_timer for radio_timer "
+                         "failed\n", unit);
                goto fail;
        }
 
@@ -1562,25 +1217,13 @@ void wlc_info_init(struct wlc_info *wlc, int unit)
        /* Assume the device is there until proven otherwise */
        wlc->device_present = true;
 
-       /* set default power output percentage to 100 percent */
-       wlc->txpwr_percent = 100;
-
        /* Save our copy of the chanspec */
        wlc->chanspec = CH20MHZ_CHSPEC(1);
 
-       /* initialize CCK preamble mode to unassociated state */
-       wlc->shortpreamble = false;
-
-       wlc->legacy_probe = true;
-
        /* various 802.11g modes */
        wlc->shortslot = false;
        wlc->shortslot_override = WLC_SHORTSLOT_AUTO;
 
-       wlc->barker_overlap_control = true;
-       wlc->barker_preamble = WLC_BARKER_SHORT_ALLOWED;
-       wlc->txburst_limit_override = AUTO;
-
        wlc_protection_upd(wlc, WLC_PROT_G_OVR, WLC_PROTECTION_AUTO);
        wlc_protection_upd(wlc, WLC_PROT_G_SPEC, false);
 
@@ -1613,30 +1256,6 @@ void wlc_info_init(struct wlc_info *wlc, int unit)
        wlc->SRL = RETRY_SHORT_DEF;
        wlc->LRL = RETRY_LONG_DEF;
 
-       /* init PM state */
-       wlc->PM = PM_OFF;       /* User's setting of PM mode through IOCTL */
-       wlc->PM_override = false;       /* Prevents from going to PM if our AP is 'ill' */
-       wlc->PMenabled = false; /* Current PM state */
-       wlc->PMpending = false; /* Tracks whether STA indicated PM in the last attempt */
-       wlc->PMblocked = false; /* To allow blocking going into PM during RM and scans */
-
-       /* In WMM Auto mode, PM is allowed if association is a UAPSD association */
-       wlc->WME_PM_blocked = false;
-
-       /* Init wme queuing method */
-       wlc->wme_prec_queuing = false;
-
-       /* Overrides for the core to stay awake under zillion conditions Look for STAY_AWAKE */
-       wlc->wake = false;
-       /* Are we waiting for a response to PS-Poll that we sent */
-       wlc->PSpoll = false;
-
-       /* APSD defaults */
-       wlc->wme_apsd = true;
-       wlc->apsd_sta_usp = false;
-       wlc->apsd_trigger_timeout = 0;  /* disable the trigger timer */
-       wlc->apsd_trigger_ac = AC_BITMAP_ALL;
-
        /* Set flag to indicate that hw keys should be used when available. */
        wlc->wsec_swkeys = false;
 
@@ -1646,8 +1265,6 @@ void wlc_info_init(struct wlc_info *wlc, int unit)
                wlc->wsec_keys[i]->idx = (u8) i;
        }
 
-       wlc->_regulatory_domain = false;        /* 802.11d */
-
        /* WME QoS mode is Auto by default */
        wlc->pub->_wme = AUTO;
 
@@ -1657,14 +1274,10 @@ void wlc_info_init(struct wlc_info *wlc, int unit)
 
        wlc->pub->_ampdu = AMPDU_AGG_HOST;
        wlc->pub->bcmerror = 0;
-       wlc->ibss_allowed = true;
-       wlc->ibss_coalesce_allowed = true;
        wlc->pub->_coex = ON;
 
        /* initialize mpc delay */
        wlc->mpc_delay_off = wlc->mpc_dlycnt = WLC_MPC_MIN_DELAYCNT;
-
-       wlc->pr80838_war = true;
 }
 
 static bool wlc_state_bmac_sync(struct wlc_info *wlc)
@@ -1689,20 +1302,23 @@ static uint wlc_attach_module(struct wlc_info *wlc)
 
        wlc->asi = wlc_antsel_attach(wlc);
        if (wlc->asi == NULL) {
-               WL_ERROR("wl%d: wlc_attach: wlc_antsel_attach failed\n", unit);
+               wiphy_err(wlc->wiphy, "wl%d: wlc_attach: wlc_antsel_attach "
+                         "failed\n", unit);
                err = 44;
                goto fail;
        }
 
        wlc->ampdu = wlc_ampdu_attach(wlc);
        if (wlc->ampdu == NULL) {
-               WL_ERROR("wl%d: wlc_attach: wlc_ampdu_attach failed\n", unit);
+               wiphy_err(wlc->wiphy, "wl%d: wlc_attach: wlc_ampdu_attach "
+                         "failed\n", unit);
                err = 50;
                goto fail;
        }
 
        if ((wlc_stf_attach(wlc) != 0)) {
-               WL_ERROR("wl%d: wlc_attach: wlc_stf_attach failed\n", unit);
+               wiphy_err(wlc->wiphy, "wl%d: wlc_attach: wlc_stf_attach "
+                         "failed\n", unit);
                err = 68;
                goto fail;
        }
@@ -1720,56 +1336,21 @@ struct wlc_pub *wlc_pub(void *wlc)
 /*
  * The common driver entry routine. Error codes should be unique
  */
-void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
-                void *regsva, uint bustype, void *btparam, uint *perr)
+void *wlc_attach(struct brcms_info *wl, u16 vendor, u16 device, uint unit,
+                bool piomode, void *regsva, uint bustype, void *btparam,
+                uint *perr)
 {
        struct wlc_info *wlc;
        uint err = 0;
        uint j;
        struct wlc_pub *pub;
-       struct wlc_txq_info *qi;
        uint n_disabled;
 
-       WL_NONE("wl%d: %s: vendor 0x%x device 0x%x\n",
-               unit, __func__, vendor, device);
-
-       ASSERT(WSEC_MAX_RCMTA_KEYS <= WSEC_MAX_KEYS);
-       ASSERT(WSEC_MAX_DEFAULT_KEYS == WLC_DEFAULT_KEYS);
-
-       /* some code depends on packed structures */
-       ASSERT(sizeof(struct ethhdr) == ETH_HLEN);
-       ASSERT(sizeof(d11regs_t) == SI_CORE_SIZE);
-       ASSERT(sizeof(ofdm_phy_hdr_t) == D11_PHY_HDR_LEN);
-       ASSERT(sizeof(cck_phy_hdr_t) == D11_PHY_HDR_LEN);
-       ASSERT(sizeof(d11txh_t) == D11_TXH_LEN);
-       ASSERT(sizeof(d11rxhdr_t) == RXHDR_LEN);
-       ASSERT(sizeof(struct ieee80211_hdr) == DOT11_A4_HDR_LEN);
-       ASSERT(sizeof(struct ieee80211_rts) == DOT11_RTS_LEN);
-       ASSERT(sizeof(tx_status_t) == TXSTATUS_LEN);
-       ASSERT(sizeof(struct ieee80211_ht_cap) == HT_CAP_IE_LEN);
-#ifdef BRCM_FULLMAC
-       ASSERT(offsetof(wl_scan_params_t, channel_list) ==
-              WL_SCAN_PARAMS_FIXED_SIZE);
-#endif
-       ASSERT(IS_ALIGNED(offsetof(wsec_key_t, data), sizeof(u32)));
-       ASSERT(ISPOWEROF2(MA_WINDOW_SZ));
-
-       ASSERT(sizeof(wlc_d11rxhdr_t) <= WL_HWRXOFF);
-
-       /*
-        * Number of replay counters value used in WPA IE must match # rxivs
-        * supported in wsec_key_t struct. See 802.11i/D3.0 sect. 7.3.2.17
-        * 'RSN Information Element' figure 8 for this mapping.
-        */
-       ASSERT((WPA_CAP_16_REPLAY_CNTRS == WLC_REPLAY_CNTRS_VALUE
-               && 16 == WLC_NUMRXIVS)
-              || (WPA_CAP_4_REPLAY_CNTRS == WLC_REPLAY_CNTRS_VALUE
-                  && 4 == WLC_NUMRXIVS));
-
        /* allocate struct wlc_info state and its substructures */
        wlc = (struct wlc_info *) wlc_attach_malloc(unit, &err, device);
        if (wlc == NULL)
                goto fail;
+       wlc->wiphy = wl->wiphy;
        pub = wlc->pub;
 
 #if defined(BCMDBG)
@@ -1780,11 +1361,8 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
        wlc->core = wlc->corestate;
        wlc->wl = wl;
        pub->unit = unit;
-       wlc->btparam = btparam;
        pub->_piomode = piomode;
        wlc->bandinit_pending = false;
-       /* By default restrict TKIP associations from 11n STA's */
-       wlc->ht_wsec_restriction = WLC_HT_TKIP_RESTRICT;
 
        /* populate struct wlc_info with default values  */
        wlc_info_init(wlc, unit);
@@ -1795,10 +1373,6 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
        /* 11n_disable nvram */
        n_disabled = getintvar(pub->vars, "11n_disable");
 
-       /* register a module (to handle iovars) */
-       wlc_module_register(wlc->pub, wlc_iovars, "wlc_iovars", wlc,
-                           wlc_doiovar, NULL, NULL);
-
        /*
         * low level attach steps(all hw accesses go
         * inside, no more in rest of the attach)
@@ -1892,7 +1466,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
                /* fill in hw_rateset (used early by WLC_SET_RATESET) */
                wlc_rateset_filter(&wlc->band->defrateset,
                                   &wlc->band->hw_rateset, false,
-                                  WLC_RATES_CCK_OFDM, RATE_MASK,
+                                  WLC_RATES_CCK_OFDM, WLC_RATE_MASK,
                                   (bool) N_ENAB(wlc->pub));
        }
 
@@ -1905,7 +1479,8 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
                goto fail;
 
        if (!wlc_timers_init(wlc, unit)) {
-               WL_ERROR("wl%d: %s: wlc_init_timer failed\n", unit, __func__);
+               wiphy_err(wl->wiphy, "wl%d: %s: wlc_init_timer failed\n", unit,
+                         __func__);
                err = 32;
                goto fail;
        }
@@ -1913,8 +1488,8 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
        /* depend on rateset, gmode */
        wlc->cmi = wlc_channel_mgr_attach(wlc);
        if (!wlc->cmi) {
-               WL_ERROR("wl%d: %s: wlc_channel_mgr_attach failed\n",
-                        unit, __func__);
+               wiphy_err(wl->wiphy, "wl%d: %s: wlc_channel_mgr_attach failed"
+                         "\n", unit, __func__);
                err = 33;
                goto fail;
        }
@@ -1927,26 +1502,19 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
         */
 
        /* allocate our initial queue */
-       qi = wlc_txq_alloc(wlc);
-       if (qi == NULL) {
-               WL_ERROR("wl%d: %s: failed to malloc tx queue\n",
-                        unit, __func__);
+       wlc->pkt_queue = wlc_txq_alloc(wlc);
+       if (wlc->pkt_queue == NULL) {
+               wiphy_err(wl->wiphy, "wl%d: %s: failed to malloc tx queue\n",
+                         unit, __func__);
                err = 100;
                goto fail;
        }
-       wlc->active_queue = qi;
 
        wlc->bsscfg[0] = wlc->cfg;
        wlc->cfg->_idx = 0;
        wlc->cfg->wlc = wlc;
        pub->txmaxpkts = MAXTXPKTS;
 
-       pub->_cnt->version = WL_CNT_T_VERSION;
-       pub->_cnt->length = sizeof(struct wl_cnt);
-
-       WLCNTSET(pub->_wme_cnt->version, WL_WME_CNT_VERSION);
-       WLCNTSET(pub->_wme_cnt->length, sizeof(wl_wme_cnt_t));
-
        wlc_wme_initparams_sta(wlc, &wlc->wme_param_ie);
 
        wlc->mimoft = FT_HT;
@@ -1959,9 +1527,6 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
        wlc->cck_40txbw = AUTO;
        wlc_update_mimo_band_bwcap(wlc, WLC_N_BW_20IN2G_40IN5G);
 
-       /* Enable setting the RIFS Mode bit by default in HT Info IE */
-       wlc->rifs_advert = AUTO;
-
        /* Set default values of SGI */
        if (WLC_SGI_CAP_PHY(wlc)) {
                wlc_ht_update_sgi_rx(wlc, (WLC_N_SGI_20 | WLC_N_SGI_40));
@@ -2014,7 +1579,8 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
        return (void *)wlc;
 
  fail:
-       WL_ERROR("wl%d: %s: failed with err %d\n", unit, __func__, err);
+       wiphy_err(wl->wiphy, "wl%d: %s: failed with err %d\n",
+                 unit, __func__, err);
        if (wlc)
                wlc_detach(wlc);
 
@@ -2032,8 +1598,8 @@ static void wlc_attach_antgain_init(struct wlc_info *wlc)
                /* default antenna gain for srom rev 1 is 2 dBm (8 qdbm) */
                wlc->band->antgain = 8;
        } else if (wlc->band->antgain == -1) {
-               WL_ERROR("wl%d: %s: Invalid antennas available in srom, using 2dB\n",
-                        unit, __func__);
+               wiphy_err(wlc->wiphy, "wl%d: %s: Invalid antennas available in"
+                         " srom, using 2dB\n", unit, __func__);
                wlc->band->antgain = 8;
        } else {
                s8 gain, fract;
@@ -2072,8 +1638,8 @@ static bool wlc_attach_stf_ant_init(struct wlc_info *wlc)
                aa = (s8) getintvar(vars,
                                      (BAND_5G(bandtype) ? "aa1" : "aa0"));
        if ((aa < 1) || (aa > 15)) {
-               WL_ERROR("wl%d: %s: Invalid antennas available in srom (0x%x), using 3\n",
-                        unit, __func__, aa);
+               wiphy_err(wlc->wiphy, "wl%d: %s: Invalid antennas available in"
+                         " srom (0x%x), using 3\n", unit, __func__, aa);
                aa = 3;
        }
 
@@ -2100,11 +1666,11 @@ static void wlc_timers_deinit(struct wlc_info *wlc)
 {
        /* free timer state */
        if (wlc->wdtimer) {
-               wl_free_timer(wlc->wl, wlc->wdtimer);
+               brcms_free_timer(wlc->wl, wlc->wdtimer);
                wlc->wdtimer = NULL;
        }
        if (wlc->radio_timer) {
-               wl_free_timer(wlc->wl, wlc->radio_timer);
+               brcms_free_timer(wlc->wl, wlc->radio_timer);
                wlc->radio_timer = NULL;
        }
 }
@@ -2134,15 +1700,12 @@ static void wlc_detach_module(struct wlc_info *wlc)
  */
 uint wlc_detach(struct wlc_info *wlc)
 {
-       uint i;
        uint callbacks = 0;
 
        if (wlc == NULL)
                return 0;
 
-       WL_TRACE("wl%d: %s\n", wlc->pub->unit, __func__);
-
-       ASSERT(!wlc->pub->up);
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
        callbacks += wlc_bmac_detach(wlc);
 
@@ -2156,39 +1719,10 @@ uint wlc_detach(struct wlc_info *wlc)
 
        wlc_detach_module(wlc);
 
-       /* free other state */
-
-
-#ifdef BCMDBG
-       kfree(wlc->country_ie_override);
-       wlc->country_ie_override = NULL;
-#endif                         /* BCMDBG */
-
-       {
-               /* free dumpcb list */
-               struct dumpcb_s *prev, *ptr;
-               prev = ptr = wlc->dumpcb_head;
-               while (ptr) {
-                       ptr = prev->next;
-                       kfree(prev);
-                       prev = ptr;
-               }
-               wlc->dumpcb_head = NULL;
-       }
-
-       /* Detach from iovar manager */
-       wlc_module_unregister(wlc->pub, "wlc_iovars", wlc);
 
        while (wlc->tx_queues != NULL)
                wlc_txq_free(wlc, wlc->tx_queues);
 
-       /*
-        * consistency check: wlc_module_register/wlc_module_unregister calls
-        * should match therefore nothing should be left here.
-        */
-       for (i = 0; i < WLC_MAXMODULES; i++)
-               ASSERT(wlc->modulecb[i].name[0] == '\0');
-
        wlc_detach_mfree(wlc);
        return callbacks;
 }
@@ -2201,9 +1735,6 @@ void wlc_ap_upd(struct wlc_info *wlc)
        else
                wlc->PLCPHdr_override = WLC_PLCP_SHORT; /* STA-BSS; short capable */
 
-       /* disable vlan_mode on AP since some legacy STAs cannot rx tagged pkts */
-       wlc->vlan_mode = AP_ENAB(wlc->pub) ? OFF : AUTO;
-
        /* fixup mpc */
        wlc->mpc = true;
 }
@@ -2300,8 +1831,6 @@ static void wlc_radio_upd(struct wlc_info *wlc)
 /* maintain LED behavior in down state */
 static void wlc_down_led_upd(struct wlc_info *wlc)
 {
-       ASSERT(!wlc->pub->up);
-
        /* maintain LEDs while in down state, turn on sbclk if not available yet */
        /* turn on sbclk if necessary */
        if (!AP_ENAB(wlc->pub)) {
@@ -2327,7 +1856,7 @@ void wlc_radio_disable(struct wlc_info *wlc)
        }
 
        wlc_radio_monitor_start(wlc);
-       wl_down(wlc->wl);
+       brcms_down(wlc->wl);
 }
 
 static void wlc_radio_enable(struct wlc_info *wlc)
@@ -2338,9 +1867,7 @@ static void wlc_radio_enable(struct wlc_info *wlc)
        if (DEVICEREMOVED(wlc))
                return;
 
-       if (!wlc->down_override) {      /* imposed by wl down/out ioctl */
-               wl_up(wlc->wl);
-       }
+       brcms_up(wlc->wl);
 }
 
 /* periodical query hw radio button while driver is "down" */
@@ -2349,8 +1876,9 @@ static void wlc_radio_timer(void *arg)
        struct wlc_info *wlc = (struct wlc_info *) arg;
 
        if (DEVICEREMOVED(wlc)) {
-               WL_ERROR("wl%d: %s: dead chip\n", wlc->pub->unit, __func__);
-               wl_down(wlc->wl);
+               wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit,
+                       __func__);
+               brcms_down(wlc->wl);
                return;
        }
 
@@ -2358,8 +1886,6 @@ static void wlc_radio_timer(void *arg)
        if (wlc->mpc_offcnt < WLC_MPC_MAX_DELAYCNT)
                wlc->mpc_offcnt++;
 
-       /* validate all the reasons driver could be down and running this radio_timer */
-       ASSERT(wlc->pub->radio_disabled || wlc->down_override);
        wlc_radio_hwdisable_upd(wlc);
        wlc_radio_upd(wlc);
 }
@@ -2372,7 +1898,8 @@ static bool wlc_radio_monitor_start(struct wlc_info *wlc)
 
        wlc->radio_monitor = true;
        wlc_pllreq(wlc, true, WLC_PLLREQ_RADIO_MON);
-       wl_add_timer(wlc->wl, wlc->radio_timer, TIMER_INTERVAL_RADIOCHK, true);
+       brcms_add_timer(wlc->wl, wlc->radio_timer, TIMER_INTERVAL_RADIOCHK,
+                       true);
        return true;
 }
 
@@ -2381,66 +1908,14 @@ bool wlc_radio_monitor_stop(struct wlc_info *wlc)
        if (!wlc->radio_monitor)
                return true;
 
-       ASSERT((wlc->pub->wlfeatureflag & WL_SWFL_NOHWRADIO) !=
-              WL_SWFL_NOHWRADIO);
-
        wlc->radio_monitor = false;
        wlc_pllreq(wlc, false, WLC_PLLREQ_RADIO_MON);
-       return wl_del_timer(wlc->wl, wlc->radio_timer);
-}
-
-/* bring the driver down, but don't reset hardware */
-void wlc_out(struct wlc_info *wlc)
-{
-       wlc_bmac_set_noreset(wlc->hw, true);
-       wlc_radio_upd(wlc);
-       wl_down(wlc->wl);
-       wlc_bmac_set_noreset(wlc->hw, false);
-
-       /* core clk is true in BMAC driver due to noreset, need to mirror it in HIGH */
-       wlc->clk = true;
-
-       /* This will make sure that when 'up' is done
-        * after 'out' it'll restore hardware (especially gpios)
-        */
-       wlc->pub->hw_up = false;
-}
-
-#if defined(BCMDBG)
-/* Verify the sanity of wlc->tx_prec_map. This can be done only by making sure that
- * if there is no packet pending for the FIFO, then the corresponding prec bits should be set
- * in prec_map. Of course, ignore this rule when block_datafifo is set
- */
-static bool wlc_tx_prec_map_verify(struct wlc_info *wlc)
-{
-       /* For non-WME, both fifos have overlapping prec_map. So it's an error only if both
-        * fail the check.
-        */
-       if (!EDCF_ENAB(wlc->pub)) {
-               if (!(WLC_TX_FIFO_CHECK(wlc, TX_DATA_FIFO) ||
-                     WLC_TX_FIFO_CHECK(wlc, TX_CTL_FIFO)))
-                       return false;
-               else
-                       return true;
-       }
-
-       return WLC_TX_FIFO_CHECK(wlc, TX_AC_BK_FIFO)
-               && WLC_TX_FIFO_CHECK(wlc, TX_AC_BE_FIFO)
-               && WLC_TX_FIFO_CHECK(wlc, TX_AC_VI_FIFO)
-               && WLC_TX_FIFO_CHECK(wlc, TX_AC_VO_FIFO);
+       return brcms_del_timer(wlc->wl, wlc->radio_timer);
 }
-#endif                         /* BCMDBG */
 
 static void wlc_watchdog_by_timer(void *arg)
 {
-       struct wlc_info *wlc = (struct wlc_info *) arg;
        wlc_watchdog(arg);
-       if (WLC_WATCHDOG_TBTT(wlc)) {
-               /* set to normal osl watchdog period */
-               wl_del_timer(wlc->wl, wlc->wdtimer);
-               wl_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG,
-                            true);
-       }
 }
 
 /* common watchdog code */
@@ -2450,14 +1925,15 @@ static void wlc_watchdog(void *arg)
        int i;
        struct wlc_bsscfg *cfg;
 
-       WL_TRACE("wl%d: wlc_watchdog\n", wlc->pub->unit);
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
        if (!wlc->pub->up)
                return;
 
        if (DEVICEREMOVED(wlc)) {
-               WL_ERROR("wl%d: %s: dead chip\n", wlc->pub->unit, __func__);
-               wl_down(wlc->wl);
+               wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit,
+                         __func__);
+               brcms_down(wlc->wl);
                return;
        }
 
@@ -2480,9 +1956,6 @@ static void wlc_watchdog(void *arg)
        /* radio sync: sw/hw/mpc --> radio_disable/radio_enable */
        wlc_radio_hwdisable_upd(wlc);
        wlc_radio_upd(wlc);
-       /* if ismpc, driver should be in down state if up/down is allowed */
-       if (wlc->mpc && wlc_ismpc(wlc))
-               ASSERT(!wlc->pub->up);
        /* if radio is disable, driver may be down, quit here */
        if (wlc->pub->radio_disabled)
                return;
@@ -2515,23 +1988,16 @@ static void wlc_watchdog(void *arg)
                wlc->tempsense_lasttime = wlc->pub->now;
                wlc_tempsense_upd(wlc);
        }
-       /* BMAC_NOTE: for HIGH_ONLY driver, this seems being called after RPC bus failed */
-       ASSERT(wlc_bmac_taclear(wlc->hw, true));
-
-       /* Verify that tx_prec_map and fifos are in sync to avoid lock ups */
-       ASSERT(wlc_tx_prec_map_verify(wlc));
-
-       ASSERT(wlc_ps_check(wlc));
 }
 
 /* make interface operational */
 int wlc_up(struct wlc_info *wlc)
 {
-       WL_TRACE("wl%d: %s:\n", wlc->pub->unit, __func__);
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
        /* HW is turned off so don't try to access it */
        if (wlc->pub->hw_off || DEVICEREMOVED(wlc))
-               return BCME_RADIOOFF;
+               return -ENOMEDIUM;
 
        if (!wlc->pub->hw_up) {
                wlc_bmac_hw_up(wlc->hw);
@@ -2556,11 +2022,11 @@ int wlc_up(struct wlc_info *wlc)
         * if radio is disabled, abort up, lower power, start radio timer and return 0(for NDIS)
         * don't call radio_update to avoid looping wlc_up.
         *
-        * wlc_bmac_up_prep() returns either 0 or BCME_RADIOOFF only
+        * wlc_bmac_up_prep() returns either 0 or -BCME_RADIOOFF only
         */
        if (!wlc->pub->radio_disabled) {
                int status = wlc_bmac_up_prep(wlc->hw);
-               if (status == BCME_RADIOOFF) {
+               if (status == -ENOMEDIUM) {
                        if (!mboolisset
                            (wlc->pub->radio_disabled, WL_RADIO_HW_DISABLE)) {
                                int idx;
@@ -2572,12 +2038,13 @@ int wlc_up(struct wlc_info *wlc)
                                        if (!BSSCFG_STA(bsscfg)
                                            || !bsscfg->enable || !bsscfg->BSS)
                                                continue;
-                                       WL_ERROR("wl%d.%d: wlc_up: rfdisable -> " "wlc_bsscfg_disable()\n",
-                                                wlc->pub->unit, idx);
+                                       wiphy_err(wlc->wiphy, "wl%d.%d: wlc_up"
+                                                 ": rfdisable -> "
+                                                 "wlc_bsscfg_disable()\n",
+                                                  wlc->pub->unit, idx);
                                }
                        }
-               } else
-                       ASSERT(!status);
+               }
        }
 
        if (wlc->pub->radio_disabled) {
@@ -2601,7 +2068,7 @@ int wlc_up(struct wlc_info *wlc)
                wlc_mhf(wlc, MHF2, MHF2_PCISLOWCLKWAR, MHF2_PCISLOWCLKWAR,
                        WLC_BAND_ALL);
 
-       wl_init(wlc->wl);
+       brcms_init(wlc->wl);
        wlc->pub->up = true;
 
        if (wlc->bandinit_pending) {
@@ -2621,8 +2088,7 @@ int wlc_up(struct wlc_info *wlc)
        wlc_wme_retries_write(wlc);
 
        /* start one second watchdog timer */
-       ASSERT(!wlc->WDarmed);
-       wl_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG, true);
+       brcms_add_timer(wlc->wl, wlc->wdtimer, TIMER_INTERVAL_WATCHDOG, true);
        wlc->WDarmed = true;
 
        /* ensure antenna config is up to date */
@@ -2673,12 +2139,12 @@ uint wlc_down(struct wlc_info *wlc)
        bool dev_gone = false;
        struct wlc_txq_info *qi;
 
-       WL_TRACE("wl%d: %s:\n", wlc->pub->unit, __func__);
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
        /* check if we are already in the going down path */
        if (wlc->going_down) {
-               WL_ERROR("wl%d: %s: Driver going down so return\n",
-                        wlc->pub->unit, __func__);
+               wiphy_err(wlc->wiphy, "wl%d: %s: Driver going down so return"
+                         "\n", wlc->pub->unit, __func__);
                return 0;
        }
        if (!wlc->pub->up)
@@ -2700,16 +2166,13 @@ uint wlc_down(struct wlc_info *wlc)
 
        /* cancel the watchdog timer */
        if (wlc->WDarmed) {
-               if (!wl_del_timer(wlc->wl, wlc->wdtimer))
+               if (!brcms_del_timer(wlc->wl, wlc->wdtimer))
                        callbacks++;
                wlc->WDarmed = false;
        }
        /* cancel all other timers */
        callbacks += wlc_down_del_timer(wlc);
 
-       /* interrupt must have been blocked */
-       ASSERT((wlc->macintmask == 0) || !wlc->pub->up);
-
        wlc->pub->up = false;
 
        wlc_phy_mute_upd(wlc->band->pi, false, PHY_MUTE_ALL);
@@ -2719,8 +2182,7 @@ uint wlc_down(struct wlc_info *wlc)
 
        /* flush tx queues */
        for (qi = wlc->tx_queues; qi != NULL; qi = qi->next) {
-               pktq_flush(&qi->q, true, NULL, 0);
-               ASSERT(pktq_empty(&qi->q));
+               brcmu_pktq_flush(&qi->q, true, NULL, NULL);
        }
 
        callbacks += wlc_bmac_down_finish(wlc->hw);
@@ -2728,13 +2190,6 @@ uint wlc_down(struct wlc_info *wlc)
        /* wlc_bmac_down_finish has done wlc_coredisable(). so clk is off */
        wlc->clk = false;
 
-#ifdef BCMDBG
-       /* Since all the packets should have been freed,
-        * all callbacks should have been called
-        */
-       for (i = 1; i <= wlc->pub->tunables->maxpktcb; i++)
-               ASSERT(wlc->pkt_callback[i].fn == NULL);
-#endif
        wlc->going_down = false;
        return callbacks;
 }
@@ -2749,7 +2204,6 @@ int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config)
        s8 shortslot = WLC_SHORTSLOT_AUTO;      /* Advertise and use shortslot (-1/0/1 Auto/Off/On) */
        bool shortslot_restrict = false;        /* Restrict association to stations that support shortslot
                                                 */
-       bool ignore_bcns = true;        /* Ignore legacy beacons on the same channel */
        bool ofdm_basic = false;        /* Make 6, 12, and 24 basic rates */
        int preamble = WLC_PLCP_LONG;   /* Advertise and use short preambles (-1/0/1 Auto/Off/On) */
        bool preamble_restrict = false; /* Restrict association to stations that support short
@@ -2761,7 +2215,7 @@ int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config)
         * Gmode is not GMODE_LEGACY_B
         */
        if (N_ENAB(wlc->pub) && gmode == GMODE_LEGACY_B)
-               return BCME_UNSUPPORTED;
+               return -ENOTSUPP;
 
        /* verify that we are dealing with 2G band and grab the band pointer */
        if (wlc->band->bandtype == WLC_BAND_2G)
@@ -2770,12 +2224,12 @@ int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config)
                 (wlc->bandstate[OTHERBANDUNIT(wlc)]->bandtype == WLC_BAND_2G))
                band = wlc->bandstate[OTHERBANDUNIT(wlc)];
        else
-               return BCME_BADBAND;
+               return -EINVAL;
 
        /* Legacy or bust when no OFDM is supported by regulatory */
        if ((wlc_channel_locale_flags_in_band(wlc->cmi, band->bandunit) &
             WLC_NO_OFDM) && (gmode != GMODE_LEGACY_B))
-               return BCME_RANGE;
+               return -EINVAL;
 
        /* update configuration value */
        if (config == true)
@@ -2823,9 +2277,9 @@ int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config)
 
        default:
                /* Error */
-               WL_ERROR("wl%d: %s: invalid gmode %d\n",
-                        wlc->pub->unit, __func__, gmode);
-               return BCME_UNSUPPORTED;
+               wiphy_err(wlc->wiphy, "wl%d: %s: invalid gmode %d\n",
+                         wlc->pub->unit, __func__, gmode);
+               return -ENOTSUPP;
        }
 
        /*
@@ -2845,8 +2299,6 @@ int wlc_set_gmode(struct wlc_info *wlc, u8 gmode, bool config)
 
        band->gmode = gmode;
 
-       wlc->ignore_bcns = ignore_bcns;
-
        wlc->shortslot_override = shortslot;
 
        if (AP_ENAB(wlc->pub)) {
@@ -2904,11 +2356,11 @@ static int wlc_nmode_validate(struct wlc_info *wlc, s32 nmode)
        case WL_11N_2x2:
        case WL_11N_3x3:
                if (!(WLC_PHY_11N_CAP(wlc->band)))
-                       err = BCME_BADBAND;
+                       err = -EINVAL;
                break;
 
        default:
-               err = BCME_RANGE;
+               err = -EINVAL;
                break;
        }
 
@@ -2921,7 +2373,6 @@ int wlc_set_nmode(struct wlc_info *wlc, s32 nmode)
        int err;
 
        err = wlc_nmode_validate(wlc, nmode);
-       ASSERT(err == 0);
        if (err)
                return err;
 
@@ -2950,7 +2401,6 @@ int wlc_set_nmode(struct wlc_info *wlc, s32 nmode)
                        nmode = WL_11N_2x2;
        case WL_11N_2x2:
        case WL_11N_3x3:
-               ASSERT(WLC_PHY_11N_CAP(wlc->band));
                /* force GMODE_AUTO if NMODE is ON */
                wlc_set_gmode(wlc, GMODE_AUTO, true);
                if (nmode == WL_11N_3x3)
@@ -2967,7 +2417,6 @@ int wlc_set_nmode(struct wlc_info *wlc, s32 nmode)
                break;
 
        default:
-               ASSERT(0);
                break;
        }
 
@@ -2983,7 +2432,7 @@ static int wlc_set_rateset(struct wlc_info *wlc, wlc_rateset_t *rs_arg)
 
        /* check for bad count value */
        if ((rs.count == 0) || (rs.count > WLC_NUMRATES))
-               return BCME_BADRATESET;
+               return -EINVAL;
 
        /* try the current band */
        bandunit = wlc->band->bandunit;
@@ -3005,7 +2454,7 @@ static int wlc_set_rateset(struct wlc_info *wlc, wlc_rateset_t *rs_arg)
                        goto good;
        }
 
-       return BCME_ERROR;
+       return -EBADE;
 
  good:
        /* apply new rateset */
@@ -3058,33 +2507,29 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
        bool bool_val;
        int bcmerror;
        d11regs_t *regs;
-       uint i;
        struct scb *nextscb;
        bool ta_ok;
        uint band;
-       rw_reg_t *r;
        struct wlc_bsscfg *bsscfg;
        wlc_bss_info_t *current_bss;
 
        /* update bsscfg pointer */
-       bsscfg = NULL;          /* XXX: Hack bsscfg to be size one and use this globally */
-       current_bss = NULL;
+       bsscfg = wlc->cfg;
+       current_bss = bsscfg->current_bss;
 
        /* initialize the following to get rid of compiler warning */
        nextscb = NULL;
        ta_ok = false;
        band = 0;
-       r = NULL;
 
        /* If the device is turned off, then it's not "removed" */
        if (!wlc->pub->hw_off && DEVICEREMOVED(wlc)) {
-               WL_ERROR("wl%d: %s: dead chip\n", wlc->pub->unit, __func__);
-               wl_down(wlc->wl);
-               return BCME_ERROR;
+               wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit,
+                         __func__);
+               brcms_down(wlc->wl);
+               return -EBADE;
        }
 
-       ASSERT(!(wlc->pub->hw_off && wlc->pub->up));
-
        /* default argument is generic integer */
        pval = arg ? (int *)arg:NULL;
 
@@ -3096,75 +2541,28 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
 
        /* bool conversion to avoid duplication below */
        bool_val = val != 0;
-
-       if (cmd != WLC_SET_CHANNEL)
-               WL_NONE("WLC_IOCTL: cmd %d val 0x%x (%d) len %d\n",
-                       cmd, (uint)val, val, len);
-
        bcmerror = 0;
        regs = wlc->regs;
 
-       /* A few commands don't need any arguments; all the others do. */
-       switch (cmd) {
-       case WLC_UP:
-       case WLC_OUT:
-       case WLC_DOWN:
-       case WLC_DISASSOC:
-       case WLC_RESTART:
-       case WLC_REBOOT:
-       case WLC_START_CHANNEL_QA:
-       case WLC_INIT:
-               break;
-
-       default:
-               if ((arg == NULL) || (len <= 0)) {
-                       WL_ERROR("wl%d: %s: Command %d needs arguments\n",
-                                wlc->pub->unit, __func__, cmd);
-                       bcmerror = BCME_BADARG;
-                       goto done;
-               }
+       if ((arg == NULL) || (len <= 0)) {
+               wiphy_err(wlc->wiphy, "wl%d: %s: Command %d needs arguments\n",
+                         wlc->pub->unit, __func__, cmd);
+               bcmerror = -EINVAL;
+               goto done;
        }
 
        switch (cmd) {
 
-#if defined(BCMDBG)
-       case WLC_GET_MSGLEVEL:
-               *pval = wl_msg_level;
-               break;
+       case WLC_SET_CHANNEL:{
+                       chanspec_t chspec = CH20MHZ_CHSPEC(val);
 
-       case WLC_SET_MSGLEVEL:
-               wl_msg_level = val;
-               break;
-#endif
-
-       case WLC_GET_INSTANCE:
-               *pval = wlc->pub->unit;
-               break;
-
-       case WLC_GET_CHANNEL:{
-                       channel_info_t *ci = (channel_info_t *) arg;
-
-                       ASSERT(len > (int)sizeof(ci));
-
-                       ci->hw_channel =
-                           CHSPEC_CHANNEL(WLC_BAND_PI_RADIO_CHANSPEC);
-                       ci->target_channel =
-                           CHSPEC_CHANNEL(wlc->default_bss->chanspec);
-                       ci->scan_channel = 0;
-
-                       break;
-               }
-
-       case WLC_SET_CHANNEL:{
-                       chanspec_t chspec = CH20MHZ_CHSPEC(val);
-
-                       if (val < 0 || val > MAXCHANNEL) {
-                               bcmerror = BCME_OUTOFRANGECHAN;
-                               break;
-                       }
+                       if (val < 0 || val > MAXCHANNEL) {
+                               bcmerror = -EINVAL;
+                               break;
+                       }
 
                        if (!wlc_valid_chanspec_db(wlc->cmi, chspec)) {
-                               bcmerror = BCME_BADCHAN;
+                               bcmerror = -EINVAL;
                                break;
                        }
 
@@ -3188,273 +2586,6 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
                        break;
                }
 
-#if defined(BCMDBG)
-       case WLC_GET_UCFLAGS:
-               if (!wlc->pub->up) {
-                       bcmerror = BCME_NOTUP;
-                       break;
-               }
-
-               /* optional band is stored in the second integer of incoming buffer */
-               band =
-                   (len <
-                    (int)(2 * sizeof(int))) ? WLC_BAND_AUTO : ((int *)arg)[1];
-
-               /* bcmerror checking */
-               bcmerror = wlc_iocregchk(wlc, band);
-               if (bcmerror)
-                       break;
-
-               if (val >= MHFMAX) {
-                       bcmerror = BCME_RANGE;
-                       break;
-               }
-
-               *pval = wlc_bmac_mhf_get(wlc->hw, (u8) val, WLC_BAND_AUTO);
-               break;
-
-       case WLC_SET_UCFLAGS:
-               if (!wlc->pub->up) {
-                       bcmerror = BCME_NOTUP;
-                       break;
-               }
-
-               /* optional band is stored in the second integer of incoming buffer */
-               band =
-                   (len <
-                    (int)(2 * sizeof(int))) ? WLC_BAND_AUTO : ((int *)arg)[1];
-
-               /* bcmerror checking */
-               bcmerror = wlc_iocregchk(wlc, band);
-               if (bcmerror)
-                       break;
-
-               i = (u16) val;
-               if (i >= MHFMAX) {
-                       bcmerror = BCME_RANGE;
-                       break;
-               }
-
-               wlc_mhf(wlc, (u8) i, 0xffff, (u16) (val >> NBITS(u16)),
-                       WLC_BAND_AUTO);
-               break;
-
-       case WLC_GET_SHMEM:
-               ta_ok = true;
-
-               /* optional band is stored in the second integer of incoming buffer */
-               band =
-                   (len <
-                    (int)(2 * sizeof(int))) ? WLC_BAND_AUTO : ((int *)arg)[1];
-
-               /* bcmerror checking */
-               bcmerror = wlc_iocregchk(wlc, band);
-               if (bcmerror)
-                       break;
-
-               if (val & 1) {
-                       bcmerror = BCME_BADADDR;
-                       break;
-               }
-
-               *pval = wlc_read_shm(wlc, (u16) val);
-               break;
-
-       case WLC_SET_SHMEM:
-               ta_ok = true;
-
-               /* optional band is stored in the second integer of incoming buffer */
-               band =
-                   (len <
-                    (int)(2 * sizeof(int))) ? WLC_BAND_AUTO : ((int *)arg)[1];
-
-               /* bcmerror checking */
-               bcmerror = wlc_iocregchk(wlc, band);
-               if (bcmerror)
-                       break;
-
-               if (val & 1) {
-                       bcmerror = BCME_BADADDR;
-                       break;
-               }
-
-               wlc_write_shm(wlc, (u16) val,
-                             (u16) (val >> NBITS(u16)));
-               break;
-
-       case WLC_R_REG: /* MAC registers */
-               ta_ok = true;
-               r = (rw_reg_t *) arg;
-               band = WLC_BAND_AUTO;
-
-               if (len < (int)(sizeof(rw_reg_t) - sizeof(uint))) {
-                       bcmerror = BCME_BUFTOOSHORT;
-                       break;
-               }
-
-               if (len >= (int)sizeof(rw_reg_t))
-                       band = r->band;
-
-               /* bcmerror checking */
-               bcmerror = wlc_iocregchk(wlc, band);
-               if (bcmerror)
-                       break;
-
-               if ((r->byteoff + r->size) > sizeof(d11regs_t)) {
-                       bcmerror = BCME_BADADDR;
-                       break;
-               }
-               if (r->size == sizeof(u32))
-                       r->val =
-                           R_REG((u32 *)((unsigned char *)(unsigned long)regs +
-                                             r->byteoff));
-               else if (r->size == sizeof(u16))
-                       r->val =
-                           R_REG((u16 *)((unsigned char *)(unsigned long)regs +
-                                             r->byteoff));
-               else
-                       bcmerror = BCME_BADADDR;
-               break;
-
-       case WLC_W_REG:
-               ta_ok = true;
-               r = (rw_reg_t *) arg;
-               band = WLC_BAND_AUTO;
-
-               if (len < (int)(sizeof(rw_reg_t) - sizeof(uint))) {
-                       bcmerror = BCME_BUFTOOSHORT;
-                       break;
-               }
-
-               if (len >= (int)sizeof(rw_reg_t))
-                       band = r->band;
-
-               /* bcmerror checking */
-               bcmerror = wlc_iocregchk(wlc, band);
-               if (bcmerror)
-                       break;
-
-               if (r->byteoff + r->size > sizeof(d11regs_t)) {
-                       bcmerror = BCME_BADADDR;
-                       break;
-               }
-               if (r->size == sizeof(u32))
-                       W_REG((u32 *)((unsigned char *)(unsigned long) regs +
-                                         r->byteoff), r->val);
-               else if (r->size == sizeof(u16))
-                       W_REG((u16 *)((unsigned char *)(unsigned long) regs +
-                                         r->byteoff), r->val);
-               else
-                       bcmerror = BCME_BADADDR;
-               break;
-#endif                         /* BCMDBG */
-
-       case WLC_GET_TXANT:
-               *pval = wlc->stf->txant;
-               break;
-
-       case WLC_SET_TXANT:
-               bcmerror = wlc_stf_ant_txant_validate(wlc, (s8) val);
-               if (bcmerror < 0)
-                       break;
-
-               wlc->stf->txant = (s8) val;
-
-               /* if down, we are done */
-               if (!wlc->pub->up)
-                       break;
-
-               wlc_suspend_mac_and_wait(wlc);
-
-               wlc_stf_phy_txant_upd(wlc);
-               wlc_beacon_phytxctl_txant_upd(wlc, wlc->bcn_rspec);
-
-               wlc_enable_mac(wlc);
-
-               break;
-
-       case WLC_GET_ANTDIV:{
-                       u8 phy_antdiv;
-
-                       /* return configured value if core is down */
-                       if (!wlc->pub->up) {
-                               *pval = wlc->stf->ant_rx_ovr;
-
-                       } else {
-                               if (wlc_phy_ant_rxdiv_get
-                                   (wlc->band->pi, &phy_antdiv))
-                                       *pval = (int)phy_antdiv;
-                               else
-                                       *pval = (int)wlc->stf->ant_rx_ovr;
-                       }
-
-                       break;
-               }
-       case WLC_SET_ANTDIV:
-               /* values are -1=driver default, 0=force0, 1=force1, 2=start1, 3=start0 */
-               if ((val < -1) || (val > 3)) {
-                       bcmerror = BCME_RANGE;
-                       break;
-               }
-
-               if (val == -1)
-                       val = ANT_RX_DIV_DEF;
-
-               wlc->stf->ant_rx_ovr = (u8) val;
-               wlc_phy_ant_rxdiv_set(wlc->band->pi, (u8) val);
-               break;
-
-       case WLC_GET_RX_ANT:{   /* get latest used rx antenna */
-                       u16 rxstatus;
-
-                       if (!wlc->pub->up) {
-                               bcmerror = BCME_NOTUP;
-                               break;
-                       }
-
-                       rxstatus = R_REG(&wlc->regs->phyrxstatus0);
-                       if (rxstatus == 0xdead || rxstatus == (u16) -1) {
-                               bcmerror = BCME_ERROR;
-                               break;
-                       }
-                       *pval = (rxstatus & PRXS0_RXANT_UPSUBBAND) ? 1 : 0;
-                       break;
-               }
-
-#if defined(BCMDBG)
-       case WLC_GET_UCANTDIV:
-               if (!wlc->clk) {
-                       bcmerror = BCME_NOCLK;
-                       break;
-               }
-
-               *pval =
-                   (wlc_bmac_mhf_get(wlc->hw, MHF1, WLC_BAND_AUTO) &
-                    MHF1_ANTDIV);
-               break;
-
-       case WLC_SET_UCANTDIV:{
-                       if (!wlc->pub->up) {
-                               bcmerror = BCME_NOTUP;
-                               break;
-                       }
-
-                       /* if multiband, band must be locked */
-                       if (IS_MBAND_UNLOCKED(wlc)) {
-                               bcmerror = BCME_NOTBANDLOCKED;
-                               break;
-                       }
-
-                       wlc_mhf(wlc, MHF1, MHF1_ANTDIV,
-                               (val ? MHF1_ANTDIV : 0), WLC_BAND_AUTO);
-                       break;
-               }
-#endif                         /* defined(BCMDBG) */
-
-       case WLC_GET_SRL:
-               *pval = wlc->SRL;
-               break;
-
        case WLC_SET_SRL:
                if (val >= 1 && val <= RETRY_SHORT_MAX) {
                        int ac;
@@ -3467,11 +2598,7 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
                        }
                        wlc_wme_retries_write(wlc);
                } else
-                       bcmerror = BCME_RANGE;
-               break;
-
-       case WLC_GET_LRL:
-               *pval = wlc->LRL;
+                       bcmerror = -EINVAL;
                break;
 
        case WLC_SET_LRL:
@@ -3486,173 +2613,20 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
                        }
                        wlc_wme_retries_write(wlc);
                } else
-                       bcmerror = BCME_RANGE;
-               break;
-
-       case WLC_GET_CWMIN:
-               *pval = wlc->band->CWmin;
-               break;
-
-       case WLC_SET_CWMIN:
-               if (!wlc->clk) {
-                       bcmerror = BCME_NOCLK;
-                       break;
-               }
-
-               if (val >= 1 && val <= 255) {
-                       wlc_set_cwmin(wlc, (u16) val);
-               } else
-                       bcmerror = BCME_RANGE;
-               break;
-
-       case WLC_GET_CWMAX:
-               *pval = wlc->band->CWmax;
-               break;
-
-       case WLC_SET_CWMAX:
-               if (!wlc->clk) {
-                       bcmerror = BCME_NOCLK;
-                       break;
-               }
-
-               if (val >= 255 && val <= 2047) {
-                       wlc_set_cwmax(wlc, (u16) val);
-               } else
-                       bcmerror = BCME_RANGE;
-               break;
-
-       case WLC_GET_RADIO:     /* use mask if don't want to expose some internal bits */
-               *pval = wlc->pub->radio_disabled;
-               break;
-
-       case WLC_SET_RADIO:{    /* 32 bits input, higher 16 bits are mask, lower 16 bits are value to
-                                * set
-                                */
-                       u16 radiomask, radioval;
-                       uint validbits =
-                           WL_RADIO_SW_DISABLE | WL_RADIO_HW_DISABLE;
-                       mbool new = 0;
-
-                       radiomask = (val & 0xffff0000) >> 16;
-                       radioval = val & 0x0000ffff;
-
-                       if ((radiomask == 0) || (radiomask & ~validbits)
-                           || (radioval & ~validbits)
-                           || ((radioval & ~radiomask) != 0)) {
-                               WL_ERROR("SET_RADIO with wrong bits 0x%x\n",
-                                        val);
-                               bcmerror = BCME_RANGE;
-                               break;
-                       }
-
-                       new =
-                           (wlc->pub->radio_disabled & ~radiomask) | radioval;
-                       wlc->pub->radio_disabled = new;
-
-                       wlc_radio_hwdisable_upd(wlc);
-                       wlc_radio_upd(wlc);
-                       break;
-               }
-
-       case WLC_GET_PHYTYPE:
-               *pval = WLC_PHYTYPE(wlc->band->phytype);
-               break;
-
-#if defined(BCMDBG)
-       case WLC_GET_KEY:
-               if ((val >= 0) && (val < WLC_MAX_WSEC_KEYS(wlc))) {
-                       wl_wsec_key_t key;
-
-                       wsec_key_t *src_key = wlc->wsec_keys[val];
-
-                       if (len < (int)sizeof(key)) {
-                               bcmerror = BCME_BUFTOOSHORT;
-                               break;
-                       }
-
-                       memset((char *)&key, 0, sizeof(key));
-                       if (src_key) {
-                               key.index = src_key->id;
-                               key.len = src_key->len;
-                               memcpy(key.data, src_key->data, key.len);
-                               key.algo = src_key->algo;
-                               if (WSEC_SOFTKEY(wlc, src_key, bsscfg))
-                                       key.flags |= WL_SOFT_KEY;
-                               if (src_key->flags & WSEC_PRIMARY_KEY)
-                                       key.flags |= WL_PRIMARY_KEY;
-
-                               memcpy(key.ea, src_key->ea, ETH_ALEN);
-                       }
-
-                       memcpy(arg, &key, sizeof(key));
-               } else
-                       bcmerror = BCME_BADKEYIDX;
-               break;
-#endif                         /* defined(BCMDBG) */
-
-       case WLC_SET_KEY:
-               bcmerror =
-                   wlc_iovar_op(wlc, "wsec_key", NULL, 0, arg, len, IOV_SET,
-                                wlcif);
+                       bcmerror = -EINVAL;
                break;
 
-       case WLC_GET_KEY_SEQ:{
-                       wsec_key_t *key;
-
-                       if (len < DOT11_WPA_KEY_RSC_LEN) {
-                               bcmerror = BCME_BUFTOOSHORT;
-                               break;
-                       }
-
-                       /* Return the key's tx iv as an EAPOL sequence counter.
-                        * This will be used to supply the RSC value to a supplicant.
-                        * The format is 8 bytes, with least significant in seq[0].
-                        */
-
-                       key = WSEC_KEY(wlc, val);
-                       if ((val >= 0) && (val < WLC_MAX_WSEC_KEYS(wlc)) &&
-                               (key != NULL)) {
-                               u8 seq[DOT11_WPA_KEY_RSC_LEN];
-                               u16 lo;
-                               u32 hi;
-                               /* group keys in WPA-NONE (IBSS only, AES and TKIP) use a global TXIV */
-                               if ((bsscfg->WPA_auth & WPA_AUTH_NONE) &&
-                                   is_zero_ether_addr(key->ea)) {
-                                       lo = bsscfg->wpa_none_txiv.lo;
-                                       hi = bsscfg->wpa_none_txiv.hi;
-                               } else {
-                                       lo = key->txiv.lo;
-                                       hi = key->txiv.hi;
-                               }
-
-                               /* format the buffer, low to high */
-                               seq[0] = lo & 0xff;
-                               seq[1] = (lo >> 8) & 0xff;
-                               seq[2] = hi & 0xff;
-                               seq[3] = (hi >> 8) & 0xff;
-                               seq[4] = (hi >> 16) & 0xff;
-                               seq[5] = (hi >> 24) & 0xff;
-                               seq[6] = 0;
-                               seq[7] = 0;
-
-                               memcpy(arg, seq, sizeof(seq));
-                       } else {
-                               bcmerror = BCME_BADKEYIDX;
-                       }
-                       break;
-               }
-
        case WLC_GET_CURR_RATESET:{
                        wl_rateset_t *ret_rs = (wl_rateset_t *) arg;
                        wlc_rateset_t *rs;
 
-                       if (bsscfg->associated)
+                       if (wlc->pub->associated)
                                rs = &current_bss->rateset;
                        else
                                rs = &wlc->default_bss->rateset;
 
                        if (len < (int)(rs->count + sizeof(rs->count))) {
-                               bcmerror = BCME_BUFTOOSHORT;
+                               bcmerror = -EOVERFLOW;
                                break;
                        }
 
@@ -3662,35 +2636,17 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
                        break;
                }
 
-       case WLC_GET_RATESET:{
-                       wlc_rateset_t rs;
-                       wl_rateset_t *ret_rs = (wl_rateset_t *) arg;
-
-                       memset(&rs, 0, sizeof(wlc_rateset_t));
-                       wlc_default_rateset(wlc, (wlc_rateset_t *) &rs);
-
-                       if (len < (int)(rs.count + sizeof(rs.count))) {
-                               bcmerror = BCME_BUFTOOSHORT;
-                               break;
-                       }
-
-                       /* Copy only legacy rateset section */
-                       ret_rs->count = rs.count;
-                       memcpy(&ret_rs->rates, &rs.rates, rs.count);
-                       break;
-               }
-
        case WLC_SET_RATESET:{
                        wlc_rateset_t rs;
                        wl_rateset_t *in_rs = (wl_rateset_t *) arg;
 
                        if (len < (int)(in_rs->count + sizeof(in_rs->count))) {
-                               bcmerror = BCME_BUFTOOSHORT;
+                               bcmerror = -EOVERFLOW;
                                break;
                        }
 
                        if (in_rs->count > WLC_NUMRATES) {
-                               bcmerror = BCME_BUFTOOLONG;
+                               bcmerror = -ENOBUFS;
                                break;
                        }
 
@@ -3720,198 +2676,47 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
                        break;
                }
 
-       case WLC_GET_BCNPRD:
-               if (BSSCFG_STA(bsscfg) && bsscfg->BSS && bsscfg->associated)
-                       *pval = current_bss->beacon_period;
-               else
-                       *pval = wlc->default_bss->beacon_period;
-               break;
-
        case WLC_SET_BCNPRD:
                /* range [1, 0xffff] */
                if (val >= DOT11_MIN_BEACON_PERIOD
                    && val <= DOT11_MAX_BEACON_PERIOD) {
                        wlc->default_bss->beacon_period = (u16) val;
                } else
-                       bcmerror = BCME_RANGE;
-               break;
-
-       case WLC_GET_DTIMPRD:
-               if (BSSCFG_STA(bsscfg) && bsscfg->BSS && bsscfg->associated)
-                       *pval = current_bss->dtim_period;
-               else
-                       *pval = wlc->default_bss->dtim_period;
-               break;
-
-       case WLC_SET_DTIMPRD:
-               /* range [1, 0xff] */
-               if (val >= DOT11_MIN_DTIM_PERIOD
-                   && val <= DOT11_MAX_DTIM_PERIOD) {
-                       wlc->default_bss->dtim_period = (u8) val;
-               } else
-                       bcmerror = BCME_RANGE;
+                       bcmerror = -EINVAL;
                break;
 
-#ifdef SUPPORT_PS
-       case WLC_GET_PM:
-               *pval = wlc->PM;
-               break;
-
-       case WLC_SET_PM:
-               if ((val >= PM_OFF) && (val <= PM_MAX)) {
-                       wlc->PM = (u8) val;
-                       if (wlc->pub->up) {
+       case WLC_GET_PHYLIST:
+               {
+                       unsigned char *cp = arg;
+                       if (len < 3) {
+                               bcmerror = -EOVERFLOW;
+                               break;
                        }
-                       /* Change watchdog driver to align watchdog with tbtt if possible */
-                       wlc_watchdog_upd(wlc, PS_ALLOWED(wlc));
-               } else
-                       bcmerror = BCME_ERROR;
-               break;
-#endif                         /* SUPPORT_PS */
 
-#ifdef SUPPORT_PS
-#ifdef BCMDBG
-       case WLC_GET_WAKE:
-               if (AP_ENAB(wlc->pub)) {
-                       bcmerror = BCME_NOTSTA;
+                       if (WLCISNPHY(wlc->band)) {
+                               *cp++ = 'n';
+                       } else if (WLCISLCNPHY(wlc->band)) {
+                               *cp++ = 'c';
+                       } else if (WLCISSSLPNPHY(wlc->band)) {
+                               *cp++ = 's';
+                       }
+                       *cp = '\0';
                        break;
                }
-               *pval = wlc->wake;
-               break;
 
-       case WLC_SET_WAKE:
-               if (AP_ENAB(wlc->pub)) {
-                       bcmerror = BCME_NOTSTA;
+       case WLC_SET_SHORTSLOT_OVERRIDE:
+               if ((val != WLC_SHORTSLOT_AUTO) &&
+                   (val != WLC_SHORTSLOT_OFF) && (val != WLC_SHORTSLOT_ON)) {
+                       bcmerror = -EINVAL;
                        break;
                }
 
-               wlc->wake = val ? true : false;
+               wlc->shortslot_override = (s8) val;
 
-               /* if down, we're done */
-               if (!wlc->pub->up)
-                       break;
-
-               /* apply to the mac */
-               wlc_set_ps_ctrl(wlc);
-               break;
-#endif                         /* BCMDBG */
-#endif                         /* SUPPORT_PS */
-
-       case WLC_GET_REVINFO:
-               bcmerror = wlc_get_revision_info(wlc, arg, (uint) len);
-               break;
-
-       case WLC_GET_AP:
-               *pval = (int)AP_ENAB(wlc->pub);
-               break;
-
-       case WLC_GET_ATIM:
-               if (bsscfg->associated)
-                       *pval = (int)current_bss->atim_window;
-               else
-                       *pval = (int)wlc->default_bss->atim_window;
-               break;
-
-       case WLC_SET_ATIM:
-               wlc->default_bss->atim_window = (u32) val;
-               break;
-
-       case WLC_GET_PKTCNTS:{
-                       get_pktcnt_t *pktcnt = (get_pktcnt_t *) pval;
-                       wlc_statsupd(wlc);
-                       pktcnt->rx_good_pkt = wlc->pub->_cnt->rxframe;
-                       pktcnt->rx_bad_pkt = wlc->pub->_cnt->rxerror;
-                       pktcnt->tx_good_pkt =
-                           wlc->pub->_cnt->txfrmsnt;
-                       pktcnt->tx_bad_pkt =
-                           wlc->pub->_cnt->txerror +
-                           wlc->pub->_cnt->txfail;
-                       if (len >= (int)sizeof(get_pktcnt_t)) {
-                               /* Be backward compatible - only if buffer is large enough  */
-                               pktcnt->rx_ocast_good_pkt =
-                                   wlc->pub->_cnt->rxmfrmocast;
-                       }
-                       break;
-               }
-
-#ifdef SUPPORT_HWKEY
-       case WLC_GET_WSEC:
-               bcmerror =
-                   wlc_iovar_op(wlc, "wsec", NULL, 0, arg, len, IOV_GET,
-                                wlcif);
-               break;
-
-       case WLC_SET_WSEC:
-               bcmerror =
-                   wlc_iovar_op(wlc, "wsec", NULL, 0, arg, len, IOV_SET,
-                                wlcif);
-               break;
-
-       case WLC_GET_WPA_AUTH:
-               *pval = (int)bsscfg->WPA_auth;
-               break;
-
-       case WLC_SET_WPA_AUTH:
-               /* change of WPA_Auth modifies the PS_ALLOWED state */
-               if (BSSCFG_STA(bsscfg)) {
-                       bsscfg->WPA_auth = (u16) val;
-               } else
-                       bsscfg->WPA_auth = (u16) val;
-               break;
-#endif                         /* SUPPORT_HWKEY */
-
-       case WLC_GET_BANDLIST:
-               /* count of number of bands, followed by each band type */
-               *pval++ = NBANDS(wlc);
-               *pval++ = wlc->band->bandtype;
-               if (NBANDS(wlc) > 1)
-                       *pval++ = wlc->bandstate[OTHERBANDUNIT(wlc)]->bandtype;
-               break;
-
-       case WLC_GET_BAND:
-               *pval = wlc->bandlocked ? wlc->band->bandtype : WLC_BAND_AUTO;
-               break;
-
-       case WLC_GET_PHYLIST:
-               {
-                       unsigned char *cp = arg;
-                       if (len < 3) {
-                               bcmerror = BCME_BUFTOOSHORT;
-                               break;
-                       }
-
-                       if (WLCISNPHY(wlc->band)) {
-                               *cp++ = 'n';
-                       } else if (WLCISLCNPHY(wlc->band)) {
-                               *cp++ = 'c';
-                       } else if (WLCISSSLPNPHY(wlc->band)) {
-                               *cp++ = 's';
-                       }
-                       *cp = '\0';
-                       break;
-               }
-
-       case WLC_GET_SHORTSLOT:
-               *pval = wlc->shortslot;
-               break;
-
-       case WLC_GET_SHORTSLOT_OVERRIDE:
-               *pval = wlc->shortslot_override;
-               break;
-
-       case WLC_SET_SHORTSLOT_OVERRIDE:
-               if ((val != WLC_SHORTSLOT_AUTO) &&
-                   (val != WLC_SHORTSLOT_OFF) && (val != WLC_SHORTSLOT_ON)) {
-                       bcmerror = BCME_RANGE;
-                       break;
-               }
-
-               wlc->shortslot_override = (s8) val;
-
-               /* shortslot is an 11g feature, so no more work if we are
-                * currently on the 5G band
-                */
-               if (BAND_5G(wlc->band->bandtype))
+               /* shortslot is an 11g feature, so no more work if we are
+                * currently on the 5G band
+                */
+               if (BAND_5G(wlc->band->bandtype))
                        break;
 
                if (wlc->pub->up && wlc->pub->associated) {
@@ -3923,737 +2728,82 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len,
                        /* driver is down, so just update the wlc_info value */
                        if (wlc->shortslot_override == WLC_SHORTSLOT_AUTO) {
                                wlc->shortslot = false;
-                       } else {
-                               wlc->shortslot =
-                                   (wlc->shortslot_override ==
-                                    WLC_SHORTSLOT_ON);
-                       }
-               }
-
-               break;
-
-       case WLC_GET_LEGACY_ERP:
-               *pval = wlc->include_legacy_erp;
-               break;
-
-       case WLC_SET_LEGACY_ERP:
-               if (wlc->include_legacy_erp == bool_val)
-                       break;
-
-               wlc->include_legacy_erp = bool_val;
-
-               if (AP_ENAB(wlc->pub) && wlc->clk) {
-                       wlc_update_beacon(wlc);
-                       wlc_update_probe_resp(wlc, true);
-               }
-               break;
-
-       case WLC_GET_GMODE:
-               if (wlc->band->bandtype == WLC_BAND_2G)
-                       *pval = wlc->band->gmode;
-               else if (NBANDS(wlc) > 1)
-                       *pval = wlc->bandstate[OTHERBANDUNIT(wlc)]->gmode;
-               break;
-
-       case WLC_SET_GMODE:
-               if (!wlc->pub->associated)
-                       bcmerror = wlc_set_gmode(wlc, (u8) val, true);
-               else {
-                       bcmerror = BCME_ASSOCIATED;
-                       break;
-               }
-               break;
-
-       case WLC_GET_GMODE_PROTECTION:
-               *pval = wlc->protection->_g;
-               break;
-
-       case WLC_GET_PROTECTION_CONTROL:
-               *pval = wlc->protection->overlap;
-               break;
-
-       case WLC_SET_PROTECTION_CONTROL:
-               if ((val != WLC_PROTECTION_CTL_OFF) &&
-                   (val != WLC_PROTECTION_CTL_LOCAL) &&
-                   (val != WLC_PROTECTION_CTL_OVERLAP)) {
-                       bcmerror = BCME_RANGE;
-                       break;
-               }
-
-               wlc_protection_upd(wlc, WLC_PROT_OVERLAP, (s8) val);
-
-               /* Current g_protection will sync up to the specified control alg in watchdog
-                * if the driver is up and associated.
-                * If the driver is down or not associated, the control setting has no effect.
-                */
-               break;
-
-       case WLC_GET_GMODE_PROTECTION_OVERRIDE:
-               *pval = wlc->protection->g_override;
-               break;
-
-       case WLC_SET_GMODE_PROTECTION_OVERRIDE:
-               if ((val != WLC_PROTECTION_AUTO) &&
-                   (val != WLC_PROTECTION_OFF) && (val != WLC_PROTECTION_ON)) {
-                       bcmerror = BCME_RANGE;
-                       break;
-               }
-
-               wlc_protection_upd(wlc, WLC_PROT_G_OVR, (s8) val);
-
-               break;
-
-       case WLC_SET_SUP_RATESET_OVERRIDE:{
-                       wlc_rateset_t rs, new;
-
-                       /* copyin */
-                       if (len < (int)sizeof(wlc_rateset_t)) {
-                               bcmerror = BCME_BUFTOOSHORT;
-                               break;
-                       }
-                       memcpy(&rs, arg, sizeof(wlc_rateset_t));
-
-                       /* check for bad count value */
-                       if (rs.count > WLC_NUMRATES) {
-                               bcmerror = BCME_BADRATESET;     /* invalid rateset */
-                               break;
-                       }
-
-                       /* this command is only appropriate for gmode operation */
-                       if (!(wlc->band->gmode ||
-                             ((NBANDS(wlc) > 1)
-                              && wlc->bandstate[OTHERBANDUNIT(wlc)]->gmode))) {
-                               bcmerror = BCME_BADBAND;        /* gmode only command when not in gmode */
-                               break;
-                       }
-
-                       /* check for an empty rateset to clear the override */
-                       if (rs.count == 0) {
-                               memset(&wlc->sup_rates_override, 0,
-                                     sizeof(wlc_rateset_t));
-                               break;
-                       }
-
-                       /* validate rateset by comparing pre and post sorted against 11g hw rates */
-                       wlc_rateset_filter(&rs, &new, false, WLC_RATES_CCK_OFDM,
-                                          RATE_MASK, BSS_N_ENAB(wlc, bsscfg));
-                       wlc_rate_hwrs_filter_sort_validate(&new,
-                                                          &cck_ofdm_rates,
-                                                          false,
-                                                          wlc->stf->txstreams);
-                       if (rs.count != new.count) {
-                               bcmerror = BCME_BADRATESET;     /* invalid rateset */
-                               break;
-                       }
-
-                       /* apply new rateset to the override */
-                       memcpy(&wlc->sup_rates_override, &new,
-                             sizeof(wlc_rateset_t));
-
-                       /* update bcn and probe resp if needed */
-                       if (wlc->pub->up && AP_ENAB(wlc->pub)
-                           && wlc->pub->associated) {
-                               wlc_update_beacon(wlc);
-                               wlc_update_probe_resp(wlc, true);
-                       }
-                       break;
-               }
-
-       case WLC_GET_SUP_RATESET_OVERRIDE:
-               /* this command is only appropriate for gmode operation */
-               if (!(wlc->band->gmode ||
-                     ((NBANDS(wlc) > 1)
-                      && wlc->bandstate[OTHERBANDUNIT(wlc)]->gmode))) {
-                       bcmerror = BCME_BADBAND;        /* gmode only command when not in gmode */
-                       break;
-               }
-               if (len < (int)sizeof(wlc_rateset_t)) {
-                       bcmerror = BCME_BUFTOOSHORT;
-                       break;
-               }
-               memcpy(arg, &wlc->sup_rates_override, sizeof(wlc_rateset_t));
-
-               break;
-
-       case WLC_GET_PRB_RESP_TIMEOUT:
-               *pval = wlc->prb_resp_timeout;
-               break;
-
-       case WLC_SET_PRB_RESP_TIMEOUT:
-               if (wlc->pub->up) {
-                       bcmerror = BCME_NOTDOWN;
-                       break;
-               }
-               if (val < 0 || val >= 0xFFFF) {
-                       bcmerror = BCME_RANGE;  /* bad value */
-                       break;
-               }
-               wlc->prb_resp_timeout = (u16) val;
-               break;
-
-       case WLC_GET_KEY_PRIMARY:{
-                       wsec_key_t *key;
-
-                       /* treat the 'val' parm as the key id */
-                       key = WSEC_BSS_DEFAULT_KEY(bsscfg);
-                       if (key != NULL) {
-                               *pval = key->id == val ? true : false;
-                       } else {
-                               bcmerror = BCME_BADKEYIDX;
-                       }
-                       break;
-               }
-
-       case WLC_SET_KEY_PRIMARY:{
-                       wsec_key_t *key, *old_key;
-
-                       bcmerror = BCME_BADKEYIDX;
-
-                       /* treat the 'val' parm as the key id */
-                       for (i = 0; i < WSEC_MAX_DEFAULT_KEYS; i++) {
-                               key = bsscfg->bss_def_keys[i];
-                               if (key != NULL && key->id == val) {
-                                       old_key = WSEC_BSS_DEFAULT_KEY(bsscfg);
-                                       if (old_key != NULL)
-                                               old_key->flags &=
-                                                   ~WSEC_PRIMARY_KEY;
-                                       key->flags |= WSEC_PRIMARY_KEY;
-                                       bsscfg->wsec_index = i;
-                                       bcmerror = BCME_OK;
-                               }
-                       }
-                       break;
-               }
-
-#ifdef BCMDBG
-       case WLC_INIT:
-               wl_init(wlc->wl);
-               break;
-#endif
-
-       case WLC_SET_VAR:
-       case WLC_GET_VAR:{
-                       char *name;
-                       /* validate the name value */
-                       name = (char *)arg;
-                       for (i = 0; i < (uint) len && *name != '\0';
-                            i++, name++)
-                               ;
-
-                       if (i == (uint) len) {
-                               bcmerror = BCME_BUFTOOSHORT;
-                               break;
-                       }
-                       i++;    /* include the null in the string length */
-
-                       if (cmd == WLC_GET_VAR) {
-                               bcmerror =
-                                   wlc_iovar_op(wlc, arg,
-                                                (void *)((s8 *) arg + i),
-                                                len - i, arg, len, IOV_GET,
-                                                wlcif);
-                       } else
-                               bcmerror =
-                                   wlc_iovar_op(wlc, arg, NULL, 0,
-                                                (void *)((s8 *) arg + i),
-                                                len - i, IOV_SET, wlcif);
-
-                       break;
-               }
-
-       case WLC_SET_WSEC_PMK:
-               bcmerror = BCME_UNSUPPORTED;
-               break;
-
-#if defined(BCMDBG)
-       case WLC_CURRENT_PWR:
-               if (!wlc->pub->up)
-                       bcmerror = BCME_NOTUP;
-               else
-                       bcmerror = wlc_get_current_txpwr(wlc, arg, len);
-               break;
-#endif
-
-       case WLC_LAST:
-               WL_ERROR("%s: WLC_LAST\n", __func__);
-       }
- done:
-
-       if (bcmerror) {
-               if (VALID_BCMERROR(bcmerror))
-                       wlc->pub->bcmerror = bcmerror;
-               else {
-                       bcmerror = 0;
-               }
-
-       }
-       /* BMAC_NOTE: for HIGH_ONLY driver, this seems being called after RPC bus failed */
-       /* In hw_off condition, IOCTLs that reach here are deemed safe but taclear would
-        * certainly result in getting -1 for register reads. So skip ta_clear altogether
-        */
-       if (!(wlc->pub->hw_off))
-               ASSERT(wlc_bmac_taclear(wlc->hw, ta_ok) || !ta_ok);
-
-       return bcmerror;
-}
-
-#if defined(BCMDBG)
-/* consolidated register access ioctl error checking */
-int wlc_iocregchk(struct wlc_info *wlc, uint band)
-{
-       /* if band is specified, it must be the current band */
-       if ((band != WLC_BAND_AUTO) && (band != (uint) wlc->band->bandtype))
-               return BCME_BADBAND;
-
-       /* if multiband and band is not specified, band must be locked */
-       if ((band == WLC_BAND_AUTO) && IS_MBAND_UNLOCKED(wlc))
-               return BCME_NOTBANDLOCKED;
-
-       /* must have core clocks */
-       if (!wlc->clk)
-               return BCME_NOCLK;
-
-       return 0;
-}
-#endif                         /* defined(BCMDBG) */
-
-#if defined(BCMDBG)
-/* For some ioctls, make sure that the pi pointer matches the current phy */
-int wlc_iocpichk(struct wlc_info *wlc, uint phytype)
-{
-       if (wlc->band->phytype != phytype)
-               return BCME_BADBAND;
-       return 0;
-}
-#endif
-
-/* Look up the given var name in the given table */
-static const bcm_iovar_t *wlc_iovar_lookup(const bcm_iovar_t *table,
-                                          const char *name)
-{
-       const bcm_iovar_t *vi;
-       const char *lookup_name;
-
-       /* skip any ':' delimited option prefixes */
-       lookup_name = strrchr(name, ':');
-       if (lookup_name != NULL)
-               lookup_name++;
-       else
-               lookup_name = name;
-
-       ASSERT(table != NULL);
-
-       for (vi = table; vi->name; vi++) {
-               if (!strcmp(vi->name, lookup_name))
-                       return vi;
-       }
-       /* ran to end of table */
-
-       return NULL;            /* var name not found */
-}
-
-/* simplified integer get interface for common WLC_GET_VAR ioctl handler */
-int wlc_iovar_getint(struct wlc_info *wlc, const char *name, int *arg)
-{
-       return wlc_iovar_op(wlc, name, NULL, 0, arg, sizeof(s32), IOV_GET,
-                           NULL);
-}
-
-/* simplified integer set interface for common WLC_SET_VAR ioctl handler */
-int wlc_iovar_setint(struct wlc_info *wlc, const char *name, int arg)
-{
-       return wlc_iovar_op(wlc, name, NULL, 0, (void *)&arg, sizeof(arg),
-                           IOV_SET, NULL);
-}
-
-/* simplified s8 get interface for common WLC_GET_VAR ioctl handler */
-int wlc_iovar_gets8(struct wlc_info *wlc, const char *name, s8 *arg)
-{
-       int iovar_int;
-       int err;
-
-       err =
-           wlc_iovar_op(wlc, name, NULL, 0, &iovar_int, sizeof(iovar_int),
-                        IOV_GET, NULL);
-       if (!err)
-               *arg = (s8) iovar_int;
-
-       return err;
-}
-
-/*
- * register iovar table, watchdog and down handlers.
- * calling function must keep 'iovars' until wlc_module_unregister is called.
- * 'iovar' must have the last entry's name field being NULL as terminator.
- */
-int wlc_module_register(struct wlc_pub *pub, const bcm_iovar_t *iovars,
-                       const char *name, void *hdl, iovar_fn_t i_fn,
-                       watchdog_fn_t w_fn, down_fn_t d_fn)
-{
-       struct wlc_info *wlc = (struct wlc_info *) pub->wlc;
-       int i;
-
-       ASSERT(name != NULL);
-       ASSERT(i_fn != NULL || w_fn != NULL || d_fn != NULL);
-
-       /* find an empty entry and just add, no duplication check! */
-       for (i = 0; i < WLC_MAXMODULES; i++) {
-               if (wlc->modulecb[i].name[0] == '\0') {
-                       strncpy(wlc->modulecb[i].name, name,
-                               sizeof(wlc->modulecb[i].name) - 1);
-                       wlc->modulecb[i].iovars = iovars;
-                       wlc->modulecb[i].hdl = hdl;
-                       wlc->modulecb[i].iovar_fn = i_fn;
-                       wlc->modulecb[i].watchdog_fn = w_fn;
-                       wlc->modulecb[i].down_fn = d_fn;
-                       return 0;
-               }
-       }
-
-       /* it is time to increase the capacity */
-       ASSERT(i < WLC_MAXMODULES);
-       return BCME_NORESOURCE;
-}
-
-/* unregister module callbacks */
-int wlc_module_unregister(struct wlc_pub *pub, const char *name, void *hdl)
-{
-       struct wlc_info *wlc = (struct wlc_info *) pub->wlc;
-       int i;
-
-       if (wlc == NULL)
-               return BCME_NOTFOUND;
-
-       ASSERT(name != NULL);
-
-       for (i = 0; i < WLC_MAXMODULES; i++) {
-               if (!strcmp(wlc->modulecb[i].name, name) &&
-                   (wlc->modulecb[i].hdl == hdl)) {
-                       memset(&wlc->modulecb[i], 0, sizeof(struct modulecb));
-                       return 0;
-               }
-       }
-
-       /* table not found! */
-       return BCME_NOTFOUND;
-}
-
-/* Write WME tunable parameters for retransmit/max rate from wlc struct to ucode */
-static void wlc_wme_retries_write(struct wlc_info *wlc)
-{
-       int ac;
-
-       /* Need clock to do this */
-       if (!wlc->clk)
-               return;
-
-       for (ac = 0; ac < AC_COUNT; ac++) {
-               wlc_write_shm(wlc, M_AC_TXLMT_ADDR(ac), wlc->wme_retries[ac]);
-       }
-}
-
-/* Get or set an iovar.  The params/p_len pair specifies any additional
- * qualifying parameters (e.g. an "element index") for a get, while the
- * arg/len pair is the buffer for the value to be set or retrieved.
- * Operation (get/set) is specified by the last argument.
- * interface context provided by wlcif
- *
- * All pointers may point into the same buffer.
- */
-int
-wlc_iovar_op(struct wlc_info *wlc, const char *name,
-            void *params, int p_len, void *arg, int len,
-            bool set, struct wlc_if *wlcif)
-{
-       int err = 0;
-       int val_size;
-       const bcm_iovar_t *vi = NULL;
-       u32 actionid;
-       int i;
-
-       ASSERT(name != NULL);
-
-       ASSERT(len >= 0);
-
-       /* Get MUST have return space */
-       ASSERT(set || (arg && len));
-
-       ASSERT(!(wlc->pub->hw_off && wlc->pub->up));
-
-       /* Set does NOT take qualifiers */
-       ASSERT(!set || (!params && !p_len));
-
-       if (!set && (len == sizeof(int)) &&
-           !(IS_ALIGNED((unsigned long)(arg), (uint) sizeof(int)))) {
-               WL_ERROR("wl%d: %s unaligned get ptr for %s\n",
-                        wlc->pub->unit, __func__, name);
-               ASSERT(0);
-       }
-
-       /* find the given iovar name */
-       for (i = 0; i < WLC_MAXMODULES; i++) {
-               if (!wlc->modulecb[i].iovars)
-                       continue;
-               vi = wlc_iovar_lookup(wlc->modulecb[i].iovars, name);
-               if (vi)
-                       break;
-       }
-       /* iovar name not found */
-       if (i >= WLC_MAXMODULES) {
-               err = BCME_UNSUPPORTED;
-               goto exit;
-       }
-
-       /* set up 'params' pointer in case this is a set command so that
-        * the convenience int and bool code can be common to set and get
-        */
-       if (params == NULL) {
-               params = arg;
-               p_len = len;
-       }
-
-       if (vi->type == IOVT_VOID)
-               val_size = 0;
-       else if (vi->type == IOVT_BUFFER)
-               val_size = len;
-       else
-               /* all other types are integer sized */
-               val_size = sizeof(int);
-
-       actionid = set ? IOV_SVAL(vi->varid) : IOV_GVAL(vi->varid);
-
-       /* Do the actual parameter implementation */
-       err = wlc->modulecb[i].iovar_fn(wlc->modulecb[i].hdl, vi, actionid,
-                                       name, params, p_len, arg, len, val_size,
-                                       wlcif);
-
- exit:
-       return err;
-}
-
-int
-wlc_iovar_check(struct wlc_pub *pub, const bcm_iovar_t *vi, void *arg, int len,
-               bool set)
-{
-       struct wlc_info *wlc = (struct wlc_info *) pub->wlc;
-       int err = 0;
-       s32 int_val = 0;
-
-       /* check generic condition flags */
-       if (set) {
-               if (((vi->flags & IOVF_SET_DOWN) && wlc->pub->up) ||
-                   ((vi->flags & IOVF_SET_UP) && !wlc->pub->up)) {
-                       err = (wlc->pub->up ? BCME_NOTDOWN : BCME_NOTUP);
-               } else if ((vi->flags & IOVF_SET_BAND)
-                          && IS_MBAND_UNLOCKED(wlc)) {
-                       err = BCME_NOTBANDLOCKED;
-               } else if ((vi->flags & IOVF_SET_CLK) && !wlc->clk) {
-                       err = BCME_NOCLK;
-               }
-       } else {
-               if (((vi->flags & IOVF_GET_DOWN) && wlc->pub->up) ||
-                   ((vi->flags & IOVF_GET_UP) && !wlc->pub->up)) {
-                       err = (wlc->pub->up ? BCME_NOTDOWN : BCME_NOTUP);
-               } else if ((vi->flags & IOVF_GET_BAND)
-                          && IS_MBAND_UNLOCKED(wlc)) {
-                       err = BCME_NOTBANDLOCKED;
-               } else if ((vi->flags & IOVF_GET_CLK) && !wlc->clk) {
-                       err = BCME_NOCLK;
-               }
-       }
-
-       if (err)
-               goto exit;
-
-       /* length check on io buf */
-       err = bcm_iovar_lencheck(vi, arg, len, set);
-       if (err)
-               goto exit;
-
-       /* On set, check value ranges for integer types */
-       if (set) {
-               switch (vi->type) {
-               case IOVT_BOOL:
-               case IOVT_INT8:
-               case IOVT_INT16:
-               case IOVT_INT32:
-               case IOVT_UINT8:
-               case IOVT_UINT16:
-               case IOVT_UINT32:
-                       memcpy(&int_val, arg, sizeof(int));
-                       err = wlc_iovar_rangecheck(wlc, int_val, vi);
-                       break;
-               }
-       }
- exit:
-       return err;
-}
-
-/* handler for iovar table wlc_iovars */
-/*
- * IMPLEMENTATION NOTE: In order to avoid checking for get/set in each
- * iovar case, the switch statement maps the iovar id into separate get
- * and set values.  If you add a new iovar to the switch you MUST use
- * IOV_GVAL and/or IOV_SVAL in the case labels to avoid conflict with
- * another case.
- * Please use params for additional qualifying parameters.
- */
-int
-wlc_doiovar(void *hdl, const bcm_iovar_t *vi, u32 actionid,
-           const char *name, void *params, uint p_len, void *arg, int len,
-           int val_size, struct wlc_if *wlcif)
-{
-       struct wlc_info *wlc = hdl;
-       struct wlc_bsscfg *bsscfg;
-       int err = 0;
-       s32 int_val = 0;
-       s32 int_val2 = 0;
-       s32 *ret_int_ptr;
-       bool bool_val;
-       bool bool_val2;
-       wlc_bss_info_t *current_bss;
-
-       WL_TRACE("wl%d: %s\n", wlc->pub->unit, __func__);
-
-       bsscfg = NULL;
-       current_bss = NULL;
-
-       err = wlc_iovar_check(wlc->pub, vi, arg, len, IOV_ISSET(actionid));
-       if (err != 0)
-               return err;
-
-       /* convenience int and bool vals for first 8 bytes of buffer */
-       if (p_len >= (int)sizeof(int_val))
-               memcpy(&int_val, params, sizeof(int_val));
-
-       if (p_len >= (int)sizeof(int_val) * 2)
-               memcpy(&int_val2,
-                      (void *)((unsigned long)params + sizeof(int_val)),
-                      sizeof(int_val));
-
-       /* convenience int ptr for 4-byte gets (requires int aligned arg) */
-       ret_int_ptr = (s32 *) arg;
-
-       bool_val = (int_val != 0) ? true : false;
-       bool_val2 = (int_val2 != 0) ? true : false;
+                       } else {
+                               wlc->shortslot =
+                                   (wlc->shortslot_override ==
+                                    WLC_SHORTSLOT_ON);
+                       }
+               }
 
-       WL_TRACE("wl%d: %s: id %d\n",
-                wlc->pub->unit, __func__, IOV_ID(actionid));
-       /* Do the actual parameter implementation */
-       switch (actionid) {
-       case IOV_SVAL(IOV_RTSTHRESH):
-               wlc->RTSThresh = int_val;
                break;
 
-       case IOV_GVAL(IOV_QTXPOWER):{
-                       uint qdbm;
-                       bool override;
-
-                       err = wlc_phy_txpower_get(wlc->band->pi, &qdbm,
-                               &override);
-                       if (err != BCME_OK)
-                               return err;
+       }
+ done:
 
-                       /* Return qdbm units */
-                       *ret_int_ptr =
-                           qdbm | (override ? WL_TXPWR_OVERRIDE : 0);
-                       break;
-               }
+       if (bcmerror)
+               wlc->pub->bcmerror = bcmerror;
 
-               /* As long as override is false, this only sets the *user* targets.
-                  User can twiddle this all he wants with no harm.
-                  wlc_phy_txpower_set() explicitly sets override to false if
-                  not internal or test.
-                */
-       case IOV_SVAL(IOV_QTXPOWER):{
-                       u8 qdbm;
-                       bool override;
-
-                       /* Remove override bit and clip to max qdbm value */
-                       qdbm = (u8)min_t(u32, (int_val & ~WL_TXPWR_OVERRIDE), 0xff);
-                       /* Extract override setting */
-                       override = (int_val & WL_TXPWR_OVERRIDE) ? true : false;
-                       err =
-                           wlc_phy_txpower_set(wlc->band->pi, qdbm, override);
-                       break;
-               }
+       return bcmerror;
+}
 
-       case IOV_GVAL(IOV_MPC):
-               *ret_int_ptr = (s32) wlc->mpc;
-               break;
+/*
+ * register watchdog and down handlers.
+ */
+int wlc_module_register(struct wlc_pub *pub,
+                       const char *name, void *hdl,
+                       watchdog_fn_t w_fn, down_fn_t d_fn)
+{
+       struct wlc_info *wlc = (struct wlc_info *) pub->wlc;
+       int i;
 
-       case IOV_SVAL(IOV_MPC):
-               wlc->mpc = bool_val;
-               wlc_radio_mpc_upd(wlc);
+       /* find an empty entry and just add, no duplication check! */
+       for (i = 0; i < WLC_MAXMODULES; i++) {
+               if (wlc->modulecb[i].name[0] == '\0') {
+                       strncpy(wlc->modulecb[i].name, name,
+                               sizeof(wlc->modulecb[i].name) - 1);
+                       wlc->modulecb[i].hdl = hdl;
+                       wlc->modulecb[i].watchdog_fn = w_fn;
+                       wlc->modulecb[i].down_fn = d_fn;
+                       return 0;
+               }
+       }
 
-               break;
+       return -ENOSR;
+}
 
-       case IOV_GVAL(IOV_BCN_LI_BCN):
-               *ret_int_ptr = wlc->bcn_li_bcn;
-               break;
+/* unregister module callbacks */
+int wlc_module_unregister(struct wlc_pub *pub, const char *name, void *hdl)
+{
+       struct wlc_info *wlc = (struct wlc_info *) pub->wlc;
+       int i;
 
-       case IOV_SVAL(IOV_BCN_LI_BCN):
-               wlc->bcn_li_bcn = (u8) int_val;
-               if (wlc->pub->up)
-                       wlc_bcn_li_upd(wlc);
-               break;
+       if (wlc == NULL)
+               return -ENODATA;
 
-       default:
-               WL_ERROR("wl%d: %s: unsupported\n", wlc->pub->unit, __func__);
-               err = BCME_UNSUPPORTED;
-               break;
+       for (i = 0; i < WLC_MAXMODULES; i++) {
+               if (!strcmp(wlc->modulecb[i].name, name) &&
+                   (wlc->modulecb[i].hdl == hdl)) {
+                       memset(&wlc->modulecb[i], 0, sizeof(struct modulecb));
+                       return 0;
+               }
        }
 
-       goto exit;              /* avoid unused label warning */
-
- exit:
-       return err;
+       /* table not found! */
+       return -ENODATA;
 }
 
-static int
-wlc_iovar_rangecheck(struct wlc_info *wlc, u32 val, const bcm_iovar_t *vi)
+/* Write WME tunable parameters for retransmit/max rate from wlc struct to ucode */
+static void wlc_wme_retries_write(struct wlc_info *wlc)
 {
-       int err = 0;
-       u32 min_val = 0;
-       u32 max_val = 0;
-
-       /* Only ranged integers are checked */
-       switch (vi->type) {
-       case IOVT_INT32:
-               max_val |= 0x7fffffff;
-               /* fall through */
-       case IOVT_INT16:
-               max_val |= 0x00007fff;
-               /* fall through */
-       case IOVT_INT8:
-               max_val |= 0x0000007f;
-               min_val = ~max_val;
-               if (vi->flags & IOVF_NTRL)
-                       min_val = 1;
-               else if (vi->flags & IOVF_WHL)
-                       min_val = 0;
-               /* Signed values are checked against max_val and min_val */
-               if ((s32) val < (s32) min_val
-                   || (s32) val > (s32) max_val)
-                       err = BCME_RANGE;
-               break;
+       int ac;
 
-       case IOVT_UINT32:
-               max_val |= 0xffffffff;
-               /* fall through */
-       case IOVT_UINT16:
-               max_val |= 0x0000ffff;
-               /* fall through */
-       case IOVT_UINT8:
-               max_val |= 0x000000ff;
-               if (vi->flags & IOVF_NTRL)
-                       min_val = 1;
-               if ((val < min_val) || (val > max_val))
-                       err = BCME_RANGE;
-               break;
-       }
+       /* Need clock to do this */
+       if (!wlc->clk)
+               return;
 
-       return err;
+       for (ac = 0; ac < AC_COUNT; ac++) {
+               wlc_write_shm(wlc, M_AC_TXLMT_ADDR(ac), wlc->wme_retries[ac]);
+       }
 }
 
 #ifdef BCMDBG
@@ -4708,24 +2858,6 @@ void wlc_print_txstatus(tx_status_t *txs)
 #endif                         /* defined(BCMDBG) */
 }
 
-static void
-wlc_ctrupd_cache(u16 cur_stat, u16 *macstat_snapshot, u32 *macstat)
-{
-       u16 v;
-       u16 delta;
-
-       v = le16_to_cpu(cur_stat);
-       delta = (u16)(v - *macstat_snapshot);
-
-       if (delta != 0) {
-               *macstat += delta;
-               *macstat_snapshot = v;
-       }
-}
-
-#define MACSTATUPD(name) \
-       wlc_ctrupd_cache(macstats.name, &wlc->core->macstat_snapshot->name, &wlc->pub->_cnt->name)
-
 void wlc_statsupd(struct wlc_info *wlc)
 {
        int i;
@@ -4753,68 +2885,12 @@ void wlc_statsupd(struct wlc_info *wlc)
        wlc_bmac_copyfrom_shm(wlc->hw, M_UCODE_MACSTAT,
                              &macstats, sizeof(macstat_t));
 
-       /* update mac stats */
-       MACSTATUPD(txallfrm);
-       MACSTATUPD(txrtsfrm);
-       MACSTATUPD(txctsfrm);
-       MACSTATUPD(txackfrm);
-       MACSTATUPD(txdnlfrm);
-       MACSTATUPD(txbcnfrm);
-       for (i = 0; i < NFIFO; i++)
-               MACSTATUPD(txfunfl[i]);
-       MACSTATUPD(txtplunfl);
-       MACSTATUPD(txphyerr);
-       MACSTATUPD(rxfrmtoolong);
-       MACSTATUPD(rxfrmtooshrt);
-       MACSTATUPD(rxinvmachdr);
-       MACSTATUPD(rxbadfcs);
-       MACSTATUPD(rxbadplcp);
-       MACSTATUPD(rxcrsglitch);
-       MACSTATUPD(rxstrt);
-       MACSTATUPD(rxdfrmucastmbss);
-       MACSTATUPD(rxmfrmucastmbss);
-       MACSTATUPD(rxcfrmucast);
-       MACSTATUPD(rxrtsucast);
-       MACSTATUPD(rxctsucast);
-       MACSTATUPD(rxackucast);
-       MACSTATUPD(rxdfrmocast);
-       MACSTATUPD(rxmfrmocast);
-       MACSTATUPD(rxcfrmocast);
-       MACSTATUPD(rxrtsocast);
-       MACSTATUPD(rxctsocast);
-       MACSTATUPD(rxdfrmmcast);
-       MACSTATUPD(rxmfrmmcast);
-       MACSTATUPD(rxcfrmmcast);
-       MACSTATUPD(rxbeaconmbss);
-       MACSTATUPD(rxdfrmucastobss);
-       MACSTATUPD(rxbeaconobss);
-       MACSTATUPD(rxrsptmout);
-       MACSTATUPD(bcntxcancl);
-       MACSTATUPD(rxf0ovfl);
-       MACSTATUPD(rxf1ovfl);
-       MACSTATUPD(rxf2ovfl);
-       MACSTATUPD(txsfovfl);
-       MACSTATUPD(pmqovfl);
-       MACSTATUPD(rxcgprqfrm);
-       MACSTATUPD(rxcgprsqovfl);
-       MACSTATUPD(txcgprsfail);
-       MACSTATUPD(txcgprssuc);
-       MACSTATUPD(prs_timeout);
-       MACSTATUPD(rxnack);
-       MACSTATUPD(frmscons);
-       MACSTATUPD(txnack);
-       MACSTATUPD(txglitch_nack);
-       MACSTATUPD(txburst);
-       MACSTATUPD(phywatchdog);
-       MACSTATUPD(pktengrxducast);
-       MACSTATUPD(pktengrxdmcast);
-
 #ifdef BCMDBG
        /* check for rx fifo 0 overflow */
        delta = (u16) (wlc->core->macstat_snapshot->rxf0ovfl - rxf0ovfl);
        if (delta)
-               WL_ERROR("wl%d: %u rx fifo 0 overflows!\n",
-                        wlc->pub->unit, delta);
+               wiphy_err(wlc->wiphy, "wl%d: %u rx fifo 0 overflows!\n",
+                         wlc->pub->unit, delta);
 
        /* check for tx fifo underflows */
        for (i = 0; i < NFIFO; i++) {
@@ -4822,69 +2898,36 @@ void wlc_statsupd(struct wlc_info *wlc)
                    (u16) (wlc->core->macstat_snapshot->txfunfl[i] -
                              txfunfl[i]);
                if (delta)
-                       WL_ERROR("wl%d: %u tx fifo %d underflows!\n",
-                                wlc->pub->unit, delta, i);
+                       wiphy_err(wlc->wiphy, "wl%d: %u tx fifo %d underflows!"
+                                 "\n", wlc->pub->unit, delta, i);
        }
 #endif                         /* BCMDBG */
 
-       /* dot11 counter update */
-
-       WLCNTSET(wlc->pub->_cnt->txrts,
-                (wlc->pub->_cnt->rxctsucast -
-                 wlc->pub->_cnt->d11cnt_txrts_off));
-       WLCNTSET(wlc->pub->_cnt->rxcrc,
-                (wlc->pub->_cnt->rxbadfcs - wlc->pub->_cnt->d11cnt_rxcrc_off));
-       WLCNTSET(wlc->pub->_cnt->txnocts,
-                ((wlc->pub->_cnt->txrtsfrm - wlc->pub->_cnt->rxctsucast) -
-                 wlc->pub->_cnt->d11cnt_txnocts_off));
-
        /* merge counters from dma module */
        for (i = 0; i < NFIFO; i++) {
                if (wlc->hw->di[i]) {
-                       WLCNTADD(wlc->pub->_cnt->txnobuf,
-                                (wlc->hw->di[i])->txnobuf);
-                       WLCNTADD(wlc->pub->_cnt->rxnobuf,
-                                (wlc->hw->di[i])->rxnobuf);
-                       WLCNTADD(wlc->pub->_cnt->rxgiant,
-                                (wlc->hw->di[i])->rxgiants);
                        dma_counterreset(wlc->hw->di[i]);
                }
        }
-
-       /*
-        * Aggregate transmit and receive errors that probably resulted
-        * in the loss of a frame are computed on the fly.
-        */
-       WLCNTSET(wlc->pub->_cnt->txerror,
-                wlc->pub->_cnt->txnobuf + wlc->pub->_cnt->txnoassoc +
-                wlc->pub->_cnt->txuflo + wlc->pub->_cnt->txrunt +
-                wlc->pub->_cnt->dmade + wlc->pub->_cnt->dmada +
-                wlc->pub->_cnt->dmape);
-       WLCNTSET(wlc->pub->_cnt->rxerror,
-                wlc->pub->_cnt->rxoflo + wlc->pub->_cnt->rxnobuf +
-                wlc->pub->_cnt->rxfragerr + wlc->pub->_cnt->rxrunt +
-                wlc->pub->_cnt->rxgiant + wlc->pub->_cnt->rxnoscb +
-                wlc->pub->_cnt->rxbadsrcmac);
-       for (i = 0; i < NFIFO; i++)
-               wlc->pub->_cnt->rxerror += wlc->pub->_cnt->rxuflo[i];
 }
 
 bool wlc_chipmatch(u16 vendor, u16 device)
 {
-       if (vendor != VENDOR_BROADCOM) {
-               WL_ERROR("wlc_chipmatch: unknown vendor id %04x\n", vendor);
+       if (vendor != PCI_VENDOR_ID_BROADCOM) {
+               pr_err("wlc_chipmatch: unknown vendor id %04x\n", vendor);
                return false;
        }
 
+       if (device == BCM43224_D11N_ID_VEN1)
+               return true;
        if ((device == BCM43224_D11N_ID) || (device == BCM43225_D11N2G_ID))
                return true;
-
        if (device == BCM4313_D11N2G_ID)
                return true;
        if ((device == BCM43236_D11N_ID) || (device == BCM43236_D11N2G_ID))
                return true;
 
-       WL_ERROR("wlc_chipmatch: unknown device id %04x\n", device);
+       pr_err("wlc_chipmatch: unknown device id %04x\n", device);
        return false;
 }
 
@@ -4923,7 +2966,9 @@ void wlc_print_txdesc(d11txh_t *txh)
        char hexbuf[256];
 
        /* add plcp header along with txh descriptor */
-       prhex("Raw TxDesc + plcp header", (unsigned char *) txh, sizeof(d11txh_t) + 48);
+       printk(KERN_DEBUG "Raw TxDesc + plcp header:\n");
+       print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
+                            txh, sizeof(d11txh_t) + 48);
 
        printk(KERN_DEBUG "TxCtlLow: %04x ", mtcl);
        printk(KERN_DEBUG "TxCtlHigh: %04x ", mtch);
@@ -4939,16 +2984,16 @@ void wlc_print_txdesc(d11txh_t *txh)
        printk(KERN_DEBUG "XtraFrameTypes: %04x ", xtraft);
        printk(KERN_DEBUG "\n");
 
-       bcm_format_hex(hexbuf, iv, sizeof(txh->IV));
+       brcmu_format_hex(hexbuf, iv, sizeof(txh->IV));
        printk(KERN_DEBUG "SecIV:       %s\n", hexbuf);
-       bcm_format_hex(hexbuf, ra, sizeof(txh->TxFrameRA));
+       brcmu_format_hex(hexbuf, ra, sizeof(txh->TxFrameRA));
        printk(KERN_DEBUG "RA:          %s\n", hexbuf);
 
        printk(KERN_DEBUG "Fb FES Time: %04x ", tfestfb);
-       bcm_format_hex(hexbuf, rtspfb, sizeof(txh->RTSPLCPFallback));
+       brcmu_format_hex(hexbuf, rtspfb, sizeof(txh->RTSPLCPFallback));
        printk(KERN_DEBUG "RTS PLCP: %s ", hexbuf);
        printk(KERN_DEBUG "RTS DUR: %04x ", rtsdfb);
-       bcm_format_hex(hexbuf, fragpfb, sizeof(txh->FragPLCPFallback));
+       brcmu_format_hex(hexbuf, fragpfb, sizeof(txh->FragPLCPFallback));
        printk(KERN_DEBUG "PLCP: %s ", hexbuf);
        printk(KERN_DEBUG "DUR: %04x", fragdfb);
        printk(KERN_DEBUG "\n");
@@ -4964,9 +3009,9 @@ void wlc_print_txdesc(d11txh_t *txh)
        printk(KERN_DEBUG "MaxAggbyte_fb:  %04x\n", mabyte_f);
        printk(KERN_DEBUG "MinByte:     %04x\n", mmbyte);
 
-       bcm_format_hex(hexbuf, rtsph, sizeof(txh->RTSPhyHeader));
+       brcmu_format_hex(hexbuf, rtsph, sizeof(txh->RTSPhyHeader));
        printk(KERN_DEBUG "RTS PLCP: %s ", hexbuf);
-       bcm_format_hex(hexbuf, (u8 *) &rts, sizeof(txh->rts_frame));
+       brcmu_format_hex(hexbuf, (u8 *) &rts, sizeof(txh->rts_frame));
        printk(KERN_DEBUG "RTS Frame: %s", hexbuf);
        printk(KERN_DEBUG "\n");
 }
@@ -4984,7 +3029,7 @@ void wlc_print_rxh(d11rxhdr_t *rxh)
        u16 macstatus2 = rxh->RxStatus2;
        char flagstr[64];
        char lenbuf[20];
-       static const bcm_bit_desc_t macstat_flags[] = {
+       static const struct brcmu_bit_desc macstat_flags[] = {
                {RXS_FCSERR, "FCSErr"},
                {RXS_RESPFRAMETX, "Reply"},
                {RXS_PBPRES, "PADDING"},
@@ -4994,9 +3039,10 @@ void wlc_print_rxh(d11rxhdr_t *rxh)
                {0, NULL}
        };
 
-       prhex("Raw RxDesc", (unsigned char *) rxh, sizeof(d11rxhdr_t));
+       printk(KERN_DEBUG "Raw RxDesc:\n");
+       print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, rxh, sizeof(d11rxhdr_t));
 
-       bcm_format_flags(macstat_flags, macstatus1, flagstr, 64);
+       brcmu_format_flags(macstat_flags, macstatus1, flagstr, 64);
 
        snprintf(lenbuf, sizeof(lenbuf), "0x%x", len);
 
@@ -5011,34 +3057,6 @@ void wlc_print_rxh(d11rxhdr_t *rxh)
 }
 #endif                         /* defined(BCMDBG) */
 
-#if defined(BCMDBG)
-int wlc_format_ssid(char *buf, const unsigned char ssid[], uint ssid_len)
-{
-       uint i, c;
-       char *p = buf;
-       char *endp = buf + SSID_FMT_BUF_LEN;
-
-       if (ssid_len > IEEE80211_MAX_SSID_LEN)
-               ssid_len = IEEE80211_MAX_SSID_LEN;
-
-       for (i = 0; i < ssid_len; i++) {
-               c = (uint) ssid[i];
-               if (c == '\\') {
-                       *p++ = '\\';
-                       *p++ = '\\';
-               } else if (isprint((unsigned char) c)) {
-                       *p++ = (char)c;
-               } else {
-                       p += snprintf(p, (endp - p), "\\x%02X", c);
-               }
-       }
-       *p = '\0';
-       ASSERT(p < endp);
-
-       return (int)(p - buf);
-}
-#endif                         /* defined(BCMDBG) */
-
 static u16 wlc_rate_shm_offset(struct wlc_info *wlc, u8 rate)
 {
        return wlc_bmac_rate_shm_offset(wlc->hw, rate);
@@ -5055,13 +3073,13 @@ static u16 wlc_rate_shm_offset(struct wlc_info *wlc, u8 rate)
  *
  * Returns true if packet consumed (queued), false if not.
  */
-bool BCMFASTPATH
+bool
 wlc_prec_enq(struct wlc_info *wlc, struct pktq *q, void *pkt, int prec)
 {
        return wlc_prec_enq_head(wlc, q, pkt, prec, false);
 }
 
-bool BCMFASTPATH
+bool
 wlc_prec_enq_head(struct wlc_info *wlc, struct pktq *q, struct sk_buff *pkt,
                  int prec, bool head)
 {
@@ -5072,11 +3090,10 @@ wlc_prec_enq_head(struct wlc_info *wlc, struct pktq *q, struct sk_buff *pkt,
        if (pktq_pfull(q, prec))
                eprec = prec;
        else if (pktq_full(q)) {
-               p = pktq_peek_tail(q, &eprec);
-               ASSERT(p != NULL);
+               p = brcmu_pktq_peek_tail(q, &eprec);
                if (eprec > prec) {
-                       WL_ERROR("%s: Failing: eprec %d > prec %d\n",
-                                __func__, eprec, prec);
+                       wiphy_err(wlc->wiphy, "%s: Failing: eprec %d > prec %d"
+                                 "\n", __func__, eprec, prec);
                        return false;
                }
        }
@@ -5085,69 +3102,51 @@ wlc_prec_enq_head(struct wlc_info *wlc, struct pktq *q, struct sk_buff *pkt,
        if (eprec >= 0) {
                bool discard_oldest;
 
-               /* Detect queueing to unconfigured precedence */
-               ASSERT(!pktq_pempty(q, eprec));
-
                discard_oldest = AC_BITMAP_TST(wlc->wme_dp, eprec);
 
                /* Refuse newer packet unless configured to discard oldest */
                if (eprec == prec && !discard_oldest) {
-                       WL_ERROR("%s: No where to go, prec == %d\n",
-                                __func__, prec);
+                       wiphy_err(wlc->wiphy, "%s: No where to go, prec == %d"
+                                 "\n", __func__, prec);
                        return false;
                }
 
                /* Evict packet according to discard policy */
-               p = discard_oldest ? pktq_pdeq(q, eprec) : pktq_pdeq_tail(q,
-                                                                         eprec);
-               ASSERT(p != NULL);
-
-               /* Increment wme stats */
-               if (WME_ENAB(wlc->pub)) {
-                       WLCNTINCR(wlc->pub->_wme_cnt->
-                                 tx_failed[WME_PRIO2AC(p->priority)].packets);
-                       WLCNTADD(wlc->pub->_wme_cnt->
-                                tx_failed[WME_PRIO2AC(p->priority)].bytes,
-                                pkttotlen(p));
-               }
-               pkt_buf_free_skb(p);
-               wlc->pub->_cnt->txnobuf++;
+               p = discard_oldest ? brcmu_pktq_pdeq(q, eprec) :
+                       brcmu_pktq_pdeq_tail(q, eprec);
+               brcmu_pkt_buf_free_skb(p);
        }
 
        /* Enqueue */
        if (head)
-               p = pktq_penq_head(q, prec, pkt);
+               p = brcmu_pktq_penq_head(q, prec, pkt);
        else
-               p = pktq_penq(q, prec, pkt);
-       ASSERT(p != NULL);
+               p = brcmu_pktq_penq(q, prec, pkt);
 
        return true;
 }
 
-void BCMFASTPATH wlc_txq_enq(void *ctx, struct scb *scb, struct sk_buff *sdu,
+void wlc_txq_enq(void *ctx, struct scb *scb, struct sk_buff *sdu,
                             uint prec)
 {
        struct wlc_info *wlc = (struct wlc_info *) ctx;
-       struct wlc_txq_info *qi = wlc->active_queue;    /* Check me */
+       struct wlc_txq_info *qi = wlc->pkt_queue;       /* Check me */
        struct pktq *q = &qi->q;
        int prio;
 
        prio = sdu->priority;
 
-       ASSERT(pktq_max(q) >= wlc->pub->tunables->datahiwat);
-
        if (!wlc_prec_enq(wlc, q, sdu, prec)) {
                if (!EDCF_ENAB(wlc->pub)
                    || (wlc->pub->wlfeatureflag & WL_SWFL_FLOWCONTROL))
-                       WL_ERROR("wl%d: wlc_txq_enq: txq overflow\n",
-                                wlc->pub->unit);
+                       wiphy_err(wlc->wiphy, "wl%d: wlc_txq_enq: txq overflow"
+                                 "\n", wlc->pub->unit);
 
                /*
                 * XXX we might hit this condtion in case
                 * packet flooding from mac80211 stack
                 */
-               pkt_buf_free_skb(sdu);
-               wlc->pub->_cnt->txnobuf++;
+               brcmu_pkt_buf_free_skb(sdu);
        }
 
        /* Check if flow control needs to be turned on after enqueuing the packet
@@ -5167,7 +3166,7 @@ void BCMFASTPATH wlc_txq_enq(void *ctx, struct scb *scb, struct sk_buff *sdu,
        }
 }
 
-bool BCMFASTPATH
+bool
 wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
                     struct ieee80211_hw *hw)
 {
@@ -5177,43 +3176,30 @@ wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
        struct scb *scb = &global_scb;
        struct ieee80211_hdr *d11_header = (struct ieee80211_hdr *)(sdu->data);
 
-       ASSERT(sdu);
-
        /* 802.11 standard requires management traffic to go at highest priority */
        prio = ieee80211_is_data(d11_header->frame_control) ? sdu->priority :
                MAXPRIO;
        fifo = prio2fifo[prio];
-
-       ASSERT((uint) skb_headroom(sdu) >= TXOFF);
-       ASSERT(!(sdu->next));
-       ASSERT(!(sdu->prev));
-       ASSERT(fifo < NFIFO);
-
        pkt = sdu;
        if (unlikely
            (wlc_d11hdrs_mac80211(wlc, hw, pkt, scb, 0, 1, fifo, 0, NULL, 0)))
                return -EINVAL;
        wlc_txq_enq(wlc, scb, pkt, WLC_PRIO_TO_PREC(prio));
-       wlc_send_q(wlc, wlc->active_queue);
-
-       wlc->pub->_cnt->ieee_tx++;
+       wlc_send_q(wlc);
        return 0;
 }
 
-void BCMFASTPATH wlc_send_q(struct wlc_info *wlc, struct wlc_txq_info *qi)
+void wlc_send_q(struct wlc_info *wlc)
 {
        struct sk_buff *pkt[DOT11_MAXNUMFRAGS];
        int prec;
        u16 prec_map;
        int err = 0, i, count;
        uint fifo;
+       struct wlc_txq_info *qi = wlc->pkt_queue;
        struct pktq *q = &qi->q;
        struct ieee80211_tx_info *tx_info;
 
-       /* only do work for the active queue */
-       if (qi != wlc->active_queue)
-               return;
-
        if (in_send_q)
                return;
        else
@@ -5224,7 +3210,7 @@ void BCMFASTPATH wlc_send_q(struct wlc_info *wlc, struct wlc_txq_info *qi)
        /* Send all the enq'd pkts that we can.
         * Dequeue packets with precedence with empty HW fifo only
         */
-       while (prec_map && (pkt[0] = pktq_mdeq(q, prec_map, &prec))) {
+       while (prec_map && (pkt[0] = brcmu_pktq_mdeq(q, prec_map, &prec))) {
                tx_info = IEEE80211_SKB_CB(pkt[0]);
                if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
                        err = wlc_sendampdu(wlc->ampdu, qi, pkt, prec);
@@ -5238,8 +3224,8 @@ void BCMFASTPATH wlc_send_q(struct wlc_info *wlc, struct wlc_txq_info *qi)
                        }
                }
 
-               if (err == BCME_BUSY) {
-                       pktq_penq_head(q, prec, pkt[0]);
+               if (err == -EBUSY) {
+                       brcmu_pktq_penq_head(q, prec, pkt[0]);
                        /* If send failed due to any other reason than a change in
                         * HW FIFO condition, quit. Otherwise, read the new prec_map!
                         */
@@ -5290,14 +3276,13 @@ bcmc_fid_generate(struct wlc_info *wlc, struct wlc_bsscfg *bsscfg,
        return frameid;
 }
 
-void BCMFASTPATH
+void
 wlc_txfifo(struct wlc_info *wlc, uint fifo, struct sk_buff *p, bool commit,
           s8 txpktpend)
 {
        u16 frameid = INVALIDFID;
        d11txh_t *txh;
 
-       ASSERT(fifo < NFIFO);
        txh = (d11txh_t *) (p->data);
 
        /* When a BC/MC frame is being committed to the BCMC fifo via DMA (NOT PIO), update
@@ -5317,7 +3302,7 @@ wlc_txfifo(struct wlc_info *wlc, uint fifo, struct sk_buff *p, bool commit,
         */
        if (commit) {
                TXPKTPENDINC(wlc, fifo, txpktpend);
-               WL_TRACE("wlc_txfifo, pktpend inc %d to %d\n",
+               BCMMSG(wlc->wiphy, "pktpend inc %d to %d\n",
                         txpktpend, TXPKTPENDGET(wlc, fifo));
        }
 
@@ -5326,57 +3311,11 @@ wlc_txfifo(struct wlc_info *wlc, uint fifo, struct sk_buff *p, bool commit,
                BCMCFID(wlc, frameid);
 
        if (dma_txfast(wlc->hw->di[fifo], p, commit) < 0) {
-               WL_ERROR("wlc_txfifo: fatal, toss frames !!!\n");
-       }
-}
-
-static u16
-wlc_compute_airtime(struct wlc_info *wlc, ratespec_t rspec, uint length)
-{
-       u16 usec = 0;
-       uint mac_rate = RSPEC2RATE(rspec);
-       uint nsyms;
-
-       if (IS_MCS(rspec)) {
-               /* not supported yet */
-               ASSERT(0);
-       } else if (IS_OFDM(rspec)) {
-               /* nsyms = Ceiling(Nbits / (Nbits/sym))
-                *
-                * Nbits = length * 8
-                * Nbits/sym = Mbps * 4 = mac_rate * 2
-                */
-               nsyms = CEIL((length * 8), (mac_rate * 2));
-
-               /* usec = symbols * usec/symbol */
-               usec = (u16) (nsyms * APHY_SYMBOL_TIME);
-               return usec;
-       } else {
-               switch (mac_rate) {
-               case WLC_RATE_1M:
-                       usec = length << 3;
-                       break;
-               case WLC_RATE_2M:
-                       usec = length << 2;
-                       break;
-               case WLC_RATE_5M5:
-                       usec = (length << 4) / 11;
-                       break;
-               case WLC_RATE_11M:
-                       usec = (length << 3) / 11;
-                       break;
-               default:
-                       WL_ERROR("wl%d: wlc_compute_airtime: unsupported rspec 0x%x\n",
-                                wlc->pub->unit, rspec);
-                       ASSERT((const char *)"Bad phy_rate" == NULL);
-                       break;
-               }
+               wiphy_err(wlc->wiphy, "wlc_txfifo: fatal, toss frames !!!\n");
        }
-
-       return usec;
 }
 
-void BCMFASTPATH
+void
 wlc_compute_plcp(struct wlc_info *wlc, ratespec_t rspec, uint length, u8 *plcp)
 {
        if (IS_MCS(rspec)) {
@@ -5384,7 +3323,7 @@ wlc_compute_plcp(struct wlc_info *wlc, ratespec_t rspec, uint length, u8 *plcp)
        } else if (IS_OFDM(rspec)) {
                wlc_compute_ofdm_plcp(rspec, length, plcp);
        } else {
-               wlc_compute_cck_plcp(rspec, length, plcp);
+               wlc_compute_cck_plcp(wlc, rspec, length, plcp);
        }
        return;
 }
@@ -5393,7 +3332,6 @@ wlc_compute_plcp(struct wlc_info *wlc, ratespec_t rspec, uint length, u8 *plcp)
 static void wlc_compute_mimo_plcp(ratespec_t rspec, uint length, u8 *plcp)
 {
        u8 mcs = (u8) (rspec & RSPEC_RATE_MASK);
-       ASSERT(IS_MCS(rspec));
        plcp[0] = mcs;
        if (RSPEC_IS40MHZ(rspec) || (mcs == 32))
                plcp[0] |= MIMO_PLCP_40MHZ;
@@ -5405,19 +3343,15 @@ static void wlc_compute_mimo_plcp(ratespec_t rspec, uint length, u8 *plcp)
 }
 
 /* Rate: 802.11 rate code, length: PSDU length in octets */
-static void BCMFASTPATH
+static void
 wlc_compute_ofdm_plcp(ratespec_t rspec, u32 length, u8 *plcp)
 {
        u8 rate_signal;
        u32 tmp = 0;
        int rate = RSPEC2RATE(rspec);
 
-       ASSERT(IS_OFDM(rspec));
-
        /* encode rate per 802.11a-1999 sec 17.3.4.1, with lsb transmitted first */
-       rate_signal = rate_info[rate] & RATE_MASK;
-       ASSERT(rate_signal != 0);
-
+       rate_signal = rate_info[rate] & WLC_RATE_MASK;
        memset(plcp, 0, D11_PHY_HDR_LEN);
        D11A_PHY_HDR_SRATE((ofdm_phy_hdr_t *) plcp, rate_signal);
 
@@ -5436,7 +3370,8 @@ wlc_compute_ofdm_plcp(ratespec_t rspec, u32 length, u8 *plcp)
  * Broken out for PRQ.
  */
 
-static void wlc_cck_plcp_set(int rate_500, uint length, u8 *plcp)
+static void wlc_cck_plcp_set(struct wlc_info *wlc, int rate_500, uint length,
+                            u8 *plcp)
 {
        u16 usec = 0;
        u8 le = 0;
@@ -5463,7 +3398,8 @@ static void wlc_cck_plcp_set(int rate_500, uint length, u8 *plcp)
                break;
 
        default:
-               WL_ERROR("wlc_cck_plcp_set: unsupported rate %d\n", rate_500);
+               wiphy_err(wlc->wiphy, "wlc_cck_plcp_set: unsupported rate %d"
+                         "\n", rate_500);
                rate_500 = WLC_RATE_1M;
                usec = length << 3;
                break;
@@ -5481,13 +3417,12 @@ static void wlc_cck_plcp_set(int rate_500, uint length, u8 *plcp)
 }
 
 /* Rate: 802.11 rate code, length: PSDU length in octets */
-static void wlc_compute_cck_plcp(ratespec_t rspec, uint length, u8 *plcp)
+static void wlc_compute_cck_plcp(struct wlc_info *wlc, ratespec_t rspec,
+                                uint length, u8 *plcp)
 {
        int rate = RSPEC2RATE(rspec);
 
-       ASSERT(IS_CCK(rspec));
-
-       wlc_cck_plcp_set(rate, length, plcp);
+       wlc_cck_plcp_set(wlc, rate, length, plcp);
 }
 
 /* wlc_compute_frame_dur()
@@ -5500,7 +3435,7 @@ static void wlc_compute_cck_plcp(ratespec_t rspec, uint length, u8 *plcp)
  * next_frag_len       next MPDU length in bytes
  * preamble_type       use short/GF or long/MM PLCP header
  */
-static u16 BCMFASTPATH
+static u16
 wlc_compute_frame_dur(struct wlc_info *wlc, ratespec_t rate, u8 preamble_type,
                      uint next_frag_len)
 {
@@ -5534,7 +3469,7 @@ wlc_compute_frame_dur(struct wlc_info *wlc, ratespec_t rate, u8 preamble_type,
  * rate                        next MPDU rate in unit of 500kbps
  * frame_len           next MPDU frame length in bytes
  */
-u16 BCMFASTPATH
+u16
 wlc_compute_rtscts_dur(struct wlc_info *wlc, bool cts_only, ratespec_t rts_rate,
                       ratespec_t frame_rate, u8 rts_preamble_type,
                       u8 frame_preamble_type, uint frame_len, bool ba)
@@ -5566,33 +3501,7 @@ wlc_compute_rtscts_dur(struct wlc_info *wlc, bool cts_only, ratespec_t rts_rate,
        return dur;
 }
 
-static bool wlc_phy_rspec_check(struct wlc_info *wlc, u16 bw, ratespec_t rspec)
-{
-       if (IS_MCS(rspec)) {
-               uint mcs = rspec & RSPEC_RATE_MASK;
-
-               if (mcs < 8) {
-                       ASSERT(RSPEC_STF(rspec) < PHY_TXC1_MODE_SDM);
-               } else if ((mcs >= 8) && (mcs <= 23)) {
-                       ASSERT(RSPEC_STF(rspec) == PHY_TXC1_MODE_SDM);
-               } else if (mcs == 32) {
-                       ASSERT(RSPEC_STF(rspec) < PHY_TXC1_MODE_SDM);
-                       ASSERT(bw == PHY_TXC1_BW_40MHZ_DUP);
-               }
-       } else if (IS_OFDM(rspec)) {
-               ASSERT(RSPEC_STF(rspec) < PHY_TXC1_MODE_STBC);
-       } else {
-               ASSERT(IS_CCK(rspec));
-
-               ASSERT((bw == PHY_TXC1_BW_20MHZ)
-                      || (bw == PHY_TXC1_BW_20MHZ_UP));
-               ASSERT(RSPEC_STF(rspec) == PHY_TXC1_MODE_SISO);
-       }
-
-       return true;
-}
-
-u16 BCMFASTPATH wlc_phytxctl1_calc(struct wlc_info *wlc, ratespec_t rspec)
+u16 wlc_phytxctl1_calc(struct wlc_info *wlc, ratespec_t rspec)
 {
        u16 phyctl1 = 0;
        u16 bw;
@@ -5603,12 +3512,10 @@ u16 BCMFASTPATH wlc_phytxctl1_calc(struct wlc_info *wlc, ratespec_t rspec)
                bw = RSPEC_GET_BW(rspec);
                /* 10Mhz is not supported yet */
                if (bw < PHY_TXC1_BW_20MHZ) {
-                       WL_ERROR("wlc_phytxctl1_calc: bw %d is not supported yet, set to 20L\n",
-                                bw);
+                       wiphy_err(wlc->wiphy, "wlc_phytxctl1_calc: bw %d is "
+                                 "not supported yet, set to 20L\n", bw);
                        bw = PHY_TXC1_BW_20MHZ;
                }
-
-               wlc_phy_rspec_check(wlc, bw, rspec);
        }
 
        if (IS_MCS(rspec)) {
@@ -5629,8 +3536,8 @@ u16 BCMFASTPATH wlc_phytxctl1_calc(struct wlc_info *wlc, ratespec_t rspec)
                /* get the phyctl byte from rate phycfg table */
                phycfg = wlc_rate_legacy_phyctl(RSPEC2RATE(rspec));
                if (phycfg == -1) {
-                       WL_ERROR("wlc_phytxctl1_calc: wrong legacy OFDM/CCK rate\n");
-                       ASSERT(0);
+                       wiphy_err(wlc->wiphy, "wlc_phytxctl1_calc: wrong "
+                                 "legacy OFDM/CCK rate\n");
                        phycfg = 0;
                }
                /* set the upper byte of phyctl1 */
@@ -5638,18 +3545,10 @@ u16 BCMFASTPATH wlc_phytxctl1_calc(struct wlc_info *wlc, ratespec_t rspec)
                    (bw | (phycfg << 8) |
                     (RSPEC_STF(rspec) << PHY_TXC1_MODE_SHIFT));
        }
-
-#ifdef BCMDBG
-       /* phy clock must support 40Mhz if tx descriptor uses it */
-       if ((phyctl1 & PHY_TXC1_BW_MASK) >= PHY_TXC1_BW_40MHZ) {
-               ASSERT(CHSPEC_WLC_BW(wlc->chanspec) == WLC_40_MHZ);
-               ASSERT(wlc->chanspec == wlc_phy_chanspec_get(wlc->band->pi));
-       }
-#endif                         /* BCMDBG */
        return phyctl1;
 }
 
-ratespec_t BCMFASTPATH
+ratespec_t
 wlc_rspec_to_rts_rspec(struct wlc_info *wlc, ratespec_t rspec, bool use_rspec,
                       u16 mimo_ctlchbw)
 {
@@ -5705,7 +3604,7 @@ wlc_rspec_to_rts_rspec(struct wlc_info *wlc, ratespec_t rspec, bool use_rspec,
  * headroom == D11_PHY_HDR_LEN + D11_TXH_LEN (D11_TXH_LEN is now 104 bytes)
  *
  */
-static u16 BCMFASTPATH
+static u16
 wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                     struct sk_buff *p, struct scb *scb, uint frag,
                     uint nfrags, uint queue, uint next_frag_len,
@@ -5744,14 +3643,12 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
        u16 mimo_txbw;
        u8 mimo_preamble_type;
 
-       ASSERT(queue < NFIFO);
-
        /* locate 802.11 MAC header */
        h = (struct ieee80211_hdr *)(p->data);
        qos = ieee80211_is_data_qos(h->frame_control);
 
        /* compute length of frame in bytes for use in PLCP computations */
-       len = pkttotlen(p);
+       len = brcmu_pkttotlen(p);
        phylen = len + FCS_LEN;
 
        /* If WEP enabled, add room in phylen for the additional bytes of
@@ -5765,7 +3662,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
 
        /* Get tx_info */
        tx_info = IEEE80211_SKB_CB(p);
-       ASSERT(tx_info);
 
        /* add PLCP */
        plcp = skb_push(p, D11_PHY_HDR_LEN);
@@ -5777,10 +3673,9 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
        /* setup frameid */
        if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
                /* non-AP STA should never use BCMC queue */
-               ASSERT(queue != TX_BCMC_FIFO);
                if (queue == TX_BCMC_FIFO) {
-                       WL_ERROR("wl%d: %s: ASSERT queue == TX_BCMC!\n",
-                                WLCWLUNIT(wlc), __func__);
+                       wiphy_err(wlc->wiphy, "wl%d: %s: ASSERT queue == "
+                                 "TX_BCMC!\n", WLCWLUNIT(wlc), __func__);
                        frameid = bcmc_fid_generate(wlc, NULL, txh);
                } else {
                        /* Increment the counter for first fragment */
@@ -5803,13 +3698,9 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
        if (SCB_PS(scb) || ieee80211_is_beacon(h->frame_control))
                mcl |= TXC_IGNOREPMQ;
 
-       ASSERT(hw->max_rates <= IEEE80211_TX_MAX_RATES);
-       ASSERT(hw->max_rates == 2);
-
        txrate[0] = tx_info->control.rates;
        txrate[1] = txrate[0] + 1;
 
-       ASSERT(txrate[0]->idx >= 0);
        /* if rate control algorithm didn't give us a fallback rate, use the primary rate */
        if (txrate[1]->idx < 0) {
                txrate[1] = txrate[0];
@@ -5819,7 +3710,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                is_mcs[k] =
                    txrate[k]->flags & IEEE80211_TX_RC_MCS ? true : false;
                if (!is_mcs[k]) {
-                       ASSERT(!(tx_info->flags & IEEE80211_TX_CTL_AMPDU));
                        if ((txrate[k]->idx >= 0)
                            && (txrate[k]->idx <
                                hw->wiphy->bands[tx_info->band]->n_bitrates)) {
@@ -5831,10 +3721,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                                    flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE ?
                                    true : false;
                        } else {
-                               ASSERT((txrate[k]->idx >= 0) &&
-                                      (txrate[k]->idx <
-                                       hw->wiphy->bands[tx_info->band]->
-                                       n_bitrates));
                                rate_val[k] = WLC_RATE_1M;
                        }
                } else {
@@ -5857,7 +3743,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
 
                /* (1) RATE: determine and validate primary rate and fallback rates */
                if (!RSPEC_ACTIVE(rspec[k])) {
-                       ASSERT(RSPEC_ACTIVE(rspec[k]));
                        rspec[k] = WLC_RATE_1M;
                } else {
                        if (!is_multicast_ether_addr(h->addr1)) {
@@ -5885,7 +3770,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                                    && WLC_STF_SS_STBC_TX(wlc, scb)) {
                                        u8 stc;
 
-                                       ASSERT(WLC_STBC_CAP_PHY(wlc));
                                        stc = 1;        /* Nss for single stream is always 1 */
                                        rspec[k] |=
                                            (PHY_TXC1_MODE_STBC <<
@@ -5918,7 +3802,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                                        if (wlc->ofdm_40txbw != AUTO)
                                                mimo_txbw = wlc->ofdm_40txbw;
                                } else {
-                                       ASSERT(IS_CCK(rspec[k]));
                                        if (wlc->cck_40txbw != AUTO)
                                                mimo_txbw = wlc->cck_40txbw;
                                }
@@ -5957,9 +3840,9 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
 
                        if ((txrate[k]->flags & IEEE80211_TX_RC_MCS)
                            && (!IS_MCS(rspec[k]))) {
-                               WL_ERROR("wl%d: %s: IEEE80211_TX_RC_MCS != IS_MCS(rspec)\n",
-                                        WLCWLUNIT(wlc), __func__);
-                               ASSERT(0 && "Rate mismatch");
+                               wiphy_err(wlc->wiphy, "wl%d: %s: IEEE80211_TX_"
+                                         "RC_MCS != IS_MCS(rspec)\n",
+                                         WLCWLUNIT(wlc), __func__);
                        }
 
                        if (IS_MCS(rspec[k])) {
@@ -5973,22 +3856,15 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                                }
                        }
 
-                       /* mimo bw field MUST now be valid in the rspec (it affects duration calculations) */
-                       ASSERT(VALID_RATE_DBG(wlc, rspec[0]));
-
                        /* should be better conditionalized */
                        if (!IS_MCS(rspec[0])
                            && (tx_info->control.rates[0].
                                flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE))
                                preamble_type[k] = WLC_SHORT_PREAMBLE;
-
-                       ASSERT(!IS_MCS(rspec[0])
-                              || WLC_IS_MIMO_PREAMBLE(preamble_type[k]));
                }
        } else {
                for (k = 0; k < hw->max_rates; k++) {
                        /* Set ctrlchbw as 20Mhz */
-                       ASSERT(!IS_MCS(rspec[k]));
                        rspec[k] &= ~RSPEC_BW_MASK;
                        rspec[k] |= (PHY_TXC1_BW_20MHZ << RSPEC_BW_SHIFT);
 
@@ -6080,8 +3956,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
        /* Set fallback rate preamble type */
        if ((preamble_type[1] == WLC_SHORT_PREAMBLE) ||
            (preamble_type[1] == WLC_GF_PREAMBLE)) {
-               ASSERT((preamble_type[1] == WLC_GF_PREAMBLE) ||
-                      (!IS_MCS(rspec[1])));
                if (RSPEC2RATE(rspec[1]) != WLC_RATE_1M)
                        mch |= TXC_PREAMBLE_DATA_FB_SHORT;
        }
@@ -6146,7 +4020,6 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                }
 
                /* RTS PLCP header */
-               ASSERT(IS_ALIGNED((unsigned long)txh->RTSPhyHeader, sizeof(u16)));
                rts_plcp = txh->RTSPhyHeader;
                if (use_cts)
                        rts_phylen = DOT11_CTS_LEN + FCS_LEN;
@@ -6229,11 +4102,8 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
        phyctl = FRAMETYPE(rspec[0], wlc->mimoft);
        if ((preamble_type[0] == WLC_SHORT_PREAMBLE) ||
            (preamble_type[0] == WLC_GF_PREAMBLE)) {
-               ASSERT((preamble_type[0] == WLC_GF_PREAMBLE)
-                      || !IS_MCS(rspec[0]));
                if (RSPEC2RATE(rspec[0]) != WLC_RATE_1M)
                        phyctl |= PHY_TXC_SHORT_HDR;
-               wlc->pub->_cnt->txprshort++;
        }
 
        /* phytxant is properly bit shifted */
@@ -6274,21 +4144,10 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                }
        }
 
-       if (IS_MCS(rspec[0]))
-               ASSERT(IS_MCS(rspec[1]));
-
-       ASSERT(!IS_MCS(rspec[0]) ||
-              ((preamble_type[0] == WLC_MM_PREAMBLE) == (txh->MModeLen != 0)));
-       ASSERT(!IS_MCS(rspec[1]) ||
-              ((preamble_type[1] == WLC_MM_PREAMBLE) ==
-               (txh->MModeFbrLen != 0)));
-
        ac = skb_get_queue_mapping(p);
        if (SCB_WME(scb) && qos && wlc->edcf_txop[ac]) {
                uint frag_dur, dur, dur_fallback;
 
-               ASSERT(!is_multicast_ether_addr(h->addr1));
-
                /* WME: Update TXOP threshold */
                if ((!(tx_info->flags & IEEE80211_TX_CTL_AMPDU)) && (frag == 0)) {
                        frag_dur =
@@ -6331,204 +4190,60 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
                        txh->TxFesTimeFallback =
                                cpu_to_le16((u16) dur_fallback);
 
-                       /* update txop byte threshold (txop minus intraframe overhead) */
-                       if (wlc->edcf_txop[ac] >= (dur - frag_dur)) {
-                               {
-                                       uint newfragthresh;
-
-                                       newfragthresh =
-                                           wlc_calc_frame_len(wlc, rspec[0],
-                                                              preamble_type[0],
-                                                              (wlc->
-                                                               edcf_txop[ac] -
-                                                               (dur -
-                                                                frag_dur)));
-                                       /* range bound the fragthreshold */
-                                       if (newfragthresh < DOT11_MIN_FRAG_LEN)
-                                               newfragthresh =
-                                                   DOT11_MIN_FRAG_LEN;
-                                       else if (newfragthresh >
-                                                wlc->usr_fragthresh)
-                                               newfragthresh =
-                                                   wlc->usr_fragthresh;
-                                       /* update the fragthresh and do txc update */
-                                       if (wlc->fragthresh[queue] !=
-                                           (u16) newfragthresh) {
-                                               wlc->fragthresh[queue] =
-                                                   (u16) newfragthresh;
-                                       }
-                               }
-                       } else
-                               WL_ERROR("wl%d: %s txop invalid for rate %d\n",
-                                        wlc->pub->unit, fifo_names[queue],
-                                        RSPEC2RATE(rspec[0]));
-
-                       if (dur > wlc->edcf_txop[ac])
-                               WL_ERROR("wl%d: %s: %s txop exceeded phylen %d/%d dur %d/%d\n",
-                                        wlc->pub->unit, __func__,
-                                        fifo_names[queue],
-                                        phylen, wlc->fragthresh[queue],
-                                        dur, wlc->edcf_txop[ac]);
-               }
-       }
-
-       return 0;
-}
-
-void wlc_tbtt(struct wlc_info *wlc, d11regs_t *regs)
-{
-       struct wlc_bsscfg *cfg = wlc->cfg;
-
-       wlc->pub->_cnt->tbtt++;
-
-       if (BSSCFG_STA(cfg)) {
-               /* run watchdog here if the watchdog timer is not armed */
-               if (WLC_WATCHDOG_TBTT(wlc)) {
-                       u32 cur, delta;
-                       if (wlc->WDarmed) {
-                               wl_del_timer(wlc->wl, wlc->wdtimer);
-                               wlc->WDarmed = false;
-                       }
-
-                       cur = OSL_SYSUPTIME();
-                       delta = cur > wlc->WDlast ? cur - wlc->WDlast :
-                           (u32) ~0 - wlc->WDlast + cur + 1;
-                       if (delta >= TIMER_INTERVAL_WATCHDOG) {
-                               wlc_watchdog((void *)wlc);
-                               wlc->WDlast = cur;
-                       }
-
-                       wl_add_timer(wlc->wl, wlc->wdtimer,
-                                    wlc_watchdog_backup_bi(wlc), true);
-                       wlc->WDarmed = true;
-               }
-       }
-
-       if (!cfg->BSS) {
-               /* DirFrmQ is now valid...defer setting until end of ATIM window */
-               wlc->qvalid |= MCMD_DIRFRMQVAL;
-       }
-}
-
-/* GP timer is a freerunning 32 bit counter, decrements at 1 us rate */
-void wlc_hwtimer_gptimer_set(struct wlc_info *wlc, uint us)
-{
-       W_REG(&wlc->regs->gptimer, us);
-}
-
-void wlc_hwtimer_gptimer_abort(struct wlc_info *wlc)
-{
-       W_REG(&wlc->regs->gptimer, 0);
-}
-
-static void wlc_hwtimer_gptimer_cb(struct wlc_info *wlc)
-{
-       /* when interrupt is generated, the counter is loaded with last value
-        * written and continue to decrement. So it has to be cleaned first
-        */
-       W_REG(&wlc->regs->gptimer, 0);
-}
-
-/*
- * This fn has all the high level dpc processing from wlc_dpc.
- * POLICY: no macinstatus change, no bounding loop.
- *         All dpc bounding should be handled in BMAC dpc, like txstatus and rxint
- */
-void wlc_high_dpc(struct wlc_info *wlc, u32 macintstatus)
-{
-       d11regs_t *regs = wlc->regs;
-#ifdef BCMDBG
-       char flagstr[128];
-       static const bcm_bit_desc_t int_flags[] = {
-               {MI_MACSSPNDD, "MACSSPNDD"},
-               {MI_BCNTPL, "BCNTPL"},
-               {MI_TBTT, "TBTT"},
-               {MI_BCNSUCCESS, "BCNSUCCESS"},
-               {MI_BCNCANCLD, "BCNCANCLD"},
-               {MI_ATIMWINEND, "ATIMWINEND"},
-               {MI_PMQ, "PMQ"},
-               {MI_NSPECGEN_0, "NSPECGEN_0"},
-               {MI_NSPECGEN_1, "NSPECGEN_1"},
-               {MI_MACTXERR, "MACTXERR"},
-               {MI_NSPECGEN_3, "NSPECGEN_3"},
-               {MI_PHYTXERR, "PHYTXERR"},
-               {MI_PME, "PME"},
-               {MI_GP0, "GP0"},
-               {MI_GP1, "GP1"},
-               {MI_DMAINT, "DMAINT"},
-               {MI_TXSTOP, "TXSTOP"},
-               {MI_CCA, "CCA"},
-               {MI_BG_NOISE, "BG_NOISE"},
-               {MI_DTIM_TBTT, "DTIM_TBTT"},
-               {MI_PRQ, "PRQ"},
-               {MI_PWRUP, "PWRUP"},
-               {MI_RFDISABLE, "RFDISABLE"},
-               {MI_TFS, "TFS"},
-               {MI_PHYCHANGED, "PHYCHANGED"},
-               {MI_TO, "TO"},
-               {0, NULL}
-       };
-
-       if (macintstatus & ~(MI_TBTT | MI_TXSTOP)) {
-               bcm_format_flags(int_flags, macintstatus, flagstr,
-                                sizeof(flagstr));
-               WL_TRACE("wl%d: macintstatus 0x%x %s\n",
-                        wlc->pub->unit, macintstatus, flagstr);
-       }
-#endif                         /* BCMDBG */
-
-       if (macintstatus & MI_PRQ) {
-               /* Process probe request FIFO */
-               ASSERT(0 && "PRQ Interrupt in non-MBSS");
-       }
-
-       /* TBTT indication */
-       /* ucode only gives either TBTT or DTIM_TBTT, not both */
-       if (macintstatus & (MI_TBTT | MI_DTIM_TBTT))
-               wlc_tbtt(wlc, regs);
-
-       if (macintstatus & MI_GP0) {
-               WL_ERROR("wl%d: PSM microcode watchdog fired at %d (seconds). Resetting.\n",
-                        wlc->pub->unit, wlc->pub->now);
-
-               printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
-                                       __func__, wlc->pub->sih->chip,
-                                       wlc->pub->sih->chiprev);
-
-               wlc->pub->_cnt->psmwds++;
-
-               /* big hammer */
-               wl_init(wlc->wl);
-       }
+                       /* update txop byte threshold (txop minus intraframe overhead) */
+                       if (wlc->edcf_txop[ac] >= (dur - frag_dur)) {
+                               {
+                                       uint newfragthresh;
 
-       /* gptimer timeout */
-       if (macintstatus & MI_TO) {
-               wlc_hwtimer_gptimer_cb(wlc);
-       }
+                                       newfragthresh =
+                                           wlc_calc_frame_len(wlc, rspec[0],
+                                                              preamble_type[0],
+                                                              (wlc->
+                                                               edcf_txop[ac] -
+                                                               (dur -
+                                                                frag_dur)));
+                                       /* range bound the fragthreshold */
+                                       if (newfragthresh < DOT11_MIN_FRAG_LEN)
+                                               newfragthresh =
+                                                   DOT11_MIN_FRAG_LEN;
+                                       else if (newfragthresh >
+                                                wlc->usr_fragthresh)
+                                               newfragthresh =
+                                                   wlc->usr_fragthresh;
+                                       /* update the fragthresh and do txc update */
+                                       if (wlc->fragthresh[queue] !=
+                                           (u16) newfragthresh) {
+                                               wlc->fragthresh[queue] =
+                                                   (u16) newfragthresh;
+                                       }
+                               }
+                       } else
+                               wiphy_err(wlc->wiphy, "wl%d: %s txop invalid "
+                                         "for rate %d\n",
+                                         wlc->pub->unit, fifo_names[queue],
+                                         RSPEC2RATE(rspec[0]));
 
-       if (macintstatus & MI_RFDISABLE) {
-               WL_ERROR("wl%d: MAC Detected a change on the RF Disable Input 0x%x\n",
-                        wlc->pub->unit,
-                        R_REG(&regs->phydebug) & PDBG_RFD);
-               /* delay the cleanup to wl_down in IBSS case */
-               if ((R_REG(&regs->phydebug) & PDBG_RFD)) {
-                       int idx;
-                       struct wlc_bsscfg *bsscfg;
-                       FOREACH_BSS(wlc, idx, bsscfg) {
-                               if (!BSSCFG_STA(bsscfg) || !bsscfg->enable
-                                   || !bsscfg->BSS)
-                                       continue;
-                               WL_ERROR("wl%d: wlc_dpc: rfdisable -> wlc_bsscfg_disable()\n",
-                                        wlc->pub->unit);
-                       }
+                       if (dur > wlc->edcf_txop[ac])
+                               wiphy_err(wlc->wiphy, "wl%d: %s: %s txop "
+                                         "exceeded phylen %d/%d dur %d/%d\n",
+                                         wlc->pub->unit, __func__,
+                                         fifo_names[queue],
+                                         phylen, wlc->fragthresh[queue],
+                                         dur, wlc->edcf_txop[ac]);
                }
        }
 
-       /* send any enq'd tx packets. Just makes sure to jump start tx */
-       if (!pktq_empty(&wlc->active_queue->q))
-               wlc_send_q(wlc, wlc->active_queue);
+       return 0;
+}
+
+void wlc_tbtt(struct wlc_info *wlc, d11regs_t *regs)
+{
+       struct wlc_bsscfg *cfg = wlc->cfg;
 
-       ASSERT(wlc_ps_check(wlc));
+       if (!cfg->BSS) {
+               /* DirFrmQ is now valid...defer setting until end of ATIM window */
+               wlc->qvalid |= MCMD_DIRFRMQVAL;
+       }
 }
 
 static void wlc_war16165(struct wlc_info *wlc, bool tx)
@@ -6546,7 +4261,7 @@ static void wlc_war16165(struct wlc_info *wlc, bool tx)
 
 /* process an individual tx_status_t */
 /* WLC_HIGH_API */
-bool BCMFASTPATH
+bool
 wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
 {
        struct sk_buff *p;
@@ -6572,16 +4287,12 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
         */
        if (!(txs->status & TX_STATUS_AMPDU)
            && (txs->status & TX_STATUS_INTERMEDIATE)) {
-               WLCNTADD(wlc->pub->_cnt->txnoack,
-                        ((txs->
-                          status & TX_STATUS_FRM_RTX_MASK) >>
-                         TX_STATUS_FRM_RTX_SHIFT));
-               WL_ERROR("%s: INTERMEDIATE but not AMPDU\n", __func__);
+               wiphy_err(wlc->wiphy, "%s: INTERMEDIATE but not AMPDU\n",
+                         __func__);
                return false;
        }
 
        queue = txs->frameid & TXFID_QUEUE_MASK;
-       ASSERT(queue < NFIFO);
        if (queue >= NFIFO) {
                p = NULL;
                goto fatal;
@@ -6598,41 +4309,31 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
 
        if (txs->phyerr) {
                if (WL_ERROR_ON()) {
-                       WL_ERROR("phyerr 0x%x, rate 0x%x\n",
-                                txs->phyerr, txh->MainRates);
+                       wiphy_err(wlc->wiphy, "phyerr 0x%x, rate 0x%x\n",
+                                 txs->phyerr, txh->MainRates);
                        wlc_print_txdesc(txh);
                }
                wlc_print_txstatus(txs);
        }
 
-       ASSERT(txs->frameid == cpu_to_le16(txh->TxFrameID));
        if (txs->frameid != cpu_to_le16(txh->TxFrameID))
                goto fatal;
-
        tx_info = IEEE80211_SKB_CB(p);
        h = (struct ieee80211_hdr *)((u8 *) (txh + 1) + D11_PHY_HDR_LEN);
 
        if (tx_info->control.sta)
                scb = (struct scb *)tx_info->control.sta->drv_priv;
 
-       if (N_ENAB(wlc->pub)) {
-               u8 *plcp = (u8 *) (txh + 1);
-               if (PLCP3_ISSGI(plcp[3]))
-                       wlc->pub->_cnt->txmpdu_sgi++;
-               if (PLCP3_ISSTBC(plcp[3]))
-                       wlc->pub->_cnt->txmpdu_stbc++;
-       }
-
        if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
-               ASSERT((mcl & TXC_AMPDU_MASK) != TXC_AMPDU_NONE);
                wlc_ampdu_dotxstatus(wlc->ampdu, scb, p, txs);
                return false;
        }
 
        supr_status = txs->status & TX_STATUS_SUPR_MASK;
        if (supr_status == TX_STATUS_SUPR_BADCH)
-               WL_NONE("%s: Pkt tx suppressed, possibly channel %d\n",
-                       __func__, CHSPEC_CHANNEL(wlc->default_bss->chanspec));
+               BCMMSG(wlc->wiphy,
+                      "%s: Pkt tx suppressed, possibly channel %d\n",
+                      __func__, CHSPEC_CHANNEL(wlc->default_bss->chanspec));
 
        tx_rts = cpu_to_le16(txh->MacTxControlLow) & TXC_SENDRTS;
        tx_frame_count =
@@ -6643,7 +4344,7 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
        lastframe = !ieee80211_has_morefrags(h->frame_control);
 
        if (!lastframe) {
-               WL_ERROR("Not last frame!\n");
+               wiphy_err(wlc->wiphy, "Not last frame!\n");
        } else {
                u16 sfbl, lfbl;
                ieee80211_tx_info_clear_status(tx_info);
@@ -6679,7 +4380,7 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
                        tx_info->flags |= IEEE80211_TX_STAT_ACK;
        }
 
-       totlen = pkttotlen(p);
+       totlen = brcmu_pkttotlen(p);
        free_pdu = true;
 
        wlc_txfifo_complete(wlc, queue, 1);
@@ -6687,132 +4388,44 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
        if (lastframe) {
                p->next = NULL;
                p->prev = NULL;
-               wlc->txretried = 0;
                /* remove PLCP & Broadcom tx descriptor header */
                skb_pull(p, D11_PHY_HDR_LEN);
                skb_pull(p, D11_TXH_LEN);
                ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, p);
-               wlc->pub->_cnt->ieee_tx_status++;
        } else {
-               WL_ERROR("%s: Not last frame => not calling tx_status\n",
-                        __func__);
+               wiphy_err(wlc->wiphy, "%s: Not last frame => not calling "
+                         "tx_status\n", __func__);
        }
 
        return false;
 
  fatal:
-       ASSERT(0);
        if (p)
-               pkt_buf_free_skb(p);
+               brcmu_pkt_buf_free_skb(p);
 
        return true;
 
 }
 
-void BCMFASTPATH
+void
 wlc_txfifo_complete(struct wlc_info *wlc, uint fifo, s8 txpktpend)
 {
        TXPKTPENDDEC(wlc, fifo, txpktpend);
-       WL_TRACE("wlc_txfifo_complete, pktpend dec %d to %d\n",
-                txpktpend, TXPKTPENDGET(wlc, fifo));
+       BCMMSG(wlc->wiphy, "pktpend dec %d to %d\n", txpktpend,
+               TXPKTPENDGET(wlc, fifo));
 
        /* There is more room; mark precedences related to this FIFO sendable */
        WLC_TX_FIFO_ENAB(wlc, fifo);
-       ASSERT(TXPKTPENDGET(wlc, fifo) >= 0);
-
-       if (!TXPKTPENDTOT(wlc)) {
-               if (wlc->block_datafifo & DATA_BLOCK_TX_SUPR)
-                       wlc_bsscfg_tx_check(wlc);
-       }
 
        /* Clear MHF2_TXBCMC_NOW flag if BCMC fifo has drained */
        if (AP_ENAB(wlc->pub) &&
-           wlc->bcmcfifo_drain && !TXPKTPENDGET(wlc, TX_BCMC_FIFO)) {
-               wlc->bcmcfifo_drain = false;
+           !TXPKTPENDGET(wlc, TX_BCMC_FIFO)) {
                wlc_mhf(wlc, MHF2, MHF2_TXBCMC_NOW, 0, WLC_BAND_AUTO);
        }
 
        /* figure out which bsscfg is being worked on... */
 }
 
-/* Given the beacon interval in kus, and a 64 bit TSF in us,
- * return the offset (in us) of the TSF from the last TBTT
- */
-u32 wlc_calc_tbtt_offset(u32 bp, u32 tsf_h, u32 tsf_l)
-{
-       u32 k, btklo, btkhi, offset;
-
-       /* TBTT is always an even multiple of the beacon_interval,
-        * so the TBTT less than or equal to the beacon timestamp is
-        * the beacon timestamp minus the beacon timestamp modulo
-        * the beacon interval.
-        *
-        * TBTT = BT - (BT % BIu)
-        *      = (BTk - (BTk % BP)) * 2^10
-        *
-        * BT = beacon timestamp (usec, 64bits)
-        * BTk = beacon timestamp (Kusec, 54bits)
-        * BP = beacon interval (Kusec, 16bits)
-        * BIu = BP * 2^10 = beacon interval (usec, 26bits)
-        *
-        * To keep the calculations in u32s, the modulo operation
-        * on the high part of BT needs to be done in parts using the
-        * relations:
-        * X*Y mod Z = ((X mod Z) * (Y mod Z)) mod Z
-        * and
-        * (X + Y) mod Z = ((X mod Z) + (Y mod Z)) mod Z
-        *
-        * So, if BTk[n] = u16 n [0,3] of BTk.
-        * BTk % BP = SUM((BTk[n] * 2^16n) % BP , 0<=n<4) % BP
-        * and the SUM term can be broken down:
-        * (BTk[n] *     2^16n)    % BP
-        * (BTk[n] * (2^16n % BP)) % BP
-        *
-        * Create a set of power of 2 mod BP constants:
-        * K[n] = 2^(16n) % BP
-        *      = (K[n-1] * 2^16) % BP
-        * K[2] = 2^32 % BP = ((2^16 % BP) * 2^16) % BP
-        *
-        * BTk % BP = BTk[0-1] % BP +
-        *            (BTk[2] * K[2]) % BP +
-        *            (BTk[3] * K[3]) % BP
-        *
-        * Since K[n] < 2^16 and BTk[n] is < 2^16, then BTk[n] * K[n] < 2^32
-        */
-
-       /* BTk = BT >> 10, btklo = BTk[0-3], bkthi = BTk[4-6] */
-       btklo = (tsf_h << 22) | (tsf_l >> 10);
-       btkhi = tsf_h >> 10;
-
-       /* offset = BTk % BP */
-       offset = btklo % bp;
-
-       /* K[2] = ((2^16 % BP) * 2^16) % BP */
-       k = (u32) (1 << 16) % bp;
-       k = (u32) (k * 1 << 16) % (u32) bp;
-
-       /* offset += (BTk[2] * K[2]) % BP */
-       offset += ((btkhi & 0xffff) * k) % bp;
-
-       /* BTk[3] */
-       btkhi = btkhi >> 16;
-
-       /* k[3] = (K[2] * 2^16) % BP */
-       k = (k << 16) % bp;
-
-       /* offset += (BTk[3] * K[3]) % BP */
-       offset += ((btkhi & 0xffff) * k) % bp;
-
-       offset = offset % bp;
-
-       /* convert offset from kus to us by shifting up 10 bits and
-        * add in the low 10 bits of tsf that we ignored
-        */
-       offset = (offset << 10) + (tsf_l & 0x3FF);
-
-       return offset;
-}
-
 /* Update beacon listen interval in shared memory */
 void wlc_bcn_li_upd(struct wlc_info *wlc)
 {
@@ -6827,25 +4440,56 @@ void wlc_bcn_li_upd(struct wlc_info *wlc)
                              (wlc->bcn_li_dtim << 8) | wlc->bcn_li_bcn);
 }
 
+/*
+ * recover 64bit TSF value from the 16bit TSF value in the rx header
+ * given the assumption that the TSF passed in header is within 65ms
+ * of the current tsf.
+ *
+ * 6       5       4       4       3       2       1
+ * 3.......6.......8.......0.......2.......4.......6.......8......0
+ * |<---------- tsf_h ----------->||<--- tsf_l -->||<-RxTSFTime ->|
+ *
+ * The RxTSFTime are the lowest 16 bits and provided by the ucode. The
+ * tsf_l is filled in by wlc_bmac_recv, which is done earlier in the
+ * receive call sequence after rx interrupt. Only the higher 16 bits
+ * are used. Finally, the tsf_h is read from the tsf register.
+ */
+static u64 wlc_recover_tsf64(struct wlc_info *wlc, struct wlc_d11rxhdr *rxh)
+{
+       u32 tsf_h, tsf_l;
+       u16 rx_tsf_0_15, rx_tsf_16_31;
+
+       wlc_bmac_read_tsf(wlc->hw, &tsf_l, &tsf_h);
+
+       rx_tsf_16_31 = (u16)(tsf_l >> 16);
+       rx_tsf_0_15 = rxh->rxhdr.RxTSFTime;
+
+       /*
+        * a greater tsf time indicates the low 16 bits of
+        * tsf_l wrapped, so decrement the high 16 bits.
+        */
+       if ((u16)tsf_l < rx_tsf_0_15) {
+               rx_tsf_16_31 -= 1;
+               if (rx_tsf_16_31 == 0xffff)
+                       tsf_h -= 1;
+       }
+
+       return ((u64)tsf_h << 32) | (((u32)rx_tsf_16_31 << 16) + rx_tsf_0_15);
+}
+
 static void
 prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
                     struct ieee80211_rx_status *rx_status)
 {
-       u32 tsf_l, tsf_h;
        wlc_d11rxhdr_t *wlc_rxh = (wlc_d11rxhdr_t *) rxh;
        int preamble;
        int channel;
        ratespec_t rspec;
        unsigned char *plcp;
 
-#if 0
-       /* Clearly, this is bogus -- reading the TSF now is wrong */
-       wlc_read_tsf(wlc, &tsf_l, &tsf_h);      /* mactime */
-       rx_status->mactime = tsf_h;
-       rx_status->mactime <<= 32;
-       rx_status->mactime |= tsf_l;
-       rx_status->flag |= RX_FLAG_MACTIME_MPDU; /* clearly wrong */
-#endif
+       /* fill in TSF and flag its presence */
+       rx_status->mactime = wlc_recover_tsf64(wlc, wlc_rxh);
+       rx_status->flag |= RX_FLAG_MACTIME_MPDU;
 
        channel = WLC_CHAN_CHANNEL(rxh->RxChan);
 
@@ -6912,7 +4556,7 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
                        rx_status->rate_idx = 11;
                        break;
                default:
-                       WL_ERROR("%s: Unknown rate\n", __func__);
+                       wiphy_err(wlc->wiphy, "%s: Unknown rate\n", __func__);
                }
 
                /* Determine short preamble and rate_idx */
@@ -6923,7 +4567,8 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
                } else if (IS_OFDM(rspec)) {
                        rx_status->flag |= RX_FLAG_SHORTPRE;
                } else {
-                       WL_ERROR("%s: Unknown modulation\n", __func__);
+                       wiphy_err(wlc->wiphy, "%s: Unknown modulation\n",
+                                 __func__);
                }
        }
 
@@ -6932,11 +4577,13 @@ prep_mac80211_status(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p,
 
        if (rxh->RxStatus1 & RXS_DECERR) {
                rx_status->flag |= RX_FLAG_FAILED_PLCP_CRC;
-               WL_ERROR("%s:  RX_FLAG_FAILED_PLCP_CRC\n", __func__);
+               wiphy_err(wlc->wiphy, "%s:  RX_FLAG_FAILED_PLCP_CRC\n",
+                         __func__);
        }
        if (rxh->RxStatus1 & RXS_FCSERR) {
                rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
-               WL_ERROR("%s:  RX_FLAG_FAILED_FCS_CRC\n", __func__);
+               wiphy_err(wlc->wiphy, "%s:  RX_FLAG_FAILED_FCS_CRC\n",
+                         __func__);
        }
 }
 
@@ -6945,14 +4592,6 @@ wlc_recvctl(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p)
 {
        int len_mpdu;
        struct ieee80211_rx_status rx_status;
-#if defined(BCMDBG)
-       struct sk_buff *skb = p;
-#endif                         /* BCMDBG */
-       /* Todo:
-        * Cache plcp for first MPDU of AMPD and use chacched version for INTERMEDIATE.
-        * Test for INTERMEDIATE  like so:
-        * if (!(plcp[0] | plcp[1] | plcp[2]))
-        */
 
        memset(&rx_status, 0, sizeof(rx_status));
        prep_mac80211_status(wlc, rxh, p, &rx_status);
@@ -6962,54 +4601,31 @@ wlc_recvctl(struct wlc_info *wlc, d11rxhdr_t *rxh, struct sk_buff *p)
        skb_pull(p, D11_PHY_HDR_LEN);
        __skb_trim(p, len_mpdu);
 
-       ASSERT(!(p->next));
-       ASSERT(!(p->prev));
-
-       ASSERT(IS_ALIGNED((unsigned long)skb->data, 2));
-
        memcpy(IEEE80211_SKB_RXCB(p), &rx_status, sizeof(rx_status));
        ieee80211_rx_irqsafe(wlc->pub->ieee_hw, p);
-
-       wlc->pub->_cnt->ieee_rx++;
        return;
 }
 
-void wlc_bss_list_free(struct wlc_info *wlc, struct wlc_bss_list *bss_list)
-{
-       uint index;
-
-       if (!bss_list) {
-               WL_ERROR("%s: Attempting to free NULL list\n", __func__);
-               return;
-       }
-       /* inspect all BSS descriptor */
-       for (index = 0; index < bss_list->count; index++) {
-               kfree(bss_list->ptrs[index]);
-               bss_list->ptrs[index] = NULL;
-       }
-       bss_list->count = 0;
-}
-
 /* Process received frames */
 /*
  * Return true if more frames need to be processed. false otherwise.
  * Param 'bound' indicates max. # frames to process before break out.
  */
 /* WLC_HIGH_API */
-void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
+void wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
 {
        d11rxhdr_t *rxh;
        struct ieee80211_hdr *h;
        uint len;
        bool is_amsdu;
 
-       WL_TRACE("wl%d: wlc_recv\n", wlc->pub->unit);
+       BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
 
        /* frame starts with rxhdr */
        rxh = (d11rxhdr_t *) (p->data);
 
        /* strip off rxhdr */
-       skb_pull(p, wlc->hwrxoff);
+       skb_pull(p, WL_HWRXOFF);
 
        /* fixup rx header endianness */
        rxh->RxFrameSize = le16_to_cpu(rxh->RxFrameSize);
@@ -7027,9 +4643,8 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
        /* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU subframes */
        if (rxh->RxStatus1 & RXS_PBPRES) {
                if (p->len < 2) {
-                       wlc->pub->_cnt->rxrunt++;
-                       WL_ERROR("wl%d: wlc_recv: rcvd runt of len %d\n",
-                                wlc->pub->unit, p->len);
+                       wiphy_err(wlc->wiphy, "wl%d: wlc_recv: rcvd runt of "
+                                 "len %d\n", wlc->pub->unit, p->len);
                        goto toss;
                }
                skb_pull(p, 2);
@@ -7040,17 +4655,17 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
 
        if (rxh->RxStatus1 & RXS_FCSERR) {
                if (wlc->pub->mac80211_state & MAC80211_PROMISC_BCNS) {
-                       WL_ERROR("FCSERR while scanning******* - tossing\n");
+                       wiphy_err(wlc->wiphy, "FCSERR while scanning******* -"
+                                 " tossing\n");
                        goto toss;
                } else {
-                       WL_ERROR("RCSERR!!!\n");
+                       wiphy_err(wlc->wiphy, "RCSERR!!!\n");
                        goto toss;
                }
        }
 
        /* check received pkt has at least frame control field */
        if (len < D11_PHY_HDR_LEN + sizeof(h->frame_control)) {
-               wlc->pub->_cnt->rxrunt++;
                goto toss;
        }
 
@@ -7064,13 +4679,12 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
                    ieee80211_is_mgmt(h->frame_control)) {
                        if ((is_zero_ether_addr(h->addr2) ||
                             is_multicast_ether_addr(h->addr2))) {
-                               WL_ERROR("wl%d: %s: dropping a frame with "
-                                        "invalid src mac address, a2: %pM\n",
+                               wiphy_err(wlc->wiphy, "wl%d: %s: dropping a "
+                                         "frame with invalid src mac address,"
+                                         " a2: %pM\n",
                                         wlc->pub->unit, __func__, h->addr2);
-                               wlc->pub->_cnt->rxbadsrcmac++;
                                goto toss;
                        }
-                       wlc->pub->_cnt->rxfrag++;
                }
        }
 
@@ -7085,7 +4699,7 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
        return;
 
  toss:
-       pkt_buf_free_skb(p);
+       brcmu_pkt_buf_free_skb(p);
 }
 
 /* calculate frame duration for Mixed-mode L-SIG spoofing, return
@@ -7094,12 +4708,12 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p)
  * Formula given by HT PHY Spec v 1.13
  *   len = 3(nsyms + nstream + 3) - 3
  */
-u16 BCMFASTPATH
+u16
 wlc_calc_lsig_len(struct wlc_info *wlc, ratespec_t ratespec, uint mac_len)
 {
        uint nsyms, len = 0, kNdps;
 
-       WL_TRACE("wl%d: wlc_calc_lsig_len: rate %d, len%d\n",
+       BCMMSG(wlc->wiphy, "wl%d: rate %d, len%d\n",
                 wlc->pub->unit, RSPEC2RATE(ratespec), mac_len);
 
        if (IS_MCS(ratespec)) {
@@ -7107,7 +4721,6 @@ wlc_calc_lsig_len(struct wlc_info *wlc, ratespec_t ratespec, uint mac_len)
                /* MCS_TXS(mcs) returns num tx streams - 1 */
                int tot_streams = (MCS_TXS(mcs) + 1) + RSPEC_STC(ratespec);
 
-               ASSERT(WLC_PHY_11N_CAP(wlc->band));
                /* the payload duration calculation matches that of regular ofdm */
                /* 1000Ndbps = kbps * 4 */
                kNdps =
@@ -7135,7 +4748,7 @@ wlc_calc_lsig_len(struct wlc_info *wlc, ratespec_t ratespec, uint mac_len)
 }
 
 /* calculate frame duration of a given rate and length, return time in usec unit */
-uint BCMFASTPATH
+uint
 wlc_calc_frame_time(struct wlc_info *wlc, ratespec_t ratespec, u8 preamble_type,
                    uint mac_len)
 {
@@ -7143,19 +4756,17 @@ wlc_calc_frame_time(struct wlc_info *wlc, ratespec_t ratespec, u8 preamble_type,
        uint rate = RSPEC2RATE(ratespec);
 
        if (rate == 0) {
-               ASSERT(0);
-               WL_ERROR("wl%d: WAR: using rate of 1 mbps\n", wlc->pub->unit);
+               wiphy_err(wlc->wiphy, "wl%d: WAR: using rate of 1 mbps\n",
+                         wlc->pub->unit);
                rate = WLC_RATE_1M;
        }
 
-       WL_TRACE("wl%d: wlc_calc_frame_time: rspec 0x%x, preamble_type %d, len%d\n",
+       BCMMSG(wlc->wiphy, "wl%d: rspec 0x%x, preamble_type %d, len%d\n",
                 wlc->pub->unit, ratespec, preamble_type, mac_len);
 
        if (IS_MCS(ratespec)) {
                uint mcs = ratespec & RSPEC_RATE_MASK;
                int tot_streams = MCS_TXS(mcs) + RSPEC_STC(ratespec);
-               ASSERT(WLC_PHY_11N_CAP(wlc->band));
-               ASSERT(WLC_IS_MIMO_PREAMBLE(preamble_type));
 
                dur = PREN_PREAMBLE + (tot_streams * PREN_PREAMBLE_EXT);
                if (preamble_type == WLC_MM_PREAMBLE)
@@ -7213,13 +4824,12 @@ wlc_calc_frame_len(struct wlc_info *wlc, ratespec_t ratespec, u8 preamble_type,
        uint nsyms, mac_len, Ndps, kNdps;
        uint rate = RSPEC2RATE(ratespec);
 
-       WL_TRACE("wl%d: wlc_calc_frame_len: rspec 0x%x, preamble_type %d, dur %d\n",
+       BCMMSG(wlc->wiphy, "wl%d: rspec 0x%x, preamble_type %d, dur %d\n",
                 wlc->pub->unit, ratespec, preamble_type, dur);
 
        if (IS_MCS(ratespec)) {
                uint mcs = ratespec & RSPEC_RATE_MASK;
                int tot_streams = MCS_TXS(mcs) + RSPEC_STC(ratespec);
-               ASSERT(WLC_PHY_11N_CAP(wlc->band));
                dur -= PREN_PREAMBLE + (tot_streams * PREN_PREAMBLE_EXT);
                /* payload calculation matches that of regular ofdm */
                if (BAND_2G(wlc->band->bandtype))
@@ -7256,33 +4866,29 @@ wlc_calc_frame_len(struct wlc_info *wlc, ratespec_t ratespec, u8 preamble_type,
 static uint
 wlc_calc_ba_time(struct wlc_info *wlc, ratespec_t rspec, u8 preamble_type)
 {
-       WL_TRACE("wl%d: wlc_calc_ba_time: rspec 0x%x, preamble_type %d\n",
-                wlc->pub->unit, rspec, preamble_type);
+       BCMMSG(wlc->wiphy, "wl%d: rspec 0x%x, "
+                "preamble_type %d\n", wlc->pub->unit, rspec, preamble_type);
        /* Spec 9.6: ack rate is the highest rate in BSSBasicRateSet that is less than
         * or equal to the rate of the immediately previous frame in the FES
         */
        rspec = WLC_BASIC_RATE(wlc, rspec);
-       ASSERT(VALID_RATE_DBG(wlc, rspec));
-
        /* BA len == 32 == 16(ctl hdr) + 4(ba len) + 8(bitmap) + 4(fcs) */
        return wlc_calc_frame_time(wlc, rspec, preamble_type,
                                   (DOT11_BA_LEN + DOT11_BA_BITMAP_LEN +
                                    FCS_LEN));
 }
 
-static uint BCMFASTPATH
+static uint
 wlc_calc_ack_time(struct wlc_info *wlc, ratespec_t rspec, u8 preamble_type)
 {
        uint dur = 0;
 
-       WL_TRACE("wl%d: wlc_calc_ack_time: rspec 0x%x, preamble_type %d\n",
-                wlc->pub->unit, rspec, preamble_type);
+       BCMMSG(wlc->wiphy, "wl%d: rspec 0x%x, preamble_type %d\n",
+               wlc->pub->unit, rspec, preamble_type);
        /* Spec 9.6: ack rate is the highest rate in BSSBasicRateSet that is less than
         * or equal to the rate of the immediately previous frame in the FES
         */
        rspec = WLC_BASIC_RATE(wlc, rspec);
-       ASSERT(VALID_RATE_DBG(wlc, rspec));
-
        /* ACK frame len == 14 == 2(fc) + 2(dur) + 6(ra) + 4(fcs) */
        dur =
            wlc_calc_frame_time(wlc, rspec, preamble_type,
@@ -7293,8 +4899,8 @@ wlc_calc_ack_time(struct wlc_info *wlc, ratespec_t rspec, u8 preamble_type)
 static uint
 wlc_calc_cts_time(struct wlc_info *wlc, ratespec_t rspec, u8 preamble_type)
 {
-       WL_TRACE("wl%d: wlc_calc_cts_time: ratespec 0x%x, preamble_type %d\n",
-                wlc->pub->unit, rspec, preamble_type);
+       BCMMSG(wlc->wiphy, "wl%d: ratespec 0x%x, preamble_type %d\n",
+               wlc->pub->unit, rspec, preamble_type);
        return wlc_calc_ack_time(wlc, rspec, preamble_type);
 }
 
@@ -7320,11 +4926,12 @@ void wlc_rate_lookup_init(struct wlc_info *wlc, wlc_rateset_t *rateset)
                        continue;
 
                /* mask off basic bit */
-               rate = (rateset->rates[i] & RATE_MASK);
+               rate = (rateset->rates[i] & WLC_RATE_MASK);
 
                if (rate > WLC_MAXRATE) {
-                       WL_ERROR("wlc_rate_lookup_init: invalid rate 0x%X in rate set\n",
-                                rateset->rates[i]);
+                       wiphy_err(wlc->wiphy, "wlc_rate_lookup_init: invalid "
+                                 "rate 0x%X in rate set\n",
+                                 rateset->rates[i]);
                        continue;
                }
 
@@ -7347,7 +4954,6 @@ void wlc_rate_lookup_init(struct wlc_info *wlc, wlc_rateset_t *rateset)
 
        for (i = 0; i < wlc->band->hw_rateset.count; i++) {
                rate = wlc->band->hw_rateset.rates[i];
-               ASSERT(rate <= WLC_MAXRATE);
 
                if (br[rate] != 0) {
                        /* This rate is a basic rate.
@@ -7406,8 +5012,8 @@ static void wlc_write_rate_shm(struct wlc_info *wlc, u8 rate, u8 basic_rate)
         * for a given rate, the LS-nibble of the PLCP SIGNAL field is
         * the index into the rate table.
         */
-       phy_rate = rate_info[rate] & RATE_MASK;
-       basic_phy_rate = rate_info[basic_rate] & RATE_MASK;
+       phy_rate = rate_info[rate] & WLC_RATE_MASK;
+       basic_phy_rate = rate_info[basic_rate] & WLC_RATE_MASK;
        index = phy_rate & 0xf;
        basic_index = basic_phy_rate & 0xf;
 
@@ -7447,14 +5053,13 @@ void wlc_set_ratetable(struct wlc_info *wlc)
        uint i;
 
        rs_dflt = wlc_rateset_get_hwrs(wlc);
-       ASSERT(rs_dflt != NULL);
 
        wlc_rateset_copy(rs_dflt, &rs);
        wlc_rateset_mcs_upd(&rs, wlc->stf->txstreams);
 
        /* walk the phy rate table and update SHM basic rate lookup table */
        for (i = 0; i < rs.count; i++) {
-               rate = rs.rates[i] & RATE_MASK;
+               rate = rs.rates[i] & WLC_RATE_MASK;
 
                /* for a given rate WLC_BASIC_RATE returns the rate at
                 * which a response ACK/CTS should be sent.
@@ -7464,7 +5069,7 @@ void wlc_set_ratetable(struct wlc_info *wlc)
                        /* This should only happen if we are using a
                         * restricted rateset.
                         */
-                       basic_rate = rs.rates[0] & RATE_MASK;
+                       basic_rate = rs.rates[0] & WLC_RATE_MASK;
                }
 
                wlc_write_rate_shm(wlc, rate, basic_rate);
@@ -7503,8 +5108,8 @@ bool wlc_valid_rate(struct wlc_info *wlc, ratespec_t rspec, int band,
                        return true;
  error:
        if (verbose) {
-               WL_ERROR("wl%d: wlc_valid_rate: rate spec 0x%x not in hw_rateset\n",
-                        wlc->pub->unit, rspec);
+               wiphy_err(wlc->wiphy, "wl%d: wlc_valid_rate: rate spec 0x%x "
+                         "not in hw_rateset\n", wlc->pub->unit, rspec);
        }
 
        return false;
@@ -7526,15 +5131,12 @@ static void wlc_update_mimo_band_bwcap(struct wlc_info *wlc, u8 bwcap)
                        else
                                band->mimo_cap_40 = false;
                } else {
-                       ASSERT(band->bandtype == WLC_BAND_2G);
                        if (bwcap == WLC_N_BW_40ALL)
                                band->mimo_cap_40 = true;
                        else
                                band->mimo_cap_40 = false;
                }
        }
-
-       wlc->mimo_band_bwcap = bwcap;
 }
 
 void wlc_mod_prb_rsp_rate_table(struct wlc_info *wlc, uint frame_len)
@@ -7550,14 +5152,13 @@ void wlc_mod_prb_rsp_rate_table(struct wlc_info *wlc, uint frame_len)
        sifs = SIFS(wlc->band);
 
        rs_dflt = wlc_rateset_get_hwrs(wlc);
-       ASSERT(rs_dflt != NULL);
 
        wlc_rateset_copy(rs_dflt, &rs);
        wlc_rateset_mcs_upd(&rs, wlc->stf->txstreams);
 
        /* walk the phy rate table and update MAC core SHM basic rate table entries */
        for (i = 0; i < rs.count; i++) {
-               rate = rs.rates[i] & RATE_MASK;
+               rate = rs.rates[i] & WLC_RATE_MASK;
 
                entry_ptr = wlc_rate_shm_offset(wlc, rate);
 
@@ -7579,41 +5180,6 @@ void wlc_mod_prb_rsp_rate_table(struct wlc_info *wlc, uint frame_len)
        }
 }
 
-u16
-wlc_compute_bcntsfoff(struct wlc_info *wlc, ratespec_t rspec,
-                     bool short_preamble, bool phydelay)
-{
-       uint bcntsfoff = 0;
-
-       if (IS_MCS(rspec)) {
-               WL_ERROR("wl%d: recd beacon with mcs rate; rspec 0x%x\n",
-                        wlc->pub->unit, rspec);
-       } else if (IS_OFDM(rspec)) {
-               /* tx delay from MAC through phy to air (2.1 usec) +
-                * phy header time (preamble + PLCP SIGNAL == 20 usec) +
-                * PLCP SERVICE + MAC header time (SERVICE + FC + DUR + A1 + A2 + A3 + SEQ == 26
-                * bytes at beacon rate)
-                */
-               bcntsfoff += phydelay ? D11A_PHY_TX_DELAY : 0;
-               bcntsfoff += APHY_PREAMBLE_TIME + APHY_SIGNAL_TIME;
-               bcntsfoff +=
-                   wlc_compute_airtime(wlc, rspec,
-                                       APHY_SERVICE_NBITS / 8 +
-                                       DOT11_MAC_HDR_LEN);
-       } else {
-               /* tx delay from MAC through phy to air (3.4 usec) +
-                * phy header time (long preamble + PLCP == 192 usec) +
-                * MAC header time (FC + DUR + A1 + A2 + A3 + SEQ == 24 bytes at beacon rate)
-                */
-               bcntsfoff += phydelay ? D11B_PHY_TX_DELAY : 0;
-               bcntsfoff +=
-                   short_preamble ? D11B_PHY_SPREHDR_TIME :
-                   D11B_PHY_LPREHDR_TIME;
-               bcntsfoff += wlc_compute_airtime(wlc, rspec, DOT11_MAC_HDR_LEN);
-       }
-       return (u16) (bcntsfoff);
-}
-
 /*     Max buffering needed for beacon template/prb resp template is 142 bytes.
  *
  *     PLCP header is 6 bytes.
@@ -7635,10 +5201,6 @@ wlc_bcn_prb_template(struct wlc_info *wlc, u16 type, ratespec_t bcn_rspec,
        struct ieee80211_mgmt *h;
        int hdr_len, body_len;
 
-       ASSERT(*len >= 142);
-       ASSERT(type == IEEE80211_STYPE_BEACON ||
-              type == IEEE80211_STYPE_PROBE_RESP);
-
        if (MBSS_BCN_ENAB(cfg) && type == IEEE80211_STYPE_BEACON)
                hdr_len = DOT11_MAC_HDR_LEN;
        else
@@ -7730,12 +5292,6 @@ void wlc_bss_update_beacon(struct wlc_info *wlc, struct wlc_bsscfg *cfg)
 
                wlc->bcn_rspec =
                    wlc_lowest_basic_rspec(wlc, &cfg->current_bss->rateset);
-               ASSERT(wlc_valid_rate
-                      (wlc, wlc->bcn_rspec,
-                       CHSPEC_IS2G(cfg->current_bss->
-                                   chanspec) ? WLC_BAND_2G : WLC_BAND_5G,
-                       true));
-
                /* update the template and ucode shm */
                wlc_bcn_prb_template(wlc, IEEE80211_STYPE_BEACON,
                                     wlc->bcn_rspec, cfg, bcn, &len);
@@ -7825,7 +5381,7 @@ wlc_bss_update_probe_resp(struct wlc_info *wlc, struct wlc_bsscfg *cfg,
                if (suspend)
                        wlc_enable_mac(wlc);
        } else {                /* Generating probe resp in sw; update local template */
-               ASSERT(0 && "No software probe response support without MBSS");
+               /* error: No software probe response support without MBSS */
        }
 }
 
@@ -7837,11 +5393,8 @@ int wlc_prep_pdu(struct wlc_info *wlc, struct sk_buff *pdu, uint *fifop)
        struct ieee80211_hdr *h;
        struct scb *scb;
 
-       ASSERT(pdu);
        txh = (d11txh_t *) (pdu->data);
-       ASSERT(txh);
        h = (struct ieee80211_hdr *)((u8 *) (txh + 1) + D11_PHY_HDR_LEN);
-       ASSERT(h);
 
        /* get the pkt queue info. This was put at wlc_sendctl or wlc_send for PDU */
        fifo = le16_to_cpu(txh->TxFrameID) & TXFID_QUEUE_MASK;
@@ -7854,12 +5407,8 @@ int wlc_prep_pdu(struct wlc_info *wlc, struct sk_buff *pdu, uint *fifop)
        if (TXAVAIL(wlc, fifo) < MAX_DMA_SEGS) {
                /* Mark precedences related to this FIFO, unsendable */
                WLC_TX_FIFO_CLEAR(wlc, fifo);
-               return BCME_BUSY;
+               return -EBUSY;
        }
-
-       if (!ieee80211_is_data(txh->MacFrameControl))
-               wlc->pub->_cnt->txctl++;
-
        return 0;
 }
 
@@ -7881,47 +5430,10 @@ void wlc_bsscfg_reprate_init(struct wlc_bsscfg *bsscfg)
        memset((char *)bsscfg->txrspec, 0, sizeof(bsscfg->txrspec));
 }
 
-/* Retrieve a consolidated set of revision information,
- * typically for the WLC_GET_REVINFO ioctl
- */
-int wlc_get_revision_info(struct wlc_info *wlc, void *buf, uint len)
-{
-       wlc_rev_info_t *rinfo = (wlc_rev_info_t *) buf;
-
-       if (len < WL_REV_INFO_LEGACY_LENGTH)
-               return BCME_BUFTOOSHORT;
-
-       rinfo->vendorid = wlc->vendorid;
-       rinfo->deviceid = wlc->deviceid;
-       rinfo->radiorev = (wlc->band->radiorev << IDCODE_REV_SHIFT) |
-           (wlc->band->radioid << IDCODE_ID_SHIFT);
-       rinfo->chiprev = wlc->pub->sih->chiprev;
-       rinfo->corerev = wlc->pub->corerev;
-       rinfo->boardid = wlc->pub->sih->boardtype;
-       rinfo->boardvendor = wlc->pub->sih->boardvendor;
-       rinfo->boardrev = wlc->pub->boardrev;
-       rinfo->ucoderev = wlc->ucode_rev;
-       rinfo->driverrev = EPI_VERSION_NUM;
-       rinfo->bus = wlc->pub->sih->bustype;
-       rinfo->chipnum = wlc->pub->sih->chip;
-
-       if (len >= (offsetof(wlc_rev_info_t, chippkg))) {
-               rinfo->phytype = wlc->band->phytype;
-               rinfo->phyrev = wlc->band->phyrev;
-               rinfo->anarev = 0;      /* obsolete stuff, suppress */
-       }
-
-       if (len >= sizeof(*rinfo)) {
-               rinfo->chippkg = wlc->pub->sih->chippkg;
-       }
-
-       return BCME_OK;
-}
-
 void wlc_default_rateset(struct wlc_info *wlc, wlc_rateset_t *rs)
 {
        wlc_rateset_default(rs, NULL, wlc->band->phytype, wlc->band->bandtype,
-                           false, RATE_MASK_FULL, (bool) N_ENAB(wlc->pub),
+                           false, WLC_RATE_MASK_FULL, (bool) N_ENAB(wlc->pub),
                            CHSPEC_WLC_BW(wlc->default_bss->chanspec),
                            wlc->stf->txstreams);
 }
@@ -7943,8 +5455,6 @@ static void wlc_bss_default_init(struct wlc_info *wlc)
         * starting from the 2G channels
         */
        chanspec = CH20MHZ_CHSPEC(1);
-       ASSERT(chanspec != INVCHANSPEC);
-
        wlc->home_chanspec = bi->chanspec = chanspec;
 
        /* find the band of our default channel */
@@ -7954,24 +5464,13 @@ static void wlc_bss_default_init(struct wlc_info *wlc)
 
        /* init bss rates to the band specific default rate set */
        wlc_rateset_default(&bi->rateset, NULL, band->phytype, band->bandtype,
-                           false, RATE_MASK_FULL, (bool) N_ENAB(wlc->pub),
+                           false, WLC_RATE_MASK_FULL, (bool) N_ENAB(wlc->pub),
                            CHSPEC_WLC_BW(chanspec), wlc->stf->txstreams);
 
        if (N_ENAB(wlc->pub))
                bi->flags |= WLC_BSS_HT;
 }
 
-void
-wlc_uint64_sub(u32 *a_high, u32 *a_low, u32 b_high, u32 b_low)
-{
-       if (b_low > *a_low) {
-               /* low half needs a carry */
-               b_high += 1;
-       }
-       *a_low -= b_low;
-       *a_high -= b_high;
-}
-
 static ratespec_t
 mac80211_wlc_set_nrate(struct wlc_info *wlc, struct wlcband *cur_band,
                       u32 int_val)
@@ -7993,9 +5492,9 @@ mac80211_wlc_set_nrate(struct wlc_info *wlc, struct wlcband *cur_band,
        if (N_ENAB(wlc->pub) && ismcs) {
                /* mcs only allowed when nmode */
                if (stf > PHY_TXC1_MODE_SDM) {
-                       WL_ERROR("wl%d: %s: Invalid stf\n",
+                       wiphy_err(wlc->wiphy, "wl%d: %s: Invalid stf\n",
                                 WLCWLUNIT(wlc), __func__);
-                       bcmerror = BCME_RANGE;
+                       bcmerror = -EINVAL;
                        goto done;
                }
 
@@ -8004,17 +5503,18 @@ mac80211_wlc_set_nrate(struct wlc_info *wlc, struct wlcband *cur_band,
                        if (!CHSPEC_IS40(wlc->home_chanspec) ||
                            ((stf != PHY_TXC1_MODE_SISO)
                             && (stf != PHY_TXC1_MODE_CDD))) {
-                               WL_ERROR("wl%d: %s: Invalid mcs 32\n",
-                                        WLCWLUNIT(wlc), __func__);
-                               bcmerror = BCME_RANGE;
+                               wiphy_err(wlc->wiphy, "wl%d: %s: Invalid mcs "
+                                         "32\n", WLCWLUNIT(wlc), __func__);
+                               bcmerror = -EINVAL;
                                goto done;
                        }
                        /* mcs > 7 must use stf SDM */
                } else if (rate > HIGHEST_SINGLE_STREAM_MCS) {
                        /* mcs > 7 must use stf SDM */
                        if (stf != PHY_TXC1_MODE_SDM) {
-                               WL_TRACE("wl%d: %s: enabling SDM mode for mcs %d\n",
-                                        WLCWLUNIT(wlc), __func__, rate);
+                               BCMMSG(wlc->wiphy, "wl%d: enabling "
+                                        "SDM mode for mcs %d\n",
+                                        WLCWLUNIT(wlc), rate);
                                stf = PHY_TXC1_MODE_SDM;
                        }
                } else {
@@ -8022,38 +5522,38 @@ mac80211_wlc_set_nrate(struct wlc_info *wlc, struct wlcband *cur_band,
                        if ((stf > PHY_TXC1_MODE_STBC) ||
                            (!WLC_STBC_CAP_PHY(wlc)
                             && (stf == PHY_TXC1_MODE_STBC))) {
-                               WL_ERROR("wl%d: %s: Invalid STBC\n",
-                                        WLCWLUNIT(wlc), __func__);
-                               bcmerror = BCME_RANGE;
+                               wiphy_err(wlc->wiphy, "wl%d: %s: Invalid STBC"
+                                         "\n", WLCWLUNIT(wlc), __func__);
+                               bcmerror = -EINVAL;
                                goto done;
                        }
                }
        } else if (IS_OFDM(rate)) {
                if ((stf != PHY_TXC1_MODE_CDD) && (stf != PHY_TXC1_MODE_SISO)) {
-                       WL_ERROR("wl%d: %s: Invalid OFDM\n",
-                                WLCWLUNIT(wlc), __func__);
-                       bcmerror = BCME_RANGE;
+                       wiphy_err(wlc->wiphy, "wl%d: %s: Invalid OFDM\n",
+                                 WLCWLUNIT(wlc), __func__);
+                       bcmerror = -EINVAL;
                        goto done;
                }
        } else if (IS_CCK(rate)) {
                if ((cur_band->bandtype != WLC_BAND_2G)
                    || (stf != PHY_TXC1_MODE_SISO)) {
-                       WL_ERROR("wl%d: %s: Invalid CCK\n",
-                                WLCWLUNIT(wlc), __func__);
-                       bcmerror = BCME_RANGE;
+                       wiphy_err(wlc->wiphy, "wl%d: %s: Invalid CCK\n",
+                                 WLCWLUNIT(wlc), __func__);
+                       bcmerror = -EINVAL;
                        goto done;
                }
        } else {
-               WL_ERROR("wl%d: %s: Unknown rate type\n",
-                        WLCWLUNIT(wlc), __func__);
-               bcmerror = BCME_RANGE;
+               wiphy_err(wlc->wiphy, "wl%d: %s: Unknown rate type\n",
+                         WLCWLUNIT(wlc), __func__);
+               bcmerror = -EINVAL;
                goto done;
        }
        /* make sure multiple antennae are available for non-siso rates */
        if ((stf != PHY_TXC1_MODE_SISO) && (wlc->stf->txstreams == 1)) {
-               WL_ERROR("wl%d: %s: SISO antenna but !SISO request\n",
-                        WLCWLUNIT(wlc), __func__);
-               bcmerror = BCME_RANGE;
+               wiphy_err(wlc->wiphy, "wl%d: %s: SISO antenna but !SISO "
+                         "request\n", WLCWLUNIT(wlc), __func__);
+               bcmerror = -EINVAL;
                goto done;
        }
 
@@ -8082,8 +5582,7 @@ mac80211_wlc_set_nrate(struct wlc_info *wlc, struct wlcband *cur_band,
        }
 
        return rspec;
- done:
-       WL_ERROR("Hoark\n");
+done:
        return rate;
 }
 
@@ -8097,8 +5596,9 @@ wlc_duty_cycle_set(struct wlc_info *wlc, int duty_cycle, bool isOFDM,
            isOFDM ? M_TX_IDLE_BUSY_RATIO_X_16_OFDM :
            M_TX_IDLE_BUSY_RATIO_X_16_CCK;
        if (duty_cycle > 100 || duty_cycle < 0) {
-               WL_ERROR("wl%d:  duty cycle value off limit\n", wlc->pub->unit);
-               return BCME_RANGE;
+               wiphy_err(wlc->wiphy, "wl%d:  duty cycle value off limit\n",
+                         wlc->pub->unit);
+               return -EINVAL;
        }
        if (duty_cycle)
                idle_busy_ratio_x_16 = (100 - duty_cycle) * 16 / duty_cycle;
@@ -8111,7 +5611,7 @@ wlc_duty_cycle_set(struct wlc_info *wlc, int duty_cycle, bool isOFDM,
        else
                wlc->tx_duty_cycle_cck = (u16) duty_cycle;
 
-       return BCME_OK;
+       return 0;
 }
 
 /* Read a single u16 from shared memory.
@@ -8130,22 +5630,6 @@ void wlc_write_shm(struct wlc_info *wlc, uint offset, u16 v)
        wlc_bmac_write_shm(wlc->hw, offset, v);
 }
 
-/* Set a range of shared memory to a value.
- * SHM 'offset' needs to be an even address and
- * Range length 'len' must be an even number of bytes
- */
-void wlc_set_shm(struct wlc_info *wlc, uint offset, u16 v, int len)
-{
-       /* offset and len need to be even */
-       ASSERT((offset & 1) == 0);
-       ASSERT((len & 1) == 0);
-
-       if (len <= 0)
-               return;
-
-       wlc_bmac_set_shm(wlc->hw, offset, v, len);
-}
-
 /* Copy a buffer to shared memory.
  * SHM 'offset' needs to be an even address and
  * Buffer length 'len' must be an even number of bytes
@@ -8153,29 +5637,11 @@ void wlc_set_shm(struct wlc_info *wlc, uint offset, u16 v, int len)
 void wlc_copyto_shm(struct wlc_info *wlc, uint offset, const void *buf, int len)
 {
        /* offset and len need to be even */
-       ASSERT((offset & 1) == 0);
-       ASSERT((len & 1) == 0);
-
-       if (len <= 0)
+       if (len <= 0 || (offset & 1) || (len & 1))
                return;
-       wlc_bmac_copyto_objmem(wlc->hw, offset, buf, len, OBJADDR_SHM_SEL);
-
-}
-
-/* Copy from shared memory to a buffer.
- * SHM 'offset' needs to be an even address and
- * Buffer length 'len' must be an even number of bytes
- */
-void wlc_copyfrom_shm(struct wlc_info *wlc, uint offset, void *buf, int len)
-{
-       /* offset and len need to be even */
-       ASSERT((offset & 1) == 0);
-       ASSERT((len & 1) == 0);
 
-       if (len <= 0)
-               return;
+       wlc_bmac_copyto_objmem(wlc->hw, offset, buf, len, OBJADDR_SHM_SEL);
 
-       wlc_bmac_copyfrom_objmem(wlc->hw, offset, buf, len, OBJADDR_SHM_SEL);
 }
 
 /* wrapper BMAC functions to for HIGH driver access */
@@ -8184,21 +5650,11 @@ void wlc_mctrl(struct wlc_info *wlc, u32 mask, u32 val)
        wlc_bmac_mctrl(wlc->hw, mask, val);
 }
 
-void wlc_corereset(struct wlc_info *wlc, u32 flags)
-{
-       wlc_bmac_corereset(wlc->hw, flags);
-}
-
 void wlc_mhf(struct wlc_info *wlc, u8 idx, u16 mask, u16 val, int bands)
 {
        wlc_bmac_mhf(wlc->hw, idx, mask, val, bands);
 }
 
-u16 wlc_mhf_get(struct wlc_info *wlc, u8 idx, int bands)
-{
-       return wlc_bmac_mhf_get(wlc->hw, idx, bands);
-}
-
 int wlc_xmtfifo_sz_get(struct wlc_info *wlc, uint fifo, uint *blocks)
 {
        return wlc_bmac_xmtfifo_sz_get(wlc->hw, fifo, blocks);
@@ -8225,36 +5681,6 @@ wlc_set_addrmatch(struct wlc_info *wlc, int match_reg_offset,
                memcpy(wlc->cfg->BSSID, addr, ETH_ALEN);
 }
 
-void wlc_set_rcmta(struct wlc_info *wlc, int idx, const u8 *addr)
-{
-       wlc_bmac_set_rcmta(wlc->hw, idx, addr);
-}
-
-void wlc_read_tsf(struct wlc_info *wlc, u32 *tsf_l_ptr, u32 *tsf_h_ptr)
-{
-       wlc_bmac_read_tsf(wlc->hw, tsf_l_ptr, tsf_h_ptr);
-}
-
-void wlc_set_cwmin(struct wlc_info *wlc, u16 newmin)
-{
-       wlc->band->CWmin = newmin;
-       wlc_bmac_set_cwmin(wlc->hw, newmin);
-}
-
-void wlc_set_cwmax(struct wlc_info *wlc, u16 newmax)
-{
-       wlc->band->CWmax = newmax;
-       wlc_bmac_set_cwmax(wlc->hw, newmax);
-}
-
-void wlc_fifoerrors(struct wlc_info *wlc)
-{
-
-       wlc_bmac_fifoerrors(wlc->hw);
-}
-
-/* Search mem rw utilities */
-
 void wlc_pllreq(struct wlc_info *wlc, bool set, mbool req_bit)
 {
        wlc_bmac_pllreq(wlc->hw, set, req_bit);
@@ -8264,17 +5690,6 @@ void wlc_reset_bmac_done(struct wlc_info *wlc)
 {
 }
 
-void wlc_ht_mimops_cap_update(struct wlc_info *wlc, u8 mimops_mode)
-{
-       wlc->ht_cap.cap_info &= ~IEEE80211_HT_CAP_SM_PS;
-       wlc->ht_cap.cap_info |= (mimops_mode << IEEE80211_HT_CAP_SM_PS_SHIFT);
-
-       if (AP_ENAB(wlc->pub) && wlc->clk) {
-               wlc_update_beacon(wlc);
-               wlc_update_probe_resp(wlc, true);
-       }
-}
-
 /* check for the particular priority flow control bit being set */
 bool
 wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, struct wlc_txq_info *q,
@@ -8285,7 +5700,6 @@ wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, struct wlc_txq_info *q,
        if (prio == ALLPRIO) {
                prio_mask = TXQ_STOP_FOR_PRIOFC_MASK;
        } else {
-               ASSERT(prio >= 0 && prio <= MAXPRIO);
                prio_mask = NBITVAL(prio);
        }
 
@@ -8299,12 +5713,11 @@ void wlc_txflowcontrol(struct wlc_info *wlc, struct wlc_txq_info *qi,
        uint prio_bits;
        uint cur_bits;
 
-       WL_TRACE("%s: flow control kicks in\n", __func__);
+       BCMMSG(wlc->wiphy, "flow control kicks in\n");
 
        if (prio == ALLPRIO) {
                prio_bits = TXQ_STOP_FOR_PRIOFC_MASK;
        } else {
-               ASSERT(prio >= 0 && prio <= MAXPRIO);
                prio_bits = NBITVAL(prio);
        }
 
@@ -8341,9 +5754,6 @@ wlc_txflowcontrol_override(struct wlc_info *wlc, struct wlc_txq_info *qi,
 {
        uint prev_override;
 
-       ASSERT(override != 0);
-       ASSERT((override & TXQ_STOP_FOR_PRIOFC_MASK) == 0);
-
        prev_override = (qi->stopped & ~TXQ_STOP_FOR_PRIOFC_MASK);
 
        /* Update the flow control bits and do an early return if there is
@@ -8399,19 +5809,22 @@ static void
 wlc_txflowcontrol_signal(struct wlc_info *wlc, struct wlc_txq_info *qi, bool on,
                         int prio)
 {
+#ifdef NON_FUNCTIONAL
+       /* wlcif_list is never filled so this function is not functional */
        struct wlc_if *wlcif;
 
        for (wlcif = wlc->wlcif_list; wlcif != NULL; wlcif = wlcif->next) {
                if (wlcif->qi == qi && wlcif->flags & WLC_IF_LINKED)
-                       wl_txflowcontrol(wlc->wl, wlcif->wlif, on, prio);
+                       brcms_txflowcontrol(wlc->wl, wlcif->wlif, on, prio);
        }
+#endif
 }
 
 static struct wlc_txq_info *wlc_txq_alloc(struct wlc_info *wlc)
 {
        struct wlc_txq_info *qi, *p;
 
-       qi = wlc_calloc(wlc->pub->unit, sizeof(struct wlc_txq_info));
+       qi = kzalloc(sizeof(struct wlc_txq_info), GFP_ATOMIC);
        if (qi != NULL) {
                /*
                 * Have enough room for control packets along with HI watermark
@@ -8419,7 +5832,7 @@ static struct wlc_txq_info *wlc_txq_alloc(struct wlc_info *wlc)
                 * leave PS mode. The watermark for flowcontrol to OS packets
                 * will remain the same
                 */
-               pktq_init(&qi->q, WLC_PREC_COUNT,
+               brcmu_pktq_init(&qi->q, WLC_PREC_COUNT,
                          (2 * wlc->pub->tunables->datahiwat) + PKTQ_LEN_DEFAULT
                          + wlc->pub->psq_pkts_total);
 
@@ -8450,7 +5863,6 @@ static void wlc_txq_free(struct wlc_info *wlc, struct wlc_txq_info *qi)
        else {
                while (p != NULL && p->next != qi)
                        p = p->next;
-               ASSERT(p->next == qi);
                if (p != NULL)
                        p->next = p->next->next;
        }
@@ -8486,7 +5898,7 @@ void wlc_inval_dma_pkts(struct wlc_hw_info *hw,
                               struct ieee80211_sta *sta,
                               void (*dma_callback_fn))
 {
-       struct hnddma_pub *dmah;
+       struct dma_pub *dmah;
        int i;
        for (i = 0; i < NFIFO; i++) {
                dmah = hw->di[i];
@@ -8494,3 +5906,132 @@ void wlc_inval_dma_pkts(struct wlc_hw_info *hw,
                        dma_walk_packets(dmah, dma_callback_fn, sta);
        }
 }
+
+int wlc_get_curband(struct wlc_info *wlc)
+{
+       return wlc->band->bandunit;
+}
+
+void wlc_wait_for_tx_completion(struct wlc_info *wlc, bool drop)
+{
+       /* flush packet queue when requested */
+       if (drop)
+               brcmu_pktq_flush(&wlc->pkt_queue->q, false, NULL, NULL);
+
+       /* wait for queue and DMA fifos to run dry */
+       while (!pktq_empty(&wlc->pkt_queue->q) ||
+              TXPKTPENDTOT(wlc) > 0) {
+               brcms_msleep(wlc->wl, 1);
+       }
+}
+
+int wlc_set_par(struct wlc_info *wlc, enum wlc_par_id par_id, int int_val)
+{
+       int err = 0;
+
+       switch (par_id) {
+       case IOV_BCN_LI_BCN:
+               wlc->bcn_li_bcn = (u8) int_val;
+               if (wlc->pub->up)
+                       wlc_bcn_li_upd(wlc);
+               break;
+               /* As long as override is false, this only sets the *user*
+                  targets. User can twiddle this all he wants with no harm.
+                  wlc_phy_txpower_set() explicitly sets override to false if
+                  not internal or test.
+                */
+       case IOV_QTXPOWER:{
+               u8 qdbm;
+               bool override;
+
+               /* Remove override bit and clip to max qdbm value */
+               qdbm = (u8)min_t(u32, (int_val & ~WL_TXPWR_OVERRIDE), 0xff);
+               /* Extract override setting */
+               override = (int_val & WL_TXPWR_OVERRIDE) ? true : false;
+               err =
+                   wlc_phy_txpower_set(wlc->band->pi, qdbm, override);
+               break;
+               }
+       case IOV_MPC:
+               wlc->mpc = (bool)int_val;
+               wlc_radio_mpc_upd(wlc);
+               break;
+       default:
+               err = -ENOTSUPP;
+       }
+       return err;
+}
+
+int wlc_get_par(struct wlc_info *wlc, enum wlc_par_id par_id, int *ret_int_ptr)
+{
+       int err = 0;
+
+       switch (par_id) {
+       case IOV_BCN_LI_BCN:
+               *ret_int_ptr = wlc->bcn_li_bcn;
+               break;
+       case IOV_QTXPOWER: {
+               uint qdbm;
+               bool override;
+
+               err = wlc_phy_txpower_get(wlc->band->pi, &qdbm,
+                       &override);
+               if (err != 0)
+                       return err;
+
+               /* Return qdbm units */
+               *ret_int_ptr =
+                   qdbm | (override ? WL_TXPWR_OVERRIDE : 0);
+               break;
+               }
+       case IOV_MPC:
+               *ret_int_ptr = (s32) wlc->mpc;
+               break;
+       default:
+               err = -ENOTSUPP;
+       }
+       return err;
+}
+
+/*
+ * Search the name=value vars for a specific one and return its value.
+ * Returns NULL if not found.
+ */
+char *getvar(char *vars, const char *name)
+{
+       char *s;
+       int len;
+
+       if (!name)
+               return NULL;
+
+       len = strlen(name);
+       if (len == 0)
+               return NULL;
+
+       /* first look in vars[] */
+       for (s = vars; s && *s;) {
+               if ((memcmp(s, name, len) == 0) && (s[len] == '='))
+                       return &s[len + 1];
+
+               while (*s++)
+                       ;
+       }
+       /* nothing found */
+       return NULL;
+}
+
+/*
+ * Search the vars for a specific one and return its value as
+ * an integer. Returns 0 if not found.
+ */
+int getintvar(char *vars, const char *name)
+{
+       char *val;
+
+       val = getvar(vars, name);
+       if (val == NULL)
+               return 0;
+
+       return simple_strtoul(val, NULL, 0);
+}
This page took 0.202036 seconds and 5 git commands to generate.