staging: brcm80211: renamed files to get rid of wl_ file name prefix
authorRoland Vossen <rvossen@broadcom.com>
Wed, 1 Jun 2011 11:45:45 +0000 (13:45 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 7 Jun 2011 19:40:21 +0000 (12:40 -0700)
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmsmac/Makefile
drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c [new file with mode: 0644]
drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h [new file with mode: 0644]
drivers/staging/brcm80211/brcmsmac/ucode_loader.c [new file with mode: 0644]
drivers/staging/brcm80211/brcmsmac/ucode_loader.h [new file with mode: 0644]
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c [deleted file]
drivers/staging/brcm80211/brcmsmac/wl_mac80211.h [deleted file]
drivers/staging/brcm80211/brcmsmac/wl_ucode.h [deleted file]
drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c [deleted file]
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
drivers/staging/brcm80211/brcmsmac/wlc_main.c

index 4356a29a3f1c69d43e01b0eafccfd40690d1eec0..c6b5128250f72bf7db538f07d752bf29b63e8392 100644 (file)
@@ -28,8 +28,8 @@ ccflags-y :=                          \
        -Idrivers/staging/brcm80211/include
 
 BRCMSMAC_OFILES := \
-       wl_mac80211.o \
-       wl_ucode_loader.o \
+       brcms_mac80211.o \
+       ucode_loader.o \
        wlc_alloc.o \
        wlc_ampdu.o \
        wlc_antsel.o \
diff --git a/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c b/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.c
new file mode 100644 (file)
index 0000000..8eadb43
--- /dev/null
@@ -0,0 +1,1966 @@
+/*
+ * Copyright (c) 2010 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#define __UNDEF_NO_VERSION__
+
+#include <linux/kernel.h>
+#include <linux/etherdevice.h>
+#include <linux/types.h>
+#include <linux/pci_ids.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/sched.h>
+#include <linux/firmware.h>
+#include <net/mac80211.h>
+#include <bcmdefs.h>
+#include <bcmwifi.h>
+#include <bcmutils.h>
+#include <bcmnvram.h>
+#include <nicpci.h>
+#include "bcmdma.h"
+
+#include "phy/wlc_phy_int.h"
+#include "d11.h"
+#include "wlc_types.h"
+#include "wlc_cfg.h"
+#include "wlc_key.h"
+#include "wlc_channel.h"
+#include "wlc_scb.h"
+#include "wlc_pub.h"
+#include "wl_dbg.h"
+#include "wl_export.h"
+#include "ucode_loader.h"
+#include "brcms_mac80211.h"
+
+#define N_TX_QUEUES    4 /* #tx queues on mac80211<->driver interface */
+
+#define LOCK(wl)       spin_lock_bh(&(wl)->lock)
+#define UNLOCK(wl)     spin_unlock_bh(&(wl)->lock)
+
+/* locking from inside brcms_isr */
+#define ISR_LOCK(wl, flags)\
+       do {\
+               spin_lock(&(wl)->isr_lock);\
+               (void)(flags); } \
+       while (0)
+
+#define ISR_UNLOCK(wl, flags)\
+       do {\
+               spin_unlock(&(wl)->isr_lock);\
+               (void)(flags); } \
+       while (0)
+
+/* locking under LOCK() to synchronize with brcms_isr */
+#define INT_LOCK(wl, flags)    spin_lock_irqsave(&(wl)->isr_lock, flags)
+#define INT_UNLOCK(wl, flags)  spin_unlock_irqrestore(&(wl)->isr_lock, flags)
+
+static void brcms_timer(unsigned long data);
+static void _brcms_timer(struct brcms_timer *t);
+
+
+static int ieee_hw_init(struct ieee80211_hw *hw);
+static int ieee_hw_rate_init(struct ieee80211_hw *hw);
+
+static int wl_linux_watchdog(void *ctx);
+
+/* Flags we support */
+#define MAC_FILTERS (FIF_PROMISC_IN_BSS | \
+       FIF_ALLMULTI | \
+       FIF_FCSFAIL | \
+       FIF_PLCPFAIL | \
+       FIF_CONTROL | \
+       FIF_OTHER_BSS | \
+       FIF_BCN_PRBRESP_PROMISC)
+
+static int n_adapters_found;
+
+static int brcms_request_fw(struct brcms_info *wl, struct pci_dev *pdev);
+static void brcms_release_fw(struct brcms_info *wl);
+
+/* local prototypes */
+static void brcms_dpc(unsigned long data);
+static irqreturn_t brcms_isr(int irq, void *dev_id);
+
+static int __devinit brcms_pci_probe(struct pci_dev *pdev,
+                                 const struct pci_device_id *ent);
+static void brcms_remove(struct pci_dev *pdev);
+static void brcms_free(struct brcms_info *wl);
+static void brcms_set_basic_rate(struct wl_rateset *rs, u16 rate, bool is_br);
+
+MODULE_AUTHOR("Broadcom Corporation");
+MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
+MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
+MODULE_LICENSE("Dual BSD/GPL");
+
+/* recognized PCI IDs */
+static DEFINE_PCI_DEVICE_TABLE(brcms_pci_id_table) = {
+       {PCI_VENDOR_ID_BROADCOM, 0x4357, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},      /* 43225 2G */
+       {PCI_VENDOR_ID_BROADCOM, 0x4353, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},      /* 43224 DUAL */
+       {PCI_VENDOR_ID_BROADCOM, 0x4727, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},      /* 4313 DUAL */
+       /* 43224 Ven */
+       {PCI_VENDOR_ID_BROADCOM, 0x0576, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       {0}
+};
+
+MODULE_DEVICE_TABLE(pci, brcms_pci_id_table);
+
+#ifdef BCMDBG
+static int msglevel = 0xdeadbeef;
+module_param(msglevel, int, 0);
+static int phymsglevel = 0xdeadbeef;
+module_param(phymsglevel, int, 0);
+#endif                         /* BCMDBG */
+
+#define HW_TO_WL(hw)    (hw->priv)
+#define WL_TO_HW(wl)     (wl->pub->ieee_hw)
+
+/* MAC80211 callback functions */
+static int brcms_ops_start(struct ieee80211_hw *hw);
+static void brcms_ops_stop(struct ieee80211_hw *hw);
+static int brcms_ops_add_interface(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif);
+static void brcms_ops_remove_interface(struct ieee80211_hw *hw,
+                                   struct ieee80211_vif *vif);
+static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed);
+static void brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
+                                   struct ieee80211_vif *vif,
+                                   struct ieee80211_bss_conf *info,
+                                   u32 changed);
+static void brcms_ops_configure_filter(struct ieee80211_hw *hw,
+                                   unsigned int changed_flags,
+                                   unsigned int *total_flags, u64 multicast);
+static int brcms_ops_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
+                         bool set);
+static void brcms_ops_sw_scan_start(struct ieee80211_hw *hw);
+static void brcms_ops_sw_scan_complete(struct ieee80211_hw *hw);
+static void brcms_ops_set_tsf(struct ieee80211_hw *hw, u64 tsf);
+static int brcms_ops_get_stats(struct ieee80211_hw *hw,
+                           struct ieee80211_low_level_stats *stats);
+static void brcms_ops_sta_notify(struct ieee80211_hw *hw,
+                             struct ieee80211_vif *vif,
+                             enum sta_notify_cmd cmd,
+                             struct ieee80211_sta *sta);
+static int brcms_ops_conf_tx(struct ieee80211_hw *hw, u16 queue,
+                         const struct ieee80211_tx_queue_params *params);
+static u64 brcms_ops_get_tsf(struct ieee80211_hw *hw);
+static int brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                     struct ieee80211_sta *sta);
+static int brcms_ops_sta_remove(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               struct ieee80211_sta *sta);
+static int brcms_ops_ampdu_action(struct ieee80211_hw *hw,
+                              struct ieee80211_vif *vif,
+                              enum ieee80211_ampdu_mlme_action action,
+                              struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+                              u8 buf_size);
+static void brcms_ops_rfkill_poll(struct ieee80211_hw *hw);
+static void brcms_ops_flush(struct ieee80211_hw *hw, bool drop);
+
+static void brcms_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
+{
+       struct brcms_info *wl = hw->priv;
+
+       LOCK(wl);
+       if (!wl->pub->up) {
+               wiphy_err(wl->wiphy, "ops->tx called while down\n");
+               kfree_skb(skb);
+               goto done;
+       }
+       wlc_sendpkt_mac80211(wl->wlc, skb, hw);
+ done:
+       UNLOCK(wl);
+}
+
+static int brcms_ops_start(struct ieee80211_hw *hw)
+{
+       struct brcms_info *wl = hw->priv;
+       bool blocked;
+       /*
+         struct ieee80211_channel *curchan = hw->conf.channel;
+       */
+
+       ieee80211_wake_queues(hw);
+       LOCK(wl);
+       blocked = brcms_rfkill_set_hw_state(wl);
+       UNLOCK(wl);
+       if (!blocked)
+               wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy);
+
+       return 0;
+}
+
+static void brcms_ops_stop(struct ieee80211_hw *hw)
+{
+       ieee80211_stop_queues(hw);
+}
+
+static int
+brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+{
+       struct brcms_info *wl;
+       int err;
+
+       /* Just STA for now */
+       if (vif->type != NL80211_IFTYPE_AP &&
+           vif->type != NL80211_IFTYPE_MESH_POINT &&
+           vif->type != NL80211_IFTYPE_STATION &&
+           vif->type != NL80211_IFTYPE_WDS &&
+           vif->type != NL80211_IFTYPE_ADHOC) {
+               wiphy_err(hw->wiphy, "%s: Attempt to add type %d, only"
+                         " STA for now\n", __func__, vif->type);
+               return -EOPNOTSUPP;
+       }
+
+       wl = HW_TO_WL(hw);
+       LOCK(wl);
+       err = brcms_up(wl);
+       UNLOCK(wl);
+
+       if (err != 0) {
+               wiphy_err(hw->wiphy, "%s: brcms_up() returned %d\n", __func__,
+                         err);
+       }
+       return err;
+}
+
+static void
+brcms_ops_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+{
+       struct brcms_info *wl;
+
+       wl = HW_TO_WL(hw);
+
+       /* put driver in down state */
+       LOCK(wl);
+       brcms_down(wl);
+       UNLOCK(wl);
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+static int
+ieee_set_channel(struct ieee80211_hw *hw, struct ieee80211_channel *chan,
+                enum nl80211_channel_type type)
+{
+       struct brcms_info *wl = HW_TO_WL(hw);
+       int err = 0;
+
+       switch (type) {
+       case NL80211_CHAN_HT20:
+       case NL80211_CHAN_NO_HT:
+               err = wlc_set(wl->wlc, WLC_SET_CHANNEL, chan->hw_value);
+               break;
+       case NL80211_CHAN_HT40MINUS:
+       case NL80211_CHAN_HT40PLUS:
+               wiphy_err(hw->wiphy,
+                         "%s: Need to implement 40 Mhz Channels!\n", __func__);
+               err = 1;
+               break;
+       }
+
+       if (err)
+               return -EIO;
+       return err;
+}
+
+static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)
+{
+       struct ieee80211_conf *conf = &hw->conf;
+       struct brcms_info *wl = HW_TO_WL(hw);
+       int err = 0;
+       int new_int;
+       struct wiphy *wiphy = hw->wiphy;
+
+       LOCK(wl);
+       if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {
+               if (wlc_set_par(wl->wlc, IOV_BCN_LI_BCN, conf->listen_interval)
+                   < 0) {
+                       wiphy_err(wiphy, "%s: Error setting listen_interval\n",
+                                 __func__);
+                       err = -EIO;
+                       goto config_out;
+               }
+               wlc_get_par(wl->wlc, IOV_BCN_LI_BCN, &new_int);
+       }
+       if (changed & IEEE80211_CONF_CHANGE_MONITOR)
+               wiphy_err(wiphy, "%s: change monitor mode: %s (implement)\n",
+                         __func__, conf->flags & IEEE80211_CONF_MONITOR ?
+                         "true" : "false");
+       if (changed & IEEE80211_CONF_CHANGE_PS)
+               wiphy_err(wiphy, "%s: change power-save mode: %s (implement)\n",
+                         __func__, conf->flags & IEEE80211_CONF_PS ?
+                         "true" : "false");
+
+       if (changed & IEEE80211_CONF_CHANGE_POWER) {
+               if (wlc_set_par(wl->wlc, IOV_QTXPOWER, conf->power_level * 4)
+                               < 0) {
+                       wiphy_err(wiphy, "%s: Error setting power_level\n",
+                                 __func__);
+                       err = -EIO;
+                       goto config_out;
+               }
+               wlc_get_par(wl->wlc, IOV_QTXPOWER, &new_int);
+               if (new_int != (conf->power_level * 4))
+                       wiphy_err(wiphy, "%s: Power level req != actual, %d %d"
+                                 "\n", __func__, conf->power_level * 4,
+                                 new_int);
+       }
+       if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
+               err = ieee_set_channel(hw, conf->channel, conf->channel_type);
+       }
+       if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) {
+               if (wlc_set
+                   (wl->wlc, WLC_SET_SRL,
+                    conf->short_frame_max_tx_count) < 0) {
+                       wiphy_err(wiphy, "%s: Error setting srl\n", __func__);
+                       err = -EIO;
+                       goto config_out;
+               }
+               if (wlc_set(wl->wlc, WLC_SET_LRL, conf->long_frame_max_tx_count)
+                   < 0) {
+                       wiphy_err(wiphy, "%s: Error setting lrl\n", __func__);
+                       err = -EIO;
+                       goto config_out;
+               }
+       }
+
+ config_out:
+       UNLOCK(wl);
+       return err;
+}
+
+static void
+brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
+                       struct ieee80211_vif *vif,
+                       struct ieee80211_bss_conf *info, u32 changed)
+{
+       struct brcms_info *wl = HW_TO_WL(hw);
+       struct wiphy *wiphy = hw->wiphy;
+       int val;
+
+       if (changed & BSS_CHANGED_ASSOC) {
+               /* association status changed (associated/disassociated)
+                * also implies a change in the AID.
+                */
+               wiphy_err(wiphy, "%s: %s: %sassociated\n", KBUILD_MODNAME,
+                         __func__, info->assoc ? "" : "dis");
+               LOCK(wl);
+               wlc_associate_upd(wl->wlc, info->assoc);
+               UNLOCK(wl);
+       }
+       if (changed & BSS_CHANGED_ERP_SLOT) {
+               /* slot timing changed */
+               if (info->use_short_slot)
+                       val = 1;
+               else
+                       val = 0;
+               LOCK(wl);
+               wlc_set(wl->wlc, WLC_SET_SHORTSLOT_OVERRIDE, val);
+               UNLOCK(wl);
+       }
+
+       if (changed & BSS_CHANGED_HT) {
+               /* 802.11n parameters changed */
+               u16 mode = info->ht_operation_mode;
+
+               LOCK(wl);
+               wlc_protection_upd(wl->wlc, WLC_PROT_N_CFG,
+                       mode & IEEE80211_HT_OP_MODE_PROTECTION);
+               wlc_protection_upd(wl->wlc, WLC_PROT_N_NONGF,
+                       mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
+               wlc_protection_upd(wl->wlc, WLC_PROT_N_OBSS,
+                       mode & IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT);
+               UNLOCK(wl);
+       }
+       if (changed & BSS_CHANGED_BASIC_RATES) {
+               struct ieee80211_supported_band *bi;
+               u32 br_mask, i;
+               u16 rate;
+               struct wl_rateset rs;
+               int error;
+
+               /* retrieve the current rates */
+               LOCK(wl);
+               error = wlc_ioctl(wl->wlc, WLC_GET_CURR_RATESET,
+                                 &rs, sizeof(rs), NULL);
+               UNLOCK(wl);
+               if (error) {
+                       wiphy_err(wiphy, "%s: retrieve rateset failed: %d\n",
+                                 __func__, error);
+                       return;
+               }
+               br_mask = info->basic_rates;
+               bi = hw->wiphy->bands[wlc_get_curband(wl->wlc)];
+               for (i = 0; i < bi->n_bitrates; i++) {
+                       /* convert to internal rate value */
+                       rate = (bi->bitrates[i].bitrate << 1) / 10;
+
+                       /* set/clear basic rate flag */
+                       brcms_set_basic_rate(&rs, rate, br_mask & 1);
+                       br_mask >>= 1;
+               }
+
+               /* update the rate set */
+               LOCK(wl);
+               wlc_ioctl(wl->wlc, WLC_SET_RATESET, &rs, sizeof(rs), NULL);
+               UNLOCK(wl);
+       }
+       if (changed & BSS_CHANGED_BEACON_INT) {
+               /* Beacon interval changed */
+               LOCK(wl);
+               wlc_set(wl->wlc, WLC_SET_BCNPRD, info->beacon_int);
+               UNLOCK(wl);
+       }
+       if (changed & BSS_CHANGED_BSSID) {
+               /* BSSID changed, for whatever reason (IBSS and managed mode) */
+               LOCK(wl);
+               wlc_set_addrmatch(wl->wlc, RCM_BSSID_OFFSET,
+                                 info->bssid);
+               UNLOCK(wl);
+       }
+       if (changed & BSS_CHANGED_BEACON) {
+               /* Beacon data changed, retrieve new beacon (beaconing modes) */
+               wiphy_err(wiphy, "%s: beacon changed\n", __func__);
+       }
+       if (changed & BSS_CHANGED_BEACON_ENABLED) {
+               /* Beaconing should be enabled/disabled (beaconing modes) */
+               wiphy_err(wiphy, "%s: Beacon enabled: %s\n", __func__,
+                         info->enable_beacon ? "true" : "false");
+       }
+       if (changed & BSS_CHANGED_CQM) {
+               /* Connection quality monitor config changed */
+               wiphy_err(wiphy, "%s: cqm change: threshold %d, hys %d "
+                         " (implement)\n", __func__, info->cqm_rssi_thold,
+                         info->cqm_rssi_hyst);
+       }
+       if (changed & BSS_CHANGED_IBSS) {
+               /* IBSS join status changed */
+               wiphy_err(wiphy, "%s: IBSS joined: %s (implement)\n", __func__,
+                         info->ibss_joined ? "true" : "false");
+       }
+       if (changed & BSS_CHANGED_ARP_FILTER) {
+               /* Hardware ARP filter address list or state changed */
+               wiphy_err(wiphy, "%s: arp filtering: enabled %s, count %d"
+                         " (implement)\n", __func__, info->arp_filter_enabled ?
+                         "true" : "false", info->arp_addr_cnt);
+       }
+       if (changed & BSS_CHANGED_QOS) {
+               /*
+                * QoS for this association was enabled/disabled.
+                * Note that it is only ever disabled for station mode.
+                */
+               wiphy_err(wiphy, "%s: qos enabled: %s (implement)\n", __func__,
+                         info->qos ? "true" : "false");
+       }
+       if (changed & BSS_CHANGED_IDLE) {
+               /* Idle changed for this BSS/interface */
+               wiphy_err(wiphy, "%s: BSS idle: %s (implement)\n", __func__,
+                         info->idle ? "true" : "false");
+       }
+       return;
+}
+
+static void
+brcms_ops_configure_filter(struct ieee80211_hw *hw,
+                       unsigned int changed_flags,
+                       unsigned int *total_flags, u64 multicast)
+{
+       struct brcms_info *wl = hw->priv;
+       struct wiphy *wiphy = hw->wiphy;
+
+       changed_flags &= MAC_FILTERS;
+       *total_flags &= MAC_FILTERS;
+       if (changed_flags & FIF_PROMISC_IN_BSS)
+               wiphy_err(wiphy, "FIF_PROMISC_IN_BSS\n");
+       if (changed_flags & FIF_ALLMULTI)
+               wiphy_err(wiphy, "FIF_ALLMULTI\n");
+       if (changed_flags & FIF_FCSFAIL)
+               wiphy_err(wiphy, "FIF_FCSFAIL\n");
+       if (changed_flags & FIF_PLCPFAIL)
+               wiphy_err(wiphy, "FIF_PLCPFAIL\n");
+       if (changed_flags & FIF_CONTROL)
+               wiphy_err(wiphy, "FIF_CONTROL\n");
+       if (changed_flags & FIF_OTHER_BSS)
+               wiphy_err(wiphy, "FIF_OTHER_BSS\n");
+       if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
+               LOCK(wl);
+               if (*total_flags & FIF_BCN_PRBRESP_PROMISC) {
+                       wl->pub->mac80211_state |= MAC80211_PROMISC_BCNS;
+                       wlc_mac_bcn_promisc_change(wl->wlc, 1);
+               } else {
+                       wlc_mac_bcn_promisc_change(wl->wlc, 0);
+                       wl->pub->mac80211_state &= ~MAC80211_PROMISC_BCNS;
+               }
+               UNLOCK(wl);
+       }
+       return;
+}
+
+static int
+brcms_ops_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set)
+{
+       return 0;
+}
+
+static void brcms_ops_sw_scan_start(struct ieee80211_hw *hw)
+{
+       struct brcms_info *wl = hw->priv;
+       LOCK(wl);
+       wlc_scan_start(wl->wlc);
+       UNLOCK(wl);
+       return;
+}
+
+static void brcms_ops_sw_scan_complete(struct ieee80211_hw *hw)
+{
+       struct brcms_info *wl = hw->priv;
+       LOCK(wl);
+       wlc_scan_stop(wl->wlc);
+       UNLOCK(wl);
+       return;
+}
+
+static void brcms_ops_set_tsf(struct ieee80211_hw *hw, u64 tsf)
+{
+       wiphy_err(hw->wiphy, "%s: Enter\n", __func__);
+       return;
+}
+
+static int
+brcms_ops_get_stats(struct ieee80211_hw *hw,
+                struct ieee80211_low_level_stats *stats)
+{
+       struct brcms_info *wl = hw->priv;
+       struct wl_cnt *cnt;
+
+       LOCK(wl);
+       cnt = wl->pub->_cnt;
+       stats->dot11ACKFailureCount = 0;
+       stats->dot11RTSFailureCount = 0;
+       stats->dot11FCSErrorCount = 0;
+       stats->dot11RTSSuccessCount = 0;
+       UNLOCK(wl);
+       return 0;
+}
+
+static void
+brcms_ops_sta_notify(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                 enum sta_notify_cmd cmd, struct ieee80211_sta *sta)
+{
+       switch (cmd) {
+       default:
+               wiphy_err(hw->wiphy, "%s: Unknown cmd = %d\n", __func__,
+                         cmd);
+               break;
+       }
+       return;
+}
+
+static int
+brcms_ops_conf_tx(struct ieee80211_hw *hw, u16 queue,
+              const struct ieee80211_tx_queue_params *params)
+{
+       struct brcms_info *wl = hw->priv;
+
+       LOCK(wl);
+       wlc_wme_setparams(wl->wlc, queue, params, true);
+       UNLOCK(wl);
+
+       return 0;
+}
+
+static u64 brcms_ops_get_tsf(struct ieee80211_hw *hw)
+{
+       wiphy_err(hw->wiphy, "%s: Enter\n", __func__);
+       return 0;
+}
+
+static int
+brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+              struct ieee80211_sta *sta)
+{
+       struct scb *scb;
+
+       int i;
+       struct brcms_info *wl = hw->priv;
+
+       /* Init the scb */
+       scb = (struct scb *)sta->drv_priv;
+       memset(scb, 0, sizeof(struct scb));
+       for (i = 0; i < NUMPRIO; i++)
+               scb->seqctl[i] = 0xFFFF;
+       scb->seqctl_nonqos = 0xFFFF;
+       scb->magic = SCB_MAGIC;
+
+       wl->pub->global_scb = scb;
+       wl->pub->global_ampdu = &(scb->scb_ampdu);
+       wl->pub->global_ampdu->scb = scb;
+       wl->pub->global_ampdu->max_pdu = 16;
+       bcm_pktq_init(&scb->scb_ampdu.txq, AMPDU_MAX_SCB_TID,
+                 AMPDU_MAX_SCB_TID * PKTQ_LEN_DEFAULT);
+
+       sta->ht_cap.ht_supported = true;
+       sta->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
+       sta->ht_cap.ampdu_density = AMPDU_DEF_MPDU_DENSITY;
+       sta->ht_cap.cap = IEEE80211_HT_CAP_GRN_FLD |
+           IEEE80211_HT_CAP_SGI_20 |
+           IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT;
+
+       /* minstrel_ht initiates addBA on our behalf by calling ieee80211_start_tx_ba_session() */
+       return 0;
+}
+
+static int
+brcms_ops_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                 struct ieee80211_sta *sta)
+{
+       return 0;
+}
+
+static int
+brcms_ops_ampdu_action(struct ieee80211_hw *hw,
+                   struct ieee80211_vif *vif,
+                   enum ieee80211_ampdu_mlme_action action,
+                   struct ieee80211_sta *sta, u16 tid, u16 *ssn,
+                   u8 buf_size)
+{
+       struct scb *scb = (struct scb *)sta->drv_priv;
+       struct brcms_info *wl = hw->priv;
+       int status;
+
+       if (WARN_ON(scb->magic != SCB_MAGIC))
+               return -EIDRM;
+       switch (action) {
+       case IEEE80211_AMPDU_RX_START:
+               break;
+       case IEEE80211_AMPDU_RX_STOP:
+               break;
+       case IEEE80211_AMPDU_TX_START:
+               LOCK(wl);
+               status = wlc_aggregatable(wl->wlc, tid);
+               UNLOCK(wl);
+               if (!status) {
+                       wiphy_err(wl->wiphy, "START: tid %d is not agg\'able\n",
+                                 tid);
+                       return -EINVAL;
+               }
+               /* XXX: Use the starting sequence number provided ... */
+               *ssn = 0;
+               ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+               break;
+
+       case IEEE80211_AMPDU_TX_STOP:
+               LOCK(wl);
+               wlc_ampdu_flush(wl->wlc, sta, tid);
+               UNLOCK(wl);
+               ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
+               break;
+       case IEEE80211_AMPDU_TX_OPERATIONAL:
+               /* Not sure what to do here */
+               /* Power save wakeup */
+               break;
+       default:
+               wiphy_err(wl->wiphy, "%s: Invalid command, ignoring\n",
+                         __func__);
+       }
+
+       return 0;
+}
+
+static void brcms_ops_rfkill_poll(struct ieee80211_hw *hw)
+{
+       struct brcms_info *wl = HW_TO_WL(hw);
+       bool blocked;
+
+       LOCK(wl);
+       blocked = wlc_check_radio_disabled(wl->wlc);
+       UNLOCK(wl);
+
+       wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, blocked);
+}
+
+static void brcms_ops_flush(struct ieee80211_hw *hw, bool drop)
+{
+       struct brcms_info *wl = HW_TO_WL(hw);
+
+       no_printk("%s: drop = %s\n", __func__, drop ? "true" : "false");
+
+       /* wait for packet queue and dma fifos to run empty */
+       LOCK(wl);
+       wlc_wait_for_tx_completion(wl->wlc, drop);
+       UNLOCK(wl);
+}
+
+static const struct ieee80211_ops brcms_ops = {
+       .tx = brcms_ops_tx,
+       .start = brcms_ops_start,
+       .stop = brcms_ops_stop,
+       .add_interface = brcms_ops_add_interface,
+       .remove_interface = brcms_ops_remove_interface,
+       .config = brcms_ops_config,
+       .bss_info_changed = brcms_ops_bss_info_changed,
+       .configure_filter = brcms_ops_configure_filter,
+       .set_tim = brcms_ops_set_tim,
+       .sw_scan_start = brcms_ops_sw_scan_start,
+       .sw_scan_complete = brcms_ops_sw_scan_complete,
+       .set_tsf = brcms_ops_set_tsf,
+       .get_stats = brcms_ops_get_stats,
+       .sta_notify = brcms_ops_sta_notify,
+       .conf_tx = brcms_ops_conf_tx,
+       .get_tsf = brcms_ops_get_tsf,
+       .sta_add = brcms_ops_sta_add,
+       .sta_remove = brcms_ops_sta_remove,
+       .ampdu_action = brcms_ops_ampdu_action,
+       .rfkill_poll = brcms_ops_rfkill_poll,
+       .flush = brcms_ops_flush,
+};
+
+/*
+ * is called in brcms_pci_probe() context, therefore no locking required.
+ */
+static int brcms_set_hint(struct brcms_info *wl, char *abbrev)
+{
+       return regulatory_hint(wl->pub->ieee_hw->wiphy, abbrev);
+}
+
+/**
+ * attach to the WL device.
+ *
+ * Attach to the WL device identified by vendor and device parameters.
+ * regs is a host accessible memory address pointing to WL device registers.
+ *
+ * brcms_attach is not defined as static because in the case where no bus
+ * is defined, wl_attach will never be called, and thus, gcc will issue
+ * a warning that this function is defined but not used if we declare
+ * it as static.
+ *
+ *
+ * is called in brcms_pci_probe() context, therefore no locking required.
+ */
+static struct brcms_info *brcms_attach(u16 vendor, u16 device,
+                                      unsigned long regs,
+                           uint bustype, void *btparam, uint irq)
+{
+       struct brcms_info *wl = NULL;
+       int unit, err;
+       unsigned long base_addr;
+       struct ieee80211_hw *hw;
+       u8 perm[ETH_ALEN];
+
+       unit = n_adapters_found;
+       err = 0;
+
+       if (unit < 0) {
+               return NULL;
+       }
+
+       /* allocate private info */
+       hw = pci_get_drvdata(btparam);  /* btparam == pdev */
+       if (hw != NULL)
+               wl = hw->priv;
+       if (WARN_ON(hw == NULL) || WARN_ON(wl == NULL))
+               return NULL;
+       wl->wiphy = hw->wiphy;
+
+       atomic_set(&wl->callbacks, 0);
+
+       /* setup the bottom half handler */
+       tasklet_init(&wl->tasklet, brcms_dpc, (unsigned long) wl);
+
+
+
+       base_addr = regs;
+
+       if (bustype == PCI_BUS || bustype == RPC_BUS) {
+               /* Do nothing */
+       } else {
+               bustype = PCI_BUS;
+               BCMMSG(wl->wiphy, "force to PCI\n");
+       }
+       wl->bcm_bustype = bustype;
+
+       wl->regsva = ioremap_nocache(base_addr, PCI_BAR0_WINSZ);
+       if (wl->regsva == NULL) {
+               wiphy_err(wl->wiphy, "wl%d: ioremap() failed\n", unit);
+               goto fail;
+       }
+       spin_lock_init(&wl->lock);
+       spin_lock_init(&wl->isr_lock);
+
+       /* prepare ucode */
+       if (brcms_request_fw(wl, (struct pci_dev *)btparam) < 0) {
+               wiphy_err(wl->wiphy, "%s: Failed to find firmware usually in "
+                         "%s\n", KBUILD_MODNAME, "/lib/firmware/brcm");
+               brcms_release_fw(wl);
+               brcms_remove((struct pci_dev *)btparam);
+               return NULL;
+       }
+
+       /* common load-time initialization */
+       wl->wlc = wlc_attach((void *)wl, vendor, device, unit, false,
+                            wl->regsva, wl->bcm_bustype, btparam, &err);
+       brcms_release_fw(wl);
+       if (!wl->wlc) {
+               wiphy_err(wl->wiphy, "%s: wlc_attach() failed with code %d\n",
+                         KBUILD_MODNAME, err);
+               goto fail;
+       }
+       wl->pub = wlc_pub(wl->wlc);
+
+       wl->pub->ieee_hw = hw;
+
+       if (wlc_set_par(wl->wlc, IOV_MPC, 0) < 0) {
+               wiphy_err(wl->wiphy, "wl%d: Error setting MPC variable to 0\n",
+                         unit);
+       }
+
+       /* register our interrupt handler */
+       if (request_irq(irq, brcms_isr, IRQF_SHARED, KBUILD_MODNAME, wl)) {
+               wiphy_err(wl->wiphy, "wl%d: request_irq() failed\n", unit);
+               goto fail;
+       }
+       wl->irq = irq;
+
+       /* register module */
+       wlc_module_register(wl->pub, "linux", wl, wl_linux_watchdog, NULL);
+
+       if (ieee_hw_init(hw)) {
+               wiphy_err(wl->wiphy, "wl%d: %s: ieee_hw_init failed!\n", unit,
+                         __func__);
+               goto fail;
+       }
+
+       memcpy(perm, &wl->pub->cur_etheraddr, ETH_ALEN);
+       if (WARN_ON(!is_valid_ether_addr(perm)))
+               goto fail;
+       SET_IEEE80211_PERM_ADDR(hw, perm);
+
+       err = ieee80211_register_hw(hw);
+       if (err) {
+               wiphy_err(wl->wiphy, "%s: ieee80211_register_hw failed, status"
+                         "%d\n", __func__, err);
+       }
+
+       if (wl->pub->srom_ccode[0])
+               err = brcms_set_hint(wl, wl->pub->srom_ccode);
+       else
+               err = brcms_set_hint(wl, "US");
+       if (err) {
+               wiphy_err(wl->wiphy, "%s: regulatory_hint failed, status %d\n",
+                         __func__, err);
+       }
+
+       n_adapters_found++;
+       return wl;
+
+fail:
+       brcms_free(wl);
+       return NULL;
+}
+
+
+
+#define CHAN2GHZ(channel, freqency, chflags)  { \
+       .band = IEEE80211_BAND_2GHZ, \
+       .center_freq = (freqency), \
+       .hw_value = (channel), \
+       .flags = chflags, \
+       .max_antenna_gain = 0, \
+       .max_power = 19, \
+}
+
+static struct ieee80211_channel brcms_2ghz_chantable[] = {
+       CHAN2GHZ(1, 2412, IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN2GHZ(2, 2417, IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN2GHZ(3, 2422, IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN2GHZ(4, 2427, IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN2GHZ(5, 2432, 0),
+       CHAN2GHZ(6, 2437, 0),
+       CHAN2GHZ(7, 2442, 0),
+       CHAN2GHZ(8, 2447, IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN2GHZ(9, 2452, IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN2GHZ(10, 2457, IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN2GHZ(11, 2462, IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN2GHZ(12, 2467,
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN2GHZ(13, 2472,
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN2GHZ(14, 2484,
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS)
+};
+
+#define CHAN5GHZ(channel, chflags)  { \
+       .band = IEEE80211_BAND_5GHZ, \
+       .center_freq = 5000 + 5*(channel), \
+       .hw_value = (channel), \
+       .flags = chflags, \
+       .max_antenna_gain = 0, \
+       .max_power = 21, \
+}
+
+static struct ieee80211_channel brcms_5ghz_nphy_chantable[] = {
+       /* UNII-1 */
+       CHAN5GHZ(36, IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(40, IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN5GHZ(44, IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(48, IEEE80211_CHAN_NO_HT40PLUS),
+       /* UNII-2 */
+       CHAN5GHZ(52,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(56,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN5GHZ(60,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(64,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+       /* MID */
+       CHAN5GHZ(100,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(104,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN5GHZ(108,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(112,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN5GHZ(116,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(120,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN5GHZ(124,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(128,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN5GHZ(132,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(136,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN5GHZ(140,
+                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
+                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS |
+                IEEE80211_CHAN_NO_HT40MINUS),
+       /* UNII-3 */
+       CHAN5GHZ(149, IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(153, IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN5GHZ(157, IEEE80211_CHAN_NO_HT40MINUS),
+       CHAN5GHZ(161, IEEE80211_CHAN_NO_HT40PLUS),
+       CHAN5GHZ(165, IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS)
+};
+
+#define RATE(rate100m, _flags) { \
+       .bitrate = (rate100m), \
+       .flags = (_flags), \
+       .hw_value = (rate100m / 5), \
+}
+
+static struct ieee80211_rate legacy_ratetable[] = {
+       RATE(10, 0),
+       RATE(20, IEEE80211_RATE_SHORT_PREAMBLE),
+       RATE(55, IEEE80211_RATE_SHORT_PREAMBLE),
+       RATE(110, IEEE80211_RATE_SHORT_PREAMBLE),
+       RATE(60, 0),
+       RATE(90, 0),
+       RATE(120, 0),
+       RATE(180, 0),
+       RATE(240, 0),
+       RATE(360, 0),
+       RATE(480, 0),
+       RATE(540, 0),
+};
+
+static struct ieee80211_supported_band brcms_band_2GHz_nphy = {
+       .band = IEEE80211_BAND_2GHZ,
+       .channels = brcms_2ghz_chantable,
+       .n_channels = ARRAY_SIZE(brcms_2ghz_chantable),
+       .bitrates = legacy_ratetable,
+       .n_bitrates = ARRAY_SIZE(legacy_ratetable),
+       .ht_cap = {
+                  /* from include/linux/ieee80211.h */
+                  .cap = IEEE80211_HT_CAP_GRN_FLD |
+                  IEEE80211_HT_CAP_SGI_20 |
+                  IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT,
+                  .ht_supported = true,
+                  .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,
+                  .ampdu_density = AMPDU_DEF_MPDU_DENSITY,
+                  .mcs = {
+                          /* placeholders for now */
+                          .rx_mask = {0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0},
+                          .rx_highest = 500,
+                          .tx_params = IEEE80211_HT_MCS_TX_DEFINED}
+                  }
+};
+
+static struct ieee80211_supported_band brcms_band_5GHz_nphy = {
+       .band = IEEE80211_BAND_5GHZ,
+       .channels = brcms_5ghz_nphy_chantable,
+       .n_channels = ARRAY_SIZE(brcms_5ghz_nphy_chantable),
+       .bitrates = legacy_ratetable + 4,
+       .n_bitrates = ARRAY_SIZE(legacy_ratetable) - 4,
+       .ht_cap = {
+                  /* use IEEE80211_HT_CAP_* from include/linux/ieee80211.h */
+                  .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT,     /* No 40 mhz yet */
+                  .ht_supported = true,
+                  .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,
+                  .ampdu_density = AMPDU_DEF_MPDU_DENSITY,
+                  .mcs = {
+                          /* placeholders for now */
+                          .rx_mask = {0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0},
+                          .rx_highest = 500,
+                          .tx_params = IEEE80211_HT_MCS_TX_DEFINED}
+                  }
+};
+
+/*
+ * is called in brcms_pci_probe() context, therefore no locking required.
+ */
+static int ieee_hw_rate_init(struct ieee80211_hw *hw)
+{
+       struct brcms_info *wl = HW_TO_WL(hw);
+       int has_5g;
+       char phy_list[4];
+
+       has_5g = 0;
+
+       hw->wiphy->bands[IEEE80211_BAND_2GHZ] = NULL;
+       hw->wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
+
+       if (wlc_get(wl->wlc, WLC_GET_PHYLIST, (int *)&phy_list) < 0) {
+               wiphy_err(hw->wiphy, "Phy list failed\n");
+       }
+
+       if (phy_list[0] == 'n' || phy_list[0] == 'c') {
+               if (phy_list[0] == 'c') {
+                       /* Single stream */
+                       brcms_band_2GHz_nphy.ht_cap.mcs.rx_mask[1] = 0;
+                       brcms_band_2GHz_nphy.ht_cap.mcs.rx_highest = 72;
+               }
+               hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &brcms_band_2GHz_nphy;
+       } else {
+               return -EPERM;
+       }
+
+       /* Assume all bands use the same phy.  True for 11n devices. */
+       if (NBANDS_PUB(wl->pub) > 1) {
+               has_5g++;
+               if (phy_list[0] == 'n' || phy_list[0] == 'c') {
+                       hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
+                           &brcms_band_5GHz_nphy;
+               } else {
+                       return -EPERM;
+               }
+       }
+       return 0;
+}
+
+/*
+ * is called in brcms_pci_probe() context, therefore no locking required.
+ */
+static int ieee_hw_init(struct ieee80211_hw *hw)
+{
+       hw->flags = IEEE80211_HW_SIGNAL_DBM
+           /* | IEEE80211_HW_CONNECTION_MONITOR  What is this? */
+           | IEEE80211_HW_REPORTS_TX_ACK_STATUS
+           | IEEE80211_HW_AMPDU_AGGREGATION;
+
+       hw->extra_tx_headroom = wlc_get_header_len();
+       hw->queues = N_TX_QUEUES;
+       /* FIXME: this doesn't seem to be used properly in minstrel_ht.
+        * mac80211/status.c:ieee80211_tx_status() checks this value,
+        * but mac80211/rc80211_minstrel_ht.c:minstrel_ht_get_rate()
+        * appears to always set 3 rates
+        */
+       hw->max_rates = 2;      /* Primary rate and 1 fallback rate */
+
+       hw->channel_change_time = 7 * 1000;     /* channel change time is dependent on chip and band  */
+       hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
+
+       hw->rate_control_algorithm = "minstrel_ht";
+
+       hw->sta_data_size = sizeof(struct scb);
+       return ieee_hw_rate_init(hw);
+}
+
+/**
+ * determines if a device is a WL device, and if so, attaches it.
+ *
+ * This function determines if a device pointed to by pdev is a WL device,
+ * and if so, performs a brcms_attach() on it.
+ *
+ * Perimeter lock is initialized in the course of this function.
+ */
+static int __devinit
+brcms_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+{
+       int rc;
+       struct brcms_info *wl;
+       struct ieee80211_hw *hw;
+       u32 val;
+
+       dev_info(&pdev->dev, "bus %d slot %d func %d irq %d\n",
+              pdev->bus->number, PCI_SLOT(pdev->devfn),
+              PCI_FUNC(pdev->devfn), pdev->irq);
+
+       if ((pdev->vendor != PCI_VENDOR_ID_BROADCOM) ||
+           ((pdev->device != 0x0576) &&
+            ((pdev->device & 0xff00) != 0x4300) &&
+            ((pdev->device & 0xff00) != 0x4700) &&
+            ((pdev->device < 43000) || (pdev->device > 43999))))
+               return -ENODEV;
+
+       rc = pci_enable_device(pdev);
+       if (rc) {
+               pr_err("%s: Cannot enable device %d-%d_%d\n",
+                      __func__, pdev->bus->number, PCI_SLOT(pdev->devfn),
+                      PCI_FUNC(pdev->devfn));
+               return -ENODEV;
+       }
+       pci_set_master(pdev);
+
+       pci_read_config_dword(pdev, 0x40, &val);
+       if ((val & 0x0000ff00) != 0)
+               pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+
+       hw = ieee80211_alloc_hw(sizeof(struct brcms_info), &brcms_ops);
+       if (!hw) {
+               pr_err("%s: ieee80211_alloc_hw failed\n", __func__);
+               return -ENOMEM;
+       }
+
+       SET_IEEE80211_DEV(hw, &pdev->dev);
+
+       pci_set_drvdata(pdev, hw);
+
+       memset(hw->priv, 0, sizeof(*wl));
+
+       wl = brcms_attach(pdev->vendor, pdev->device,
+                         pci_resource_start(pdev, 0), PCI_BUS, pdev,
+                         pdev->irq);
+
+       if (!wl) {
+               pr_err("%s: %s: brcms_attach failed!\n", KBUILD_MODNAME,
+                      __func__);
+               return -ENODEV;
+       }
+       return 0;
+}
+
+static int brcms_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       struct brcms_info *wl;
+       struct ieee80211_hw *hw;
+
+       hw = pci_get_drvdata(pdev);
+       wl = HW_TO_WL(hw);
+       if (!wl) {
+               wiphy_err(wl->wiphy,
+                         "brcms_suspend: pci_get_drvdata failed\n");
+               return -ENODEV;
+       }
+
+       /* only need to flag hw is down for proper resume */
+       LOCK(wl);
+       wl->pub->hw_up = false;
+       UNLOCK(wl);
+
+       pci_save_state(pdev);
+       pci_disable_device(pdev);
+       return pci_set_power_state(pdev, PCI_D3hot);
+}
+
+static int brcms_resume(struct pci_dev *pdev)
+{
+       struct brcms_info *wl;
+       struct ieee80211_hw *hw;
+       int err = 0;
+       u32 val;
+
+       hw = pci_get_drvdata(pdev);
+       wl = HW_TO_WL(hw);
+       if (!wl) {
+               wiphy_err(wl->wiphy,
+                         "wl: brcms_resume: pci_get_drvdata failed\n");
+               return -ENODEV;
+       }
+
+       err = pci_set_power_state(pdev, PCI_D0);
+       if (err)
+               return err;
+
+       pci_restore_state(pdev);
+
+       err = pci_enable_device(pdev);
+       if (err)
+               return err;
+
+       pci_set_master(pdev);
+
+       pci_read_config_dword(pdev, 0x40, &val);
+       if ((val & 0x0000ff00) != 0)
+               pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+
+       /*
+       *  done. driver will be put in up state
+       *  in brcms_ops_add_interface() call.
+       */
+       return err;
+}
+
+/*
+* called from both kernel as from this kernel module.
+* precondition: perimeter lock is not acquired.
+*/
+static void brcms_remove(struct pci_dev *pdev)
+{
+       struct brcms_info *wl;
+       struct ieee80211_hw *hw;
+       int status;
+
+       hw = pci_get_drvdata(pdev);
+       wl = HW_TO_WL(hw);
+       if (!wl) {
+               pr_err("wl: brcms_remove: pci_get_drvdata failed\n");
+               return;
+       }
+
+       LOCK(wl);
+       status = wlc_chipmatch(pdev->vendor, pdev->device);
+       UNLOCK(wl);
+       if (!status) {
+               wiphy_err(wl->wiphy, "wl: brcms_remove: wlc_chipmatch "
+                                    "failed\n");
+               return;
+       }
+       if (wl->wlc) {
+               wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, false);
+               wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy);
+               ieee80211_unregister_hw(hw);
+               LOCK(wl);
+               brcms_down(wl);
+               UNLOCK(wl);
+       }
+       pci_disable_device(pdev);
+
+       brcms_free(wl);
+
+       pci_set_drvdata(pdev, NULL);
+       ieee80211_free_hw(hw);
+}
+
+static struct pci_driver brcms_pci_driver = {
+       .name     = KBUILD_MODNAME,
+       .probe    = brcms_pci_probe,
+       .suspend  = brcms_suspend,
+       .resume   = brcms_resume,
+       .remove   = __devexit_p(brcms_remove),
+       .id_table = brcms_pci_id_table,
+};
+
+/**
+ * This is the main entry point for the WL driver.
+ *
+ * This function determines if a device pointed to by pdev is a WL device,
+ * and if so, performs a brcms_attach() on it.
+ *
+ */
+static int __init brcms_module_init(void)
+{
+       int error = -ENODEV;
+
+#ifdef BCMDBG
+       if (msglevel != 0xdeadbeef)
+               brcm_msg_level = msglevel;
+       else {
+               char *var = getvar(NULL, "wl_msglevel");
+               if (var) {
+                       unsigned long value;
+
+                       (void)strict_strtoul(var, 0, &value);
+                       brcm_msg_level = value;
+               }
+       }
+       if (phymsglevel != 0xdeadbeef)
+               phyhal_msg_level = phymsglevel;
+       else {
+               char *var = getvar(NULL, "phy_msglevel");
+               if (var) {
+                       unsigned long value;
+
+                       (void)strict_strtoul(var, 0, &value);
+                       phyhal_msg_level = value;
+               }
+       }
+#endif                         /* BCMDBG */
+
+       error = pci_register_driver(&brcms_pci_driver);
+       if (!error)
+               return 0;
+
+
+
+       return error;
+}
+
+/**
+ * This function unloads the WL driver from the system.
+ *
+ * This function unconditionally unloads the WL driver module from the
+ * system.
+ *
+ */
+static void __exit brcms_module_exit(void)
+{
+       pci_unregister_driver(&brcms_pci_driver);
+
+}
+
+module_init(brcms_module_init);
+module_exit(brcms_module_exit);
+
+/**
+ * This function frees the WL per-device resources.
+ *
+ * This function frees resources owned by the WL device pointed to
+ * by the wl parameter.
+ *
+ * precondition: can both be called locked and unlocked
+ *
+ */
+static void brcms_free(struct brcms_info *wl)
+{
+       struct brcms_timer *t, *next;
+
+       /* free ucode data */
+       if (wl->fw.fw_cnt)
+               brcms_ucode_data_free();
+       if (wl->irq)
+               free_irq(wl->irq, wl);
+
+       /* kill dpc */
+       tasklet_kill(&wl->tasklet);
+
+       if (wl->pub) {
+               wlc_module_unregister(wl->pub, "linux", wl);
+       }
+
+       /* free common resources */
+       if (wl->wlc) {
+               wlc_detach(wl->wlc);
+               wl->wlc = NULL;
+               wl->pub = NULL;
+       }
+
+       /* virtual interface deletion is deferred so we cannot spinwait */
+
+       /* wait for all pending callbacks to complete */
+       while (atomic_read(&wl->callbacks) > 0)
+               schedule();
+
+       /* free timers */
+       for (t = wl->timers; t; t = next) {
+               next = t->next;
+#ifdef BCMDBG
+               kfree(t->name);
+#endif
+               kfree(t);
+       }
+
+       /*
+        * unregister_netdev() calls get_stats() which may read chip registers
+        * so we cannot unmap the chip registers until after calling unregister_netdev() .
+        */
+       if (wl->regsva && wl->bcm_bustype != SDIO_BUS &&
+           wl->bcm_bustype != JTAG_BUS) {
+               iounmap((void *)wl->regsva);
+       }
+       wl->regsva = NULL;
+}
+
+/* flags the given rate in rateset as requested */
+static void brcms_set_basic_rate(struct wl_rateset *rs, u16 rate, bool is_br)
+{
+       u32 i;
+
+       for (i = 0; i < rs->count; i++) {
+               if (rate != (rs->rates[i] & 0x7f))
+                       continue;
+
+               if (is_br)
+                       rs->rates[i] |= WLC_RATE_FLAG;
+               else
+                       rs->rates[i] &= WLC_RATE_MASK;
+               return;
+       }
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+void brcms_txflowcontrol(struct brcms_info *wl, struct brcms_if *wlif,
+                        bool state, int prio)
+{
+       wiphy_err(wl->wiphy, "Shouldn't be here %s\n", __func__);
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+void brcms_init(struct brcms_info *wl)
+{
+       BCMMSG(WL_TO_HW(wl)->wiphy, "wl%d\n", wl->pub->unit);
+       brcms_reset(wl);
+
+       wlc_init(wl->wlc);
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+uint brcms_reset(struct brcms_info *wl)
+{
+       BCMMSG(WL_TO_HW(wl)->wiphy, "wl%d\n", wl->pub->unit);
+       wlc_reset(wl->wlc);
+
+       /* dpc will not be rescheduled */
+       wl->resched = 0;
+
+       return 0;
+}
+
+/*
+ * These are interrupt on/off entry points. Disable interrupts
+ * during interrupt state transition.
+ */
+void brcms_intrson(struct brcms_info *wl)
+{
+       unsigned long flags;
+
+       INT_LOCK(wl, flags);
+       wlc_intrson(wl->wlc);
+       INT_UNLOCK(wl, flags);
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+bool wl_alloc_dma_resources(struct brcms_info *wl, uint addrwidth)
+{
+       return true;
+}
+
+u32 brcms_intrsoff(struct brcms_info *wl)
+{
+       unsigned long flags;
+       u32 status;
+
+       INT_LOCK(wl, flags);
+       status = wlc_intrsoff(wl->wlc);
+       INT_UNLOCK(wl, flags);
+       return status;
+}
+
+void brcms_intrsrestore(struct brcms_info *wl, u32 macintmask)
+{
+       unsigned long flags;
+
+       INT_LOCK(wl, flags);
+       wlc_intrsrestore(wl->wlc, macintmask);
+       INT_UNLOCK(wl, flags);
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+int brcms_up(struct brcms_info *wl)
+{
+       int error = 0;
+
+       if (wl->pub->up)
+               return 0;
+
+       error = wlc_up(wl->wlc);
+
+       return error;
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+void brcms_down(struct brcms_info *wl)
+{
+       uint callbacks, ret_val = 0;
+
+       /* call common down function */
+       ret_val = wlc_down(wl->wlc);
+       callbacks = atomic_read(&wl->callbacks) - ret_val;
+
+       /* wait for down callbacks to complete */
+       UNLOCK(wl);
+
+       /* For HIGH_only driver, it's important to actually schedule other work,
+        * not just spin wait since everything runs at schedule level
+        */
+       SPINWAIT((atomic_read(&wl->callbacks) > callbacks), 100 * 1000);
+
+       LOCK(wl);
+}
+
+static irqreturn_t brcms_isr(int irq, void *dev_id)
+{
+       struct brcms_info *wl;
+       bool ours, wantdpc;
+       unsigned long flags;
+
+       wl = (struct brcms_info *) dev_id;
+
+       ISR_LOCK(wl, flags);
+
+       /* call common first level interrupt handler */
+       ours = wlc_isr(wl->wlc, &wantdpc);
+       if (ours) {
+               /* if more to do... */
+               if (wantdpc) {
+
+                       /* ...and call the second level interrupt handler */
+                       /* schedule dpc */
+                       tasklet_schedule(&wl->tasklet);
+               }
+       }
+
+       ISR_UNLOCK(wl, flags);
+
+       return IRQ_RETVAL(ours);
+}
+
+static void brcms_dpc(unsigned long data)
+{
+       struct brcms_info *wl;
+
+       wl = (struct brcms_info *) data;
+
+       LOCK(wl);
+
+       /* call the common second level interrupt handler */
+       if (wl->pub->up) {
+               if (wl->resched) {
+                       unsigned long flags;
+
+                       INT_LOCK(wl, flags);
+                       wlc_intrsupd(wl->wlc);
+                       INT_UNLOCK(wl, flags);
+               }
+
+               wl->resched = wlc_dpc(wl->wlc, true);
+       }
+
+       /* wlc_dpc() may bring the driver down */
+       if (!wl->pub->up)
+               goto done;
+
+       /* re-schedule dpc */
+       if (wl->resched)
+               tasklet_schedule(&wl->tasklet);
+       else {
+               /* re-enable interrupts */
+               brcms_intrson(wl);
+       }
+
+ done:
+       UNLOCK(wl);
+}
+
+/*
+ * is called by the kernel from software irq context
+ */
+static void brcms_timer(unsigned long data)
+{
+       _brcms_timer((struct brcms_timer *) data);
+}
+
+/*
+* precondition: perimeter lock is not acquired
+ */
+static void _brcms_timer(struct brcms_timer *t)
+{
+       LOCK(t->wl);
+
+       if (t->set) {
+               if (t->periodic) {
+                       t->timer.expires = jiffies + t->ms * HZ / 1000;
+                       atomic_inc(&t->wl->callbacks);
+                       add_timer(&t->timer);
+                       t->set = true;
+               } else
+                       t->set = false;
+
+               t->fn(t->arg);
+       }
+
+       atomic_dec(&t->wl->callbacks);
+
+       UNLOCK(t->wl);
+}
+
+/*
+ * Adds a timer to the list. Caller supplies a timer function.
+ * Is called from wlc.
+ *
+ * precondition: perimeter lock has been acquired
+ */
+struct brcms_timer *brcms_init_timer(struct brcms_info *wl,
+                                    void (*fn) (void *arg),
+                                    void *arg, const char *name)
+{
+       struct brcms_timer *t;
+
+       t = kzalloc(sizeof(struct brcms_timer), GFP_ATOMIC);
+       if (!t) {
+               wiphy_err(wl->wiphy, "wl%d: brcms_init_timer: out of memory\n",
+                         wl->pub->unit);
+               return 0;
+       }
+
+       init_timer(&t->timer);
+       t->timer.data = (unsigned long) t;
+       t->timer.function = brcms_timer;
+       t->wl = wl;
+       t->fn = fn;
+       t->arg = arg;
+       t->next = wl->timers;
+       wl->timers = t;
+
+#ifdef BCMDBG
+       t->name = kmalloc(strlen(name) + 1, GFP_ATOMIC);
+       if (t->name)
+               strcpy(t->name, name);
+#endif
+
+       return t;
+}
+
+/* BMAC_NOTE: Add timer adds only the kernel timer since it's going to be more accurate
+ * as well as it's easier to make it periodic
+ *
+ * precondition: perimeter lock has been acquired
+ */
+void brcms_add_timer(struct brcms_info *wl, struct brcms_timer *t, uint ms,
+                    int periodic)
+{
+#ifdef BCMDBG
+       if (t->set) {
+               wiphy_err(wl->wiphy, "%s: Already set. Name: %s, per %d\n",
+                         __func__, t->name, periodic);
+       }
+#endif
+       t->ms = ms;
+       t->periodic = (bool) periodic;
+       t->set = true;
+       t->timer.expires = jiffies + ms * HZ / 1000;
+
+       atomic_inc(&wl->callbacks);
+       add_timer(&t->timer);
+}
+
+/*
+ * return true if timer successfully deleted, false if still pending
+ *
+ * precondition: perimeter lock has been acquired
+ */
+bool brcms_del_timer(struct brcms_info *wl, struct brcms_timer *t)
+{
+       if (t->set) {
+               t->set = false;
+               if (!del_timer(&t->timer)) {
+                       return false;
+               }
+               atomic_dec(&wl->callbacks);
+       }
+
+       return true;
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+void brcms_free_timer(struct brcms_info *wl, struct brcms_timer *t)
+{
+       struct brcms_timer *tmp;
+
+       /* delete the timer in case it is active */
+       brcms_del_timer(wl, t);
+
+       if (wl->timers == t) {
+               wl->timers = wl->timers->next;
+#ifdef BCMDBG
+               kfree(t->name);
+#endif
+               kfree(t);
+               return;
+
+       }
+
+       tmp = wl->timers;
+       while (tmp) {
+               if (tmp->next == t) {
+                       tmp->next = t->next;
+#ifdef BCMDBG
+                       kfree(t->name);
+#endif
+                       kfree(t);
+                       return;
+               }
+               tmp = tmp->next;
+       }
+
+}
+
+/*
+ * runs in software irq context
+ *
+ * precondition: perimeter lock is not acquired
+ */
+static int wl_linux_watchdog(void *ctx)
+{
+       return 0;
+}
+
+struct firmware_hdr {
+       u32 offset;
+       u32 len;
+       u32 idx;
+};
+
+char *brcms_firmwares[MAX_FW_IMAGES] = {
+       "brcm/bcm43xx",
+       NULL
+};
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)
+{
+       int i, entry;
+       const u8 *pdata;
+       struct firmware_hdr *hdr;
+       for (i = 0; i < wl->fw.fw_cnt; i++) {
+               hdr = (struct firmware_hdr *)wl->fw.fw_hdr[i]->data;
+               for (entry = 0; entry < wl->fw.hdr_num_entries[i];
+                    entry++, hdr++) {
+                       if (hdr->idx == idx) {
+                               pdata = wl->fw.fw_bin[i]->data + hdr->offset;
+                               *pbuf = kmalloc(hdr->len, GFP_ATOMIC);
+                               if (*pbuf == NULL) {
+                                       wiphy_err(wl->wiphy, "fail to alloc %d"
+                                                 " bytes\n", hdr->len);
+                                       goto fail;
+                               }
+                               memcpy(*pbuf, pdata, hdr->len);
+                               return 0;
+                       }
+               }
+       }
+       wiphy_err(wl->wiphy, "ERROR: ucode buf tag:%d can not be found!\n",
+                 idx);
+       *pbuf = NULL;
+fail:
+       return -ENODATA;
+}
+
+/*
+ * Precondition: Since this function is called in brcms_pci_probe() context,
+ * no locking is required.
+ */
+int brcms_ucode_init_uint(struct brcms_info *wl, u32 *data, u32 idx)
+{
+       int i, entry;
+       const u8 *pdata;
+       struct firmware_hdr *hdr;
+       for (i = 0; i < wl->fw.fw_cnt; i++) {
+               hdr = (struct firmware_hdr *)wl->fw.fw_hdr[i]->data;
+               for (entry = 0; entry < wl->fw.hdr_num_entries[i];
+                    entry++, hdr++) {
+                       if (hdr->idx == idx) {
+                               pdata = wl->fw.fw_bin[i]->data + hdr->offset;
+                               if (hdr->len != 4) {
+                                       wiphy_err(wl->wiphy,
+                                                 "ERROR: fw hdr len\n");
+                                       return -ENOMSG;
+                               }
+                               *data = *((u32 *) pdata);
+                               return 0;
+                       }
+               }
+       }
+       wiphy_err(wl->wiphy, "ERROR: ucode tag:%d can not be found!\n", idx);
+       return -ENOMSG;
+}
+
+/*
+ * Precondition: Since this function is called in brcms_pci_probe() context,
+ * no locking is required.
+ */
+static int brcms_request_fw(struct brcms_info *wl, struct pci_dev *pdev)
+{
+       int status;
+       struct device *device = &pdev->dev;
+       char fw_name[100];
+       int i;
+
+       memset((void *)&wl->fw, 0, sizeof(struct brcms_firmware));
+       for (i = 0; i < MAX_FW_IMAGES; i++) {
+               if (brcms_firmwares[i] == NULL)
+                       break;
+               sprintf(fw_name, "%s-%d.fw", brcms_firmwares[i],
+                       UCODE_LOADER_API_VER);
+               status = request_firmware(&wl->fw.fw_bin[i], fw_name, device);
+               if (status) {
+                       wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n",
+                                 KBUILD_MODNAME, fw_name);
+                       return status;
+               }
+               sprintf(fw_name, "%s_hdr-%d.fw", brcms_firmwares[i],
+                       UCODE_LOADER_API_VER);
+               status = request_firmware(&wl->fw.fw_hdr[i], fw_name, device);
+               if (status) {
+                       wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n",
+                                 KBUILD_MODNAME, fw_name);
+                       return status;
+               }
+               wl->fw.hdr_num_entries[i] =
+                   wl->fw.fw_hdr[i]->size / (sizeof(struct firmware_hdr));
+       }
+       wl->fw.fw_cnt = i;
+       return brcms_ucode_data_init(wl);
+}
+
+/*
+ * precondition: can both be called locked and unlocked
+ */
+void brcms_ucode_free_buf(void *p)
+{
+       kfree(p);
+}
+
+/*
+ * Precondition: Since this function is called in brcms_pci_probe() context,
+ * no locking is required.
+ */
+static void brcms_release_fw(struct brcms_info *wl)
+{
+       int i;
+       for (i = 0; i < MAX_FW_IMAGES; i++) {
+               release_firmware(wl->fw.fw_bin[i]);
+               release_firmware(wl->fw.fw_hdr[i]);
+       }
+}
+
+
+/*
+ * checks validity of all firmware images loaded from user space
+ *
+ * Precondition: Since this function is called in brcms_pci_probe() context,
+ * no locking is required.
+ */
+int brcms_check_firmwares(struct brcms_info *wl)
+{
+       int i;
+       int entry;
+       int rc = 0;
+       const struct firmware *fw;
+       const struct firmware *fw_hdr;
+       struct firmware_hdr *ucode_hdr;
+       for (i = 0; i < MAX_FW_IMAGES && rc == 0; i++) {
+               fw =  wl->fw.fw_bin[i];
+               fw_hdr = wl->fw.fw_hdr[i];
+               if (fw == NULL && fw_hdr == NULL) {
+                       break;
+               } else if (fw == NULL || fw_hdr == NULL) {
+                       wiphy_err(wl->wiphy, "%s: invalid bin/hdr fw\n",
+                                 __func__);
+                       rc = -EBADF;
+               } else if (fw_hdr->size % sizeof(struct firmware_hdr)) {
+                       wiphy_err(wl->wiphy, "%s: non integral fw hdr file "
+                               "size %zu/%zu\n", __func__, fw_hdr->size,
+                               sizeof(struct firmware_hdr));
+                       rc = -EBADF;
+               } else if (fw->size < MIN_FW_SIZE || fw->size > MAX_FW_SIZE) {
+                       wiphy_err(wl->wiphy, "%s: out of bounds fw file size "
+                                 "%zu\n", __func__, fw->size);
+                       rc = -EBADF;
+               } else {
+                       /* check if ucode section overruns firmware image */
+                       ucode_hdr = (struct firmware_hdr *)fw_hdr->data;
+                       for (entry = 0; entry < wl->fw.hdr_num_entries[i] &&
+                            !rc; entry++, ucode_hdr++) {
+                               if (ucode_hdr->offset + ucode_hdr->len >
+                                   fw->size) {
+                                       wiphy_err(wl->wiphy,
+                                                 "%s: conflicting bin/hdr\n",
+                                                 __func__);
+                                       rc = -EBADF;
+                               }
+                       }
+               }
+       }
+       if (rc == 0 && wl->fw.fw_cnt != i) {
+               wiphy_err(wl->wiphy, "%s: invalid fw_cnt=%d\n", __func__,
+                       wl->fw.fw_cnt);
+               rc = -EBADF;
+       }
+       return rc;
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+bool brcms_rfkill_set_hw_state(struct brcms_info *wl)
+{
+       bool blocked = wlc_check_radio_disabled(wl->wlc);
+
+       UNLOCK(wl);
+       wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, blocked);
+       if (blocked)
+               wiphy_rfkill_start_polling(wl->pub->ieee_hw->wiphy);
+       LOCK(wl);
+       return blocked;
+}
+
+/*
+ * precondition: perimeter lock has been acquired
+ */
+void brcms_msleep(struct brcms_info *wl, uint ms)
+{
+       UNLOCK(wl);
+       msleep(ms);
+       LOCK(wl);
+}
diff --git a/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h b/drivers/staging/brcm80211/brcmsmac/brcms_mac80211.h
new file mode 100644 (file)
index 0000000..48ec6b0
--- /dev/null
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2010 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _wl_mac80211_h_
+#define _wl_mac80211_h_
+
+/* softmac ioctl definitions */
+#define WLC_SET_SHORTSLOT_OVERRIDE             146
+
+
+/* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and
+ * sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be
+ * submitted to workqueue instead of being on kernel timer
+ */
+struct brcms_timer {
+       struct timer_list timer;
+       struct brcms_info *wl;
+       void (*fn) (void *);
+       void *arg;              /* argument to fn */
+       uint ms;
+       bool periodic;
+       bool set;
+       struct brcms_timer *next;
+#ifdef BCMDBG
+       char *name;             /* Description of the timer */
+#endif
+};
+
+struct brcms_if {
+       uint subunit;           /* WDS/BSS unit */
+       struct pci_dev *pci_dev;
+};
+
+#define MAX_FW_IMAGES          4
+struct brcms_firmware {
+       u32 fw_cnt;
+       const struct firmware *fw_bin[MAX_FW_IMAGES];
+       const struct firmware *fw_hdr[MAX_FW_IMAGES];
+       u32 hdr_num_entries[MAX_FW_IMAGES];
+};
+
+struct brcms_info {
+       struct wlc_pub *pub;            /* pointer to public wlc state */
+       void *wlc;              /* pointer to private common os-independent data */
+       u32 magic;
+
+       int irq;
+
+       spinlock_t lock;        /* per-device perimeter lock */
+       spinlock_t isr_lock;    /* per-device ISR synchronization lock */
+
+       /* bus type and regsva for unmap in brcms_free() */
+       uint bcm_bustype;       /* bus type */
+       void *regsva;           /* opaque chip registers virtual address */
+
+       /* timer related fields */
+       atomic_t callbacks;     /* # outstanding callback functions */
+       struct brcms_timer *timers;     /* timer cleanup queue */
+
+       struct tasklet_struct tasklet;  /* dpc tasklet */
+       bool resched;           /* dpc needs to be and is rescheduled */
+#ifdef LINUXSTA_PS
+       u32 pci_psstate[16];    /* pci ps-state save/restore */
+#endif
+       struct brcms_firmware fw;
+       struct wiphy *wiphy;
+};
+#endif                         /* _wl_mac80211_h_ */
diff --git a/drivers/staging/brcm80211/brcmsmac/ucode_loader.c b/drivers/staging/brcm80211/brcmsmac/ucode_loader.c
new file mode 100644 (file)
index 0000000..d38f124
--- /dev/null
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2010 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <linux/types.h>
+#include <bcmdefs.h>
+#include <ucode_loader.h>
+
+enum {
+       D11UCODE_NAMETAG_START = 0,
+       D11LCN0BSINITVALS24,
+       D11LCN0INITVALS24,
+       D11LCN1BSINITVALS24,
+       D11LCN1INITVALS24,
+       D11LCN2BSINITVALS24,
+       D11LCN2INITVALS24,
+       D11N0ABSINITVALS16,
+       D11N0BSINITVALS16,
+       D11N0INITVALS16,
+       D11UCODE_OVERSIGHT16_MIMO,
+       D11UCODE_OVERSIGHT16_MIMOSZ,
+       D11UCODE_OVERSIGHT24_LCN,
+       D11UCODE_OVERSIGHT24_LCNSZ,
+       D11UCODE_OVERSIGHT_BOMMAJOR,
+       D11UCODE_OVERSIGHT_BOMMINOR
+};
+
+struct d11init *d11lcn0bsinitvals24;
+struct d11init *d11lcn0initvals24;
+struct d11init *d11lcn1bsinitvals24;
+struct d11init *d11lcn1initvals24;
+struct d11init *d11lcn2bsinitvals24;
+struct d11init *d11lcn2initvals24;
+struct d11init *d11n0absinitvals16;
+struct d11init *d11n0bsinitvals16;
+struct d11init *d11n0initvals16;
+u32 *bcm43xx_16_mimo;
+u32 bcm43xx_16_mimosz;
+u32 *bcm43xx_24_lcn;
+u32 bcm43xx_24_lcnsz;
+u32 *bcm43xx_bommajor;
+u32 *bcm43xx_bomminor;
+
+int brcms_ucode_data_init(struct brcms_info *wl)
+{
+       int rc;
+       rc = brcms_check_firmwares(wl);
+
+       rc = rc < 0 ? rc :
+               brcms_ucode_init_buf(wl, (void **)&d11lcn0bsinitvals24,
+                                    D11LCN0BSINITVALS24);
+       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn0initvals24,
+                                            D11LCN0INITVALS24);
+       rc = rc < 0 ? rc :
+               brcms_ucode_init_buf(wl, (void **)&d11lcn1bsinitvals24,
+                                    D11LCN1BSINITVALS24);
+       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn1initvals24,
+                                            D11LCN1INITVALS24);
+       rc = rc < 0 ? rc :
+               brcms_ucode_init_buf(wl, (void **)&d11lcn2bsinitvals24,
+                                    D11LCN2BSINITVALS24);
+       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn2initvals24,
+                                            D11LCN2INITVALS24);
+       rc = rc < 0 ? rc :
+               brcms_ucode_init_buf(wl, (void **)&d11n0absinitvals16,
+                                    D11N0ABSINITVALS16);
+       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11n0bsinitvals16,
+                                            D11N0BSINITVALS16);
+       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11n0initvals16,
+                                            D11N0INITVALS16);
+       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_16_mimo,
+                                            D11UCODE_OVERSIGHT16_MIMO);
+       rc = rc < 0 ? rc : brcms_ucode_init_uint(wl, &bcm43xx_16_mimosz,
+                                             D11UCODE_OVERSIGHT16_MIMOSZ);
+       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_24_lcn,
+                                            D11UCODE_OVERSIGHT24_LCN);
+       rc = rc < 0 ? rc : brcms_ucode_init_uint(wl, &bcm43xx_24_lcnsz,
+                                             D11UCODE_OVERSIGHT24_LCNSZ);
+       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_bommajor,
+                                            D11UCODE_OVERSIGHT_BOMMAJOR);
+       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_bomminor,
+                                            D11UCODE_OVERSIGHT_BOMMINOR);
+       return rc;
+}
+
+void brcms_ucode_data_free(void)
+{
+       brcms_ucode_free_buf((void *)d11lcn0bsinitvals24);
+       brcms_ucode_free_buf((void *)d11lcn0initvals24);
+       brcms_ucode_free_buf((void *)d11lcn1bsinitvals24);
+       brcms_ucode_free_buf((void *)d11lcn1initvals24);
+       brcms_ucode_free_buf((void *)d11lcn2bsinitvals24);
+       brcms_ucode_free_buf((void *)d11lcn2initvals24);
+       brcms_ucode_free_buf((void *)d11n0absinitvals16);
+       brcms_ucode_free_buf((void *)d11n0bsinitvals16);
+       brcms_ucode_free_buf((void *)d11n0initvals16);
+       brcms_ucode_free_buf((void *)bcm43xx_16_mimo);
+       brcms_ucode_free_buf((void *)bcm43xx_24_lcn);
+       brcms_ucode_free_buf((void *)bcm43xx_bommajor);
+       brcms_ucode_free_buf((void *)bcm43xx_bomminor);
+
+       return;
+}
diff --git a/drivers/staging/brcm80211/brcmsmac/ucode_loader.h b/drivers/staging/brcm80211/brcmsmac/ucode_loader.h
new file mode 100644 (file)
index 0000000..4b90121
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2010 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "wlc_types.h"         /* forward structure declarations */
+
+#define MIN_FW_SIZE 40000      /* minimum firmware file size in bytes */
+#define MAX_FW_SIZE 150000
+
+#define UCODE_LOADER_API_VER 0
+
+struct d11init {
+       u16 addr;
+       u16 size;
+       u32 value;
+};
+
+extern struct d11init *d11lcn0bsinitvals24;
+extern struct d11init *d11lcn0initvals24;
+extern struct d11init *d11lcn1bsinitvals24;
+extern struct d11init *d11lcn1initvals24;
+extern struct d11init *d11lcn2bsinitvals24;
+extern struct d11init *d11lcn2initvals24;
+extern struct d11init *d11n0absinitvals16;
+extern struct d11init *d11n0bsinitvals16;
+extern struct d11init *d11n0initvals16;
+extern u32 *bcm43xx_16_mimo;
+extern u32 bcm43xx_16_mimosz;
+extern u32 *bcm43xx_24_lcn;
+extern u32 bcm43xx_24_lcnsz;
+
+extern int brcms_ucode_data_init(struct brcms_info *wl);
+extern void brcms_ucode_data_free(void);
+
+extern int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf,
+                               unsigned int idx);
+extern int brcms_ucode_init_uint(struct brcms_info *wl, unsigned *data,
+                             unsigned int idx);
+extern void brcms_ucode_free_buf(void *);
+extern int  brcms_check_firmwares(struct brcms_info *wl);
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
deleted file mode 100644 (file)
index cc2ed78..0000000
+++ /dev/null
@@ -1,1966 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define __UNDEF_NO_VERSION__
-
-#include <linux/kernel.h>
-#include <linux/etherdevice.h>
-#include <linux/types.h>
-#include <linux/pci_ids.h>
-#include <linux/module.h>
-#include <linux/pci.h>
-#include <linux/sched.h>
-#include <linux/firmware.h>
-#include <net/mac80211.h>
-#include <bcmdefs.h>
-#include <bcmwifi.h>
-#include <bcmutils.h>
-#include <bcmnvram.h>
-#include <nicpci.h>
-#include "bcmdma.h"
-
-#include "phy/wlc_phy_int.h"
-#include "d11.h"
-#include "wlc_types.h"
-#include "wlc_cfg.h"
-#include "wlc_key.h"
-#include "wlc_channel.h"
-#include "wlc_scb.h"
-#include "wlc_pub.h"
-#include "wl_dbg.h"
-#include "wl_export.h"
-#include "wl_ucode.h"
-#include "wl_mac80211.h"
-
-#define N_TX_QUEUES    4 /* #tx queues on mac80211<->driver interface */
-
-#define LOCK(wl)       spin_lock_bh(&(wl)->lock)
-#define UNLOCK(wl)     spin_unlock_bh(&(wl)->lock)
-
-/* locking from inside brcms_isr */
-#define ISR_LOCK(wl, flags)\
-       do {\
-               spin_lock(&(wl)->isr_lock);\
-               (void)(flags); } \
-       while (0)
-
-#define ISR_UNLOCK(wl, flags)\
-       do {\
-               spin_unlock(&(wl)->isr_lock);\
-               (void)(flags); } \
-       while (0)
-
-/* locking under LOCK() to synchronize with brcms_isr */
-#define INT_LOCK(wl, flags)    spin_lock_irqsave(&(wl)->isr_lock, flags)
-#define INT_UNLOCK(wl, flags)  spin_unlock_irqrestore(&(wl)->isr_lock, flags)
-
-static void brcms_timer(unsigned long data);
-static void _brcms_timer(struct brcms_timer *t);
-
-
-static int ieee_hw_init(struct ieee80211_hw *hw);
-static int ieee_hw_rate_init(struct ieee80211_hw *hw);
-
-static int wl_linux_watchdog(void *ctx);
-
-/* Flags we support */
-#define MAC_FILTERS (FIF_PROMISC_IN_BSS | \
-       FIF_ALLMULTI | \
-       FIF_FCSFAIL | \
-       FIF_PLCPFAIL | \
-       FIF_CONTROL | \
-       FIF_OTHER_BSS | \
-       FIF_BCN_PRBRESP_PROMISC)
-
-static int n_adapters_found;
-
-static int brcms_request_fw(struct brcms_info *wl, struct pci_dev *pdev);
-static void brcms_release_fw(struct brcms_info *wl);
-
-/* local prototypes */
-static void brcms_dpc(unsigned long data);
-static irqreturn_t brcms_isr(int irq, void *dev_id);
-
-static int __devinit brcms_pci_probe(struct pci_dev *pdev,
-                                 const struct pci_device_id *ent);
-static void brcms_remove(struct pci_dev *pdev);
-static void brcms_free(struct brcms_info *wl);
-static void brcms_set_basic_rate(struct wl_rateset *rs, u16 rate, bool is_br);
-
-MODULE_AUTHOR("Broadcom Corporation");
-MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
-MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
-MODULE_LICENSE("Dual BSD/GPL");
-
-/* recognized PCI IDs */
-static DEFINE_PCI_DEVICE_TABLE(brcms_pci_id_table) = {
-       {PCI_VENDOR_ID_BROADCOM, 0x4357, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},      /* 43225 2G */
-       {PCI_VENDOR_ID_BROADCOM, 0x4353, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},      /* 43224 DUAL */
-       {PCI_VENDOR_ID_BROADCOM, 0x4727, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},      /* 4313 DUAL */
-       /* 43224 Ven */
-       {PCI_VENDOR_ID_BROADCOM, 0x0576, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       {0}
-};
-
-MODULE_DEVICE_TABLE(pci, brcms_pci_id_table);
-
-#ifdef BCMDBG
-static int msglevel = 0xdeadbeef;
-module_param(msglevel, int, 0);
-static int phymsglevel = 0xdeadbeef;
-module_param(phymsglevel, int, 0);
-#endif                         /* BCMDBG */
-
-#define HW_TO_WL(hw)    (hw->priv)
-#define WL_TO_HW(wl)     (wl->pub->ieee_hw)
-
-/* MAC80211 callback functions */
-static int brcms_ops_start(struct ieee80211_hw *hw);
-static void brcms_ops_stop(struct ieee80211_hw *hw);
-static int brcms_ops_add_interface(struct ieee80211_hw *hw,
-                               struct ieee80211_vif *vif);
-static void brcms_ops_remove_interface(struct ieee80211_hw *hw,
-                                   struct ieee80211_vif *vif);
-static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed);
-static void brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
-                                   struct ieee80211_vif *vif,
-                                   struct ieee80211_bss_conf *info,
-                                   u32 changed);
-static void brcms_ops_configure_filter(struct ieee80211_hw *hw,
-                                   unsigned int changed_flags,
-                                   unsigned int *total_flags, u64 multicast);
-static int brcms_ops_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
-                         bool set);
-static void brcms_ops_sw_scan_start(struct ieee80211_hw *hw);
-static void brcms_ops_sw_scan_complete(struct ieee80211_hw *hw);
-static void brcms_ops_set_tsf(struct ieee80211_hw *hw, u64 tsf);
-static int brcms_ops_get_stats(struct ieee80211_hw *hw,
-                           struct ieee80211_low_level_stats *stats);
-static void brcms_ops_sta_notify(struct ieee80211_hw *hw,
-                             struct ieee80211_vif *vif,
-                             enum sta_notify_cmd cmd,
-                             struct ieee80211_sta *sta);
-static int brcms_ops_conf_tx(struct ieee80211_hw *hw, u16 queue,
-                         const struct ieee80211_tx_queue_params *params);
-static u64 brcms_ops_get_tsf(struct ieee80211_hw *hw);
-static int brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                     struct ieee80211_sta *sta);
-static int brcms_ops_sta_remove(struct ieee80211_hw *hw,
-                               struct ieee80211_vif *vif,
-                               struct ieee80211_sta *sta);
-static int brcms_ops_ampdu_action(struct ieee80211_hw *hw,
-                              struct ieee80211_vif *vif,
-                              enum ieee80211_ampdu_mlme_action action,
-                              struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                              u8 buf_size);
-static void brcms_ops_rfkill_poll(struct ieee80211_hw *hw);
-static void brcms_ops_flush(struct ieee80211_hw *hw, bool drop);
-
-static void brcms_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
-{
-       struct brcms_info *wl = hw->priv;
-
-       LOCK(wl);
-       if (!wl->pub->up) {
-               wiphy_err(wl->wiphy, "ops->tx called while down\n");
-               kfree_skb(skb);
-               goto done;
-       }
-       wlc_sendpkt_mac80211(wl->wlc, skb, hw);
- done:
-       UNLOCK(wl);
-}
-
-static int brcms_ops_start(struct ieee80211_hw *hw)
-{
-       struct brcms_info *wl = hw->priv;
-       bool blocked;
-       /*
-         struct ieee80211_channel *curchan = hw->conf.channel;
-       */
-
-       ieee80211_wake_queues(hw);
-       LOCK(wl);
-       blocked = brcms_rfkill_set_hw_state(wl);
-       UNLOCK(wl);
-       if (!blocked)
-               wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy);
-
-       return 0;
-}
-
-static void brcms_ops_stop(struct ieee80211_hw *hw)
-{
-       ieee80211_stop_queues(hw);
-}
-
-static int
-brcms_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-{
-       struct brcms_info *wl;
-       int err;
-
-       /* Just STA for now */
-       if (vif->type != NL80211_IFTYPE_AP &&
-           vif->type != NL80211_IFTYPE_MESH_POINT &&
-           vif->type != NL80211_IFTYPE_STATION &&
-           vif->type != NL80211_IFTYPE_WDS &&
-           vif->type != NL80211_IFTYPE_ADHOC) {
-               wiphy_err(hw->wiphy, "%s: Attempt to add type %d, only"
-                         " STA for now\n", __func__, vif->type);
-               return -EOPNOTSUPP;
-       }
-
-       wl = HW_TO_WL(hw);
-       LOCK(wl);
-       err = brcms_up(wl);
-       UNLOCK(wl);
-
-       if (err != 0) {
-               wiphy_err(hw->wiphy, "%s: brcms_up() returned %d\n", __func__,
-                         err);
-       }
-       return err;
-}
-
-static void
-brcms_ops_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-{
-       struct brcms_info *wl;
-
-       wl = HW_TO_WL(hw);
-
-       /* put driver in down state */
-       LOCK(wl);
-       brcms_down(wl);
-       UNLOCK(wl);
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-static int
-ieee_set_channel(struct ieee80211_hw *hw, struct ieee80211_channel *chan,
-                enum nl80211_channel_type type)
-{
-       struct brcms_info *wl = HW_TO_WL(hw);
-       int err = 0;
-
-       switch (type) {
-       case NL80211_CHAN_HT20:
-       case NL80211_CHAN_NO_HT:
-               err = wlc_set(wl->wlc, WLC_SET_CHANNEL, chan->hw_value);
-               break;
-       case NL80211_CHAN_HT40MINUS:
-       case NL80211_CHAN_HT40PLUS:
-               wiphy_err(hw->wiphy,
-                         "%s: Need to implement 40 Mhz Channels!\n", __func__);
-               err = 1;
-               break;
-       }
-
-       if (err)
-               return -EIO;
-       return err;
-}
-
-static int brcms_ops_config(struct ieee80211_hw *hw, u32 changed)
-{
-       struct ieee80211_conf *conf = &hw->conf;
-       struct brcms_info *wl = HW_TO_WL(hw);
-       int err = 0;
-       int new_int;
-       struct wiphy *wiphy = hw->wiphy;
-
-       LOCK(wl);
-       if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {
-               if (wlc_set_par(wl->wlc, IOV_BCN_LI_BCN, conf->listen_interval)
-                   < 0) {
-                       wiphy_err(wiphy, "%s: Error setting listen_interval\n",
-                                 __func__);
-                       err = -EIO;
-                       goto config_out;
-               }
-               wlc_get_par(wl->wlc, IOV_BCN_LI_BCN, &new_int);
-       }
-       if (changed & IEEE80211_CONF_CHANGE_MONITOR)
-               wiphy_err(wiphy, "%s: change monitor mode: %s (implement)\n",
-                         __func__, conf->flags & IEEE80211_CONF_MONITOR ?
-                         "true" : "false");
-       if (changed & IEEE80211_CONF_CHANGE_PS)
-               wiphy_err(wiphy, "%s: change power-save mode: %s (implement)\n",
-                         __func__, conf->flags & IEEE80211_CONF_PS ?
-                         "true" : "false");
-
-       if (changed & IEEE80211_CONF_CHANGE_POWER) {
-               if (wlc_set_par(wl->wlc, IOV_QTXPOWER, conf->power_level * 4)
-                               < 0) {
-                       wiphy_err(wiphy, "%s: Error setting power_level\n",
-                                 __func__);
-                       err = -EIO;
-                       goto config_out;
-               }
-               wlc_get_par(wl->wlc, IOV_QTXPOWER, &new_int);
-               if (new_int != (conf->power_level * 4))
-                       wiphy_err(wiphy, "%s: Power level req != actual, %d %d"
-                                 "\n", __func__, conf->power_level * 4,
-                                 new_int);
-       }
-       if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-               err = ieee_set_channel(hw, conf->channel, conf->channel_type);
-       }
-       if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) {
-               if (wlc_set
-                   (wl->wlc, WLC_SET_SRL,
-                    conf->short_frame_max_tx_count) < 0) {
-                       wiphy_err(wiphy, "%s: Error setting srl\n", __func__);
-                       err = -EIO;
-                       goto config_out;
-               }
-               if (wlc_set(wl->wlc, WLC_SET_LRL, conf->long_frame_max_tx_count)
-                   < 0) {
-                       wiphy_err(wiphy, "%s: Error setting lrl\n", __func__);
-                       err = -EIO;
-                       goto config_out;
-               }
-       }
-
- config_out:
-       UNLOCK(wl);
-       return err;
-}
-
-static void
-brcms_ops_bss_info_changed(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif,
-                       struct ieee80211_bss_conf *info, u32 changed)
-{
-       struct brcms_info *wl = HW_TO_WL(hw);
-       struct wiphy *wiphy = hw->wiphy;
-       int val;
-
-       if (changed & BSS_CHANGED_ASSOC) {
-               /* association status changed (associated/disassociated)
-                * also implies a change in the AID.
-                */
-               wiphy_err(wiphy, "%s: %s: %sassociated\n", KBUILD_MODNAME,
-                         __func__, info->assoc ? "" : "dis");
-               LOCK(wl);
-               wlc_associate_upd(wl->wlc, info->assoc);
-               UNLOCK(wl);
-       }
-       if (changed & BSS_CHANGED_ERP_SLOT) {
-               /* slot timing changed */
-               if (info->use_short_slot)
-                       val = 1;
-               else
-                       val = 0;
-               LOCK(wl);
-               wlc_set(wl->wlc, WLC_SET_SHORTSLOT_OVERRIDE, val);
-               UNLOCK(wl);
-       }
-
-       if (changed & BSS_CHANGED_HT) {
-               /* 802.11n parameters changed */
-               u16 mode = info->ht_operation_mode;
-
-               LOCK(wl);
-               wlc_protection_upd(wl->wlc, WLC_PROT_N_CFG,
-                       mode & IEEE80211_HT_OP_MODE_PROTECTION);
-               wlc_protection_upd(wl->wlc, WLC_PROT_N_NONGF,
-                       mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT);
-               wlc_protection_upd(wl->wlc, WLC_PROT_N_OBSS,
-                       mode & IEEE80211_HT_OP_MODE_NON_HT_STA_PRSNT);
-               UNLOCK(wl);
-       }
-       if (changed & BSS_CHANGED_BASIC_RATES) {
-               struct ieee80211_supported_band *bi;
-               u32 br_mask, i;
-               u16 rate;
-               struct wl_rateset rs;
-               int error;
-
-               /* retrieve the current rates */
-               LOCK(wl);
-               error = wlc_ioctl(wl->wlc, WLC_GET_CURR_RATESET,
-                                 &rs, sizeof(rs), NULL);
-               UNLOCK(wl);
-               if (error) {
-                       wiphy_err(wiphy, "%s: retrieve rateset failed: %d\n",
-                                 __func__, error);
-                       return;
-               }
-               br_mask = info->basic_rates;
-               bi = hw->wiphy->bands[wlc_get_curband(wl->wlc)];
-               for (i = 0; i < bi->n_bitrates; i++) {
-                       /* convert to internal rate value */
-                       rate = (bi->bitrates[i].bitrate << 1) / 10;
-
-                       /* set/clear basic rate flag */
-                       brcms_set_basic_rate(&rs, rate, br_mask & 1);
-                       br_mask >>= 1;
-               }
-
-               /* update the rate set */
-               LOCK(wl);
-               wlc_ioctl(wl->wlc, WLC_SET_RATESET, &rs, sizeof(rs), NULL);
-               UNLOCK(wl);
-       }
-       if (changed & BSS_CHANGED_BEACON_INT) {
-               /* Beacon interval changed */
-               LOCK(wl);
-               wlc_set(wl->wlc, WLC_SET_BCNPRD, info->beacon_int);
-               UNLOCK(wl);
-       }
-       if (changed & BSS_CHANGED_BSSID) {
-               /* BSSID changed, for whatever reason (IBSS and managed mode) */
-               LOCK(wl);
-               wlc_set_addrmatch(wl->wlc, RCM_BSSID_OFFSET,
-                                 info->bssid);
-               UNLOCK(wl);
-       }
-       if (changed & BSS_CHANGED_BEACON) {
-               /* Beacon data changed, retrieve new beacon (beaconing modes) */
-               wiphy_err(wiphy, "%s: beacon changed\n", __func__);
-       }
-       if (changed & BSS_CHANGED_BEACON_ENABLED) {
-               /* Beaconing should be enabled/disabled (beaconing modes) */
-               wiphy_err(wiphy, "%s: Beacon enabled: %s\n", __func__,
-                         info->enable_beacon ? "true" : "false");
-       }
-       if (changed & BSS_CHANGED_CQM) {
-               /* Connection quality monitor config changed */
-               wiphy_err(wiphy, "%s: cqm change: threshold %d, hys %d "
-                         " (implement)\n", __func__, info->cqm_rssi_thold,
-                         info->cqm_rssi_hyst);
-       }
-       if (changed & BSS_CHANGED_IBSS) {
-               /* IBSS join status changed */
-               wiphy_err(wiphy, "%s: IBSS joined: %s (implement)\n", __func__,
-                         info->ibss_joined ? "true" : "false");
-       }
-       if (changed & BSS_CHANGED_ARP_FILTER) {
-               /* Hardware ARP filter address list or state changed */
-               wiphy_err(wiphy, "%s: arp filtering: enabled %s, count %d"
-                         " (implement)\n", __func__, info->arp_filter_enabled ?
-                         "true" : "false", info->arp_addr_cnt);
-       }
-       if (changed & BSS_CHANGED_QOS) {
-               /*
-                * QoS for this association was enabled/disabled.
-                * Note that it is only ever disabled for station mode.
-                */
-               wiphy_err(wiphy, "%s: qos enabled: %s (implement)\n", __func__,
-                         info->qos ? "true" : "false");
-       }
-       if (changed & BSS_CHANGED_IDLE) {
-               /* Idle changed for this BSS/interface */
-               wiphy_err(wiphy, "%s: BSS idle: %s (implement)\n", __func__,
-                         info->idle ? "true" : "false");
-       }
-       return;
-}
-
-static void
-brcms_ops_configure_filter(struct ieee80211_hw *hw,
-                       unsigned int changed_flags,
-                       unsigned int *total_flags, u64 multicast)
-{
-       struct brcms_info *wl = hw->priv;
-       struct wiphy *wiphy = hw->wiphy;
-
-       changed_flags &= MAC_FILTERS;
-       *total_flags &= MAC_FILTERS;
-       if (changed_flags & FIF_PROMISC_IN_BSS)
-               wiphy_err(wiphy, "FIF_PROMISC_IN_BSS\n");
-       if (changed_flags & FIF_ALLMULTI)
-               wiphy_err(wiphy, "FIF_ALLMULTI\n");
-       if (changed_flags & FIF_FCSFAIL)
-               wiphy_err(wiphy, "FIF_FCSFAIL\n");
-       if (changed_flags & FIF_PLCPFAIL)
-               wiphy_err(wiphy, "FIF_PLCPFAIL\n");
-       if (changed_flags & FIF_CONTROL)
-               wiphy_err(wiphy, "FIF_CONTROL\n");
-       if (changed_flags & FIF_OTHER_BSS)
-               wiphy_err(wiphy, "FIF_OTHER_BSS\n");
-       if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
-               LOCK(wl);
-               if (*total_flags & FIF_BCN_PRBRESP_PROMISC) {
-                       wl->pub->mac80211_state |= MAC80211_PROMISC_BCNS;
-                       wlc_mac_bcn_promisc_change(wl->wlc, 1);
-               } else {
-                       wlc_mac_bcn_promisc_change(wl->wlc, 0);
-                       wl->pub->mac80211_state &= ~MAC80211_PROMISC_BCNS;
-               }
-               UNLOCK(wl);
-       }
-       return;
-}
-
-static int
-brcms_ops_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta, bool set)
-{
-       return 0;
-}
-
-static void brcms_ops_sw_scan_start(struct ieee80211_hw *hw)
-{
-       struct brcms_info *wl = hw->priv;
-       LOCK(wl);
-       wlc_scan_start(wl->wlc);
-       UNLOCK(wl);
-       return;
-}
-
-static void brcms_ops_sw_scan_complete(struct ieee80211_hw *hw)
-{
-       struct brcms_info *wl = hw->priv;
-       LOCK(wl);
-       wlc_scan_stop(wl->wlc);
-       UNLOCK(wl);
-       return;
-}
-
-static void brcms_ops_set_tsf(struct ieee80211_hw *hw, u64 tsf)
-{
-       wiphy_err(hw->wiphy, "%s: Enter\n", __func__);
-       return;
-}
-
-static int
-brcms_ops_get_stats(struct ieee80211_hw *hw,
-                struct ieee80211_low_level_stats *stats)
-{
-       struct brcms_info *wl = hw->priv;
-       struct wl_cnt *cnt;
-
-       LOCK(wl);
-       cnt = wl->pub->_cnt;
-       stats->dot11ACKFailureCount = 0;
-       stats->dot11RTSFailureCount = 0;
-       stats->dot11FCSErrorCount = 0;
-       stats->dot11RTSSuccessCount = 0;
-       UNLOCK(wl);
-       return 0;
-}
-
-static void
-brcms_ops_sta_notify(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                 enum sta_notify_cmd cmd, struct ieee80211_sta *sta)
-{
-       switch (cmd) {
-       default:
-               wiphy_err(hw->wiphy, "%s: Unknown cmd = %d\n", __func__,
-                         cmd);
-               break;
-       }
-       return;
-}
-
-static int
-brcms_ops_conf_tx(struct ieee80211_hw *hw, u16 queue,
-              const struct ieee80211_tx_queue_params *params)
-{
-       struct brcms_info *wl = hw->priv;
-
-       LOCK(wl);
-       wlc_wme_setparams(wl->wlc, queue, params, true);
-       UNLOCK(wl);
-
-       return 0;
-}
-
-static u64 brcms_ops_get_tsf(struct ieee80211_hw *hw)
-{
-       wiphy_err(hw->wiphy, "%s: Enter\n", __func__);
-       return 0;
-}
-
-static int
-brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-              struct ieee80211_sta *sta)
-{
-       struct scb *scb;
-
-       int i;
-       struct brcms_info *wl = hw->priv;
-
-       /* Init the scb */
-       scb = (struct scb *)sta->drv_priv;
-       memset(scb, 0, sizeof(struct scb));
-       for (i = 0; i < NUMPRIO; i++)
-               scb->seqctl[i] = 0xFFFF;
-       scb->seqctl_nonqos = 0xFFFF;
-       scb->magic = SCB_MAGIC;
-
-       wl->pub->global_scb = scb;
-       wl->pub->global_ampdu = &(scb->scb_ampdu);
-       wl->pub->global_ampdu->scb = scb;
-       wl->pub->global_ampdu->max_pdu = 16;
-       bcm_pktq_init(&scb->scb_ampdu.txq, AMPDU_MAX_SCB_TID,
-                 AMPDU_MAX_SCB_TID * PKTQ_LEN_DEFAULT);
-
-       sta->ht_cap.ht_supported = true;
-       sta->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
-       sta->ht_cap.ampdu_density = AMPDU_DEF_MPDU_DENSITY;
-       sta->ht_cap.cap = IEEE80211_HT_CAP_GRN_FLD |
-           IEEE80211_HT_CAP_SGI_20 |
-           IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT;
-
-       /* minstrel_ht initiates addBA on our behalf by calling ieee80211_start_tx_ba_session() */
-       return 0;
-}
-
-static int
-brcms_ops_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                 struct ieee80211_sta *sta)
-{
-       return 0;
-}
-
-static int
-brcms_ops_ampdu_action(struct ieee80211_hw *hw,
-                   struct ieee80211_vif *vif,
-                   enum ieee80211_ampdu_mlme_action action,
-                   struct ieee80211_sta *sta, u16 tid, u16 *ssn,
-                   u8 buf_size)
-{
-       struct scb *scb = (struct scb *)sta->drv_priv;
-       struct brcms_info *wl = hw->priv;
-       int status;
-
-       if (WARN_ON(scb->magic != SCB_MAGIC))
-               return -EIDRM;
-       switch (action) {
-       case IEEE80211_AMPDU_RX_START:
-               break;
-       case IEEE80211_AMPDU_RX_STOP:
-               break;
-       case IEEE80211_AMPDU_TX_START:
-               LOCK(wl);
-               status = wlc_aggregatable(wl->wlc, tid);
-               UNLOCK(wl);
-               if (!status) {
-                       wiphy_err(wl->wiphy, "START: tid %d is not agg\'able\n",
-                                 tid);
-                       return -EINVAL;
-               }
-               /* XXX: Use the starting sequence number provided ... */
-               *ssn = 0;
-               ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
-               break;
-
-       case IEEE80211_AMPDU_TX_STOP:
-               LOCK(wl);
-               wlc_ampdu_flush(wl->wlc, sta, tid);
-               UNLOCK(wl);
-               ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
-               break;
-       case IEEE80211_AMPDU_TX_OPERATIONAL:
-               /* Not sure what to do here */
-               /* Power save wakeup */
-               break;
-       default:
-               wiphy_err(wl->wiphy, "%s: Invalid command, ignoring\n",
-                         __func__);
-       }
-
-       return 0;
-}
-
-static void brcms_ops_rfkill_poll(struct ieee80211_hw *hw)
-{
-       struct brcms_info *wl = HW_TO_WL(hw);
-       bool blocked;
-
-       LOCK(wl);
-       blocked = wlc_check_radio_disabled(wl->wlc);
-       UNLOCK(wl);
-
-       wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, blocked);
-}
-
-static void brcms_ops_flush(struct ieee80211_hw *hw, bool drop)
-{
-       struct brcms_info *wl = HW_TO_WL(hw);
-
-       no_printk("%s: drop = %s\n", __func__, drop ? "true" : "false");
-
-       /* wait for packet queue and dma fifos to run empty */
-       LOCK(wl);
-       wlc_wait_for_tx_completion(wl->wlc, drop);
-       UNLOCK(wl);
-}
-
-static const struct ieee80211_ops brcms_ops = {
-       .tx = brcms_ops_tx,
-       .start = brcms_ops_start,
-       .stop = brcms_ops_stop,
-       .add_interface = brcms_ops_add_interface,
-       .remove_interface = brcms_ops_remove_interface,
-       .config = brcms_ops_config,
-       .bss_info_changed = brcms_ops_bss_info_changed,
-       .configure_filter = brcms_ops_configure_filter,
-       .set_tim = brcms_ops_set_tim,
-       .sw_scan_start = brcms_ops_sw_scan_start,
-       .sw_scan_complete = brcms_ops_sw_scan_complete,
-       .set_tsf = brcms_ops_set_tsf,
-       .get_stats = brcms_ops_get_stats,
-       .sta_notify = brcms_ops_sta_notify,
-       .conf_tx = brcms_ops_conf_tx,
-       .get_tsf = brcms_ops_get_tsf,
-       .sta_add = brcms_ops_sta_add,
-       .sta_remove = brcms_ops_sta_remove,
-       .ampdu_action = brcms_ops_ampdu_action,
-       .rfkill_poll = brcms_ops_rfkill_poll,
-       .flush = brcms_ops_flush,
-};
-
-/*
- * is called in brcms_pci_probe() context, therefore no locking required.
- */
-static int brcms_set_hint(struct brcms_info *wl, char *abbrev)
-{
-       return regulatory_hint(wl->pub->ieee_hw->wiphy, abbrev);
-}
-
-/**
- * attach to the WL device.
- *
- * Attach to the WL device identified by vendor and device parameters.
- * regs is a host accessible memory address pointing to WL device registers.
- *
- * brcms_attach is not defined as static because in the case where no bus
- * is defined, wl_attach will never be called, and thus, gcc will issue
- * a warning that this function is defined but not used if we declare
- * it as static.
- *
- *
- * is called in brcms_pci_probe() context, therefore no locking required.
- */
-static struct brcms_info *brcms_attach(u16 vendor, u16 device,
-                                      unsigned long regs,
-                           uint bustype, void *btparam, uint irq)
-{
-       struct brcms_info *wl = NULL;
-       int unit, err;
-       unsigned long base_addr;
-       struct ieee80211_hw *hw;
-       u8 perm[ETH_ALEN];
-
-       unit = n_adapters_found;
-       err = 0;
-
-       if (unit < 0) {
-               return NULL;
-       }
-
-       /* allocate private info */
-       hw = pci_get_drvdata(btparam);  /* btparam == pdev */
-       if (hw != NULL)
-               wl = hw->priv;
-       if (WARN_ON(hw == NULL) || WARN_ON(wl == NULL))
-               return NULL;
-       wl->wiphy = hw->wiphy;
-
-       atomic_set(&wl->callbacks, 0);
-
-       /* setup the bottom half handler */
-       tasklet_init(&wl->tasklet, brcms_dpc, (unsigned long) wl);
-
-
-
-       base_addr = regs;
-
-       if (bustype == PCI_BUS || bustype == RPC_BUS) {
-               /* Do nothing */
-       } else {
-               bustype = PCI_BUS;
-               BCMMSG(wl->wiphy, "force to PCI\n");
-       }
-       wl->bcm_bustype = bustype;
-
-       wl->regsva = ioremap_nocache(base_addr, PCI_BAR0_WINSZ);
-       if (wl->regsva == NULL) {
-               wiphy_err(wl->wiphy, "wl%d: ioremap() failed\n", unit);
-               goto fail;
-       }
-       spin_lock_init(&wl->lock);
-       spin_lock_init(&wl->isr_lock);
-
-       /* prepare ucode */
-       if (brcms_request_fw(wl, (struct pci_dev *)btparam) < 0) {
-               wiphy_err(wl->wiphy, "%s: Failed to find firmware usually in "
-                         "%s\n", KBUILD_MODNAME, "/lib/firmware/brcm");
-               brcms_release_fw(wl);
-               brcms_remove((struct pci_dev *)btparam);
-               return NULL;
-       }
-
-       /* common load-time initialization */
-       wl->wlc = wlc_attach((void *)wl, vendor, device, unit, false,
-                            wl->regsva, wl->bcm_bustype, btparam, &err);
-       brcms_release_fw(wl);
-       if (!wl->wlc) {
-               wiphy_err(wl->wiphy, "%s: wlc_attach() failed with code %d\n",
-                         KBUILD_MODNAME, err);
-               goto fail;
-       }
-       wl->pub = wlc_pub(wl->wlc);
-
-       wl->pub->ieee_hw = hw;
-
-       if (wlc_set_par(wl->wlc, IOV_MPC, 0) < 0) {
-               wiphy_err(wl->wiphy, "wl%d: Error setting MPC variable to 0\n",
-                         unit);
-       }
-
-       /* register our interrupt handler */
-       if (request_irq(irq, brcms_isr, IRQF_SHARED, KBUILD_MODNAME, wl)) {
-               wiphy_err(wl->wiphy, "wl%d: request_irq() failed\n", unit);
-               goto fail;
-       }
-       wl->irq = irq;
-
-       /* register module */
-       wlc_module_register(wl->pub, "linux", wl, wl_linux_watchdog, NULL);
-
-       if (ieee_hw_init(hw)) {
-               wiphy_err(wl->wiphy, "wl%d: %s: ieee_hw_init failed!\n", unit,
-                         __func__);
-               goto fail;
-       }
-
-       memcpy(perm, &wl->pub->cur_etheraddr, ETH_ALEN);
-       if (WARN_ON(!is_valid_ether_addr(perm)))
-               goto fail;
-       SET_IEEE80211_PERM_ADDR(hw, perm);
-
-       err = ieee80211_register_hw(hw);
-       if (err) {
-               wiphy_err(wl->wiphy, "%s: ieee80211_register_hw failed, status"
-                         "%d\n", __func__, err);
-       }
-
-       if (wl->pub->srom_ccode[0])
-               err = brcms_set_hint(wl, wl->pub->srom_ccode);
-       else
-               err = brcms_set_hint(wl, "US");
-       if (err) {
-               wiphy_err(wl->wiphy, "%s: regulatory_hint failed, status %d\n",
-                         __func__, err);
-       }
-
-       n_adapters_found++;
-       return wl;
-
-fail:
-       brcms_free(wl);
-       return NULL;
-}
-
-
-
-#define CHAN2GHZ(channel, freqency, chflags)  { \
-       .band = IEEE80211_BAND_2GHZ, \
-       .center_freq = (freqency), \
-       .hw_value = (channel), \
-       .flags = chflags, \
-       .max_antenna_gain = 0, \
-       .max_power = 19, \
-}
-
-static struct ieee80211_channel brcms_2ghz_chantable[] = {
-       CHAN2GHZ(1, 2412, IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN2GHZ(2, 2417, IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN2GHZ(3, 2422, IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN2GHZ(4, 2427, IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN2GHZ(5, 2432, 0),
-       CHAN2GHZ(6, 2437, 0),
-       CHAN2GHZ(7, 2442, 0),
-       CHAN2GHZ(8, 2447, IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN2GHZ(9, 2452, IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN2GHZ(10, 2457, IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN2GHZ(11, 2462, IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN2GHZ(12, 2467,
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN2GHZ(13, 2472,
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN2GHZ(14, 2484,
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS)
-};
-
-#define CHAN5GHZ(channel, chflags)  { \
-       .band = IEEE80211_BAND_5GHZ, \
-       .center_freq = 5000 + 5*(channel), \
-       .hw_value = (channel), \
-       .flags = chflags, \
-       .max_antenna_gain = 0, \
-       .max_power = 21, \
-}
-
-static struct ieee80211_channel brcms_5ghz_nphy_chantable[] = {
-       /* UNII-1 */
-       CHAN5GHZ(36, IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(40, IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN5GHZ(44, IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(48, IEEE80211_CHAN_NO_HT40PLUS),
-       /* UNII-2 */
-       CHAN5GHZ(52,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(56,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN5GHZ(60,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(64,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-       /* MID */
-       CHAN5GHZ(100,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(104,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN5GHZ(108,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(112,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN5GHZ(116,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(120,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN5GHZ(124,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(128,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN5GHZ(132,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(136,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN5GHZ(140,
-                IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IBSS |
-                IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_NO_HT40PLUS |
-                IEEE80211_CHAN_NO_HT40MINUS),
-       /* UNII-3 */
-       CHAN5GHZ(149, IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(153, IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN5GHZ(157, IEEE80211_CHAN_NO_HT40MINUS),
-       CHAN5GHZ(161, IEEE80211_CHAN_NO_HT40PLUS),
-       CHAN5GHZ(165, IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS)
-};
-
-#define RATE(rate100m, _flags) { \
-       .bitrate = (rate100m), \
-       .flags = (_flags), \
-       .hw_value = (rate100m / 5), \
-}
-
-static struct ieee80211_rate legacy_ratetable[] = {
-       RATE(10, 0),
-       RATE(20, IEEE80211_RATE_SHORT_PREAMBLE),
-       RATE(55, IEEE80211_RATE_SHORT_PREAMBLE),
-       RATE(110, IEEE80211_RATE_SHORT_PREAMBLE),
-       RATE(60, 0),
-       RATE(90, 0),
-       RATE(120, 0),
-       RATE(180, 0),
-       RATE(240, 0),
-       RATE(360, 0),
-       RATE(480, 0),
-       RATE(540, 0),
-};
-
-static struct ieee80211_supported_band brcms_band_2GHz_nphy = {
-       .band = IEEE80211_BAND_2GHZ,
-       .channels = brcms_2ghz_chantable,
-       .n_channels = ARRAY_SIZE(brcms_2ghz_chantable),
-       .bitrates = legacy_ratetable,
-       .n_bitrates = ARRAY_SIZE(legacy_ratetable),
-       .ht_cap = {
-                  /* from include/linux/ieee80211.h */
-                  .cap = IEEE80211_HT_CAP_GRN_FLD |
-                  IEEE80211_HT_CAP_SGI_20 |
-                  IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT,
-                  .ht_supported = true,
-                  .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,
-                  .ampdu_density = AMPDU_DEF_MPDU_DENSITY,
-                  .mcs = {
-                          /* placeholders for now */
-                          .rx_mask = {0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0},
-                          .rx_highest = 500,
-                          .tx_params = IEEE80211_HT_MCS_TX_DEFINED}
-                  }
-};
-
-static struct ieee80211_supported_band brcms_band_5GHz_nphy = {
-       .band = IEEE80211_BAND_5GHZ,
-       .channels = brcms_5ghz_nphy_chantable,
-       .n_channels = ARRAY_SIZE(brcms_5ghz_nphy_chantable),
-       .bitrates = legacy_ratetable + 4,
-       .n_bitrates = ARRAY_SIZE(legacy_ratetable) - 4,
-       .ht_cap = {
-                  /* use IEEE80211_HT_CAP_* from include/linux/ieee80211.h */
-                  .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT,     /* No 40 mhz yet */
-                  .ht_supported = true,
-                  .ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K,
-                  .ampdu_density = AMPDU_DEF_MPDU_DENSITY,
-                  .mcs = {
-                          /* placeholders for now */
-                          .rx_mask = {0xff, 0xff, 0, 0, 0, 0, 0, 0, 0, 0},
-                          .rx_highest = 500,
-                          .tx_params = IEEE80211_HT_MCS_TX_DEFINED}
-                  }
-};
-
-/*
- * is called in brcms_pci_probe() context, therefore no locking required.
- */
-static int ieee_hw_rate_init(struct ieee80211_hw *hw)
-{
-       struct brcms_info *wl = HW_TO_WL(hw);
-       int has_5g;
-       char phy_list[4];
-
-       has_5g = 0;
-
-       hw->wiphy->bands[IEEE80211_BAND_2GHZ] = NULL;
-       hw->wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
-
-       if (wlc_get(wl->wlc, WLC_GET_PHYLIST, (int *)&phy_list) < 0) {
-               wiphy_err(hw->wiphy, "Phy list failed\n");
-       }
-
-       if (phy_list[0] == 'n' || phy_list[0] == 'c') {
-               if (phy_list[0] == 'c') {
-                       /* Single stream */
-                       brcms_band_2GHz_nphy.ht_cap.mcs.rx_mask[1] = 0;
-                       brcms_band_2GHz_nphy.ht_cap.mcs.rx_highest = 72;
-               }
-               hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &brcms_band_2GHz_nphy;
-       } else {
-               return -EPERM;
-       }
-
-       /* Assume all bands use the same phy.  True for 11n devices. */
-       if (NBANDS_PUB(wl->pub) > 1) {
-               has_5g++;
-               if (phy_list[0] == 'n' || phy_list[0] == 'c') {
-                       hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
-                           &brcms_band_5GHz_nphy;
-               } else {
-                       return -EPERM;
-               }
-       }
-       return 0;
-}
-
-/*
- * is called in brcms_pci_probe() context, therefore no locking required.
- */
-static int ieee_hw_init(struct ieee80211_hw *hw)
-{
-       hw->flags = IEEE80211_HW_SIGNAL_DBM
-           /* | IEEE80211_HW_CONNECTION_MONITOR  What is this? */
-           | IEEE80211_HW_REPORTS_TX_ACK_STATUS
-           | IEEE80211_HW_AMPDU_AGGREGATION;
-
-       hw->extra_tx_headroom = wlc_get_header_len();
-       hw->queues = N_TX_QUEUES;
-       /* FIXME: this doesn't seem to be used properly in minstrel_ht.
-        * mac80211/status.c:ieee80211_tx_status() checks this value,
-        * but mac80211/rc80211_minstrel_ht.c:minstrel_ht_get_rate()
-        * appears to always set 3 rates
-        */
-       hw->max_rates = 2;      /* Primary rate and 1 fallback rate */
-
-       hw->channel_change_time = 7 * 1000;     /* channel change time is dependent on chip and band  */
-       hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
-
-       hw->rate_control_algorithm = "minstrel_ht";
-
-       hw->sta_data_size = sizeof(struct scb);
-       return ieee_hw_rate_init(hw);
-}
-
-/**
- * determines if a device is a WL device, and if so, attaches it.
- *
- * This function determines if a device pointed to by pdev is a WL device,
- * and if so, performs a brcms_attach() on it.
- *
- * Perimeter lock is initialized in the course of this function.
- */
-static int __devinit
-brcms_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
-{
-       int rc;
-       struct brcms_info *wl;
-       struct ieee80211_hw *hw;
-       u32 val;
-
-       dev_info(&pdev->dev, "bus %d slot %d func %d irq %d\n",
-              pdev->bus->number, PCI_SLOT(pdev->devfn),
-              PCI_FUNC(pdev->devfn), pdev->irq);
-
-       if ((pdev->vendor != PCI_VENDOR_ID_BROADCOM) ||
-           ((pdev->device != 0x0576) &&
-            ((pdev->device & 0xff00) != 0x4300) &&
-            ((pdev->device & 0xff00) != 0x4700) &&
-            ((pdev->device < 43000) || (pdev->device > 43999))))
-               return -ENODEV;
-
-       rc = pci_enable_device(pdev);
-       if (rc) {
-               pr_err("%s: Cannot enable device %d-%d_%d\n",
-                      __func__, pdev->bus->number, PCI_SLOT(pdev->devfn),
-                      PCI_FUNC(pdev->devfn));
-               return -ENODEV;
-       }
-       pci_set_master(pdev);
-
-       pci_read_config_dword(pdev, 0x40, &val);
-       if ((val & 0x0000ff00) != 0)
-               pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
-
-       hw = ieee80211_alloc_hw(sizeof(struct brcms_info), &brcms_ops);
-       if (!hw) {
-               pr_err("%s: ieee80211_alloc_hw failed\n", __func__);
-               return -ENOMEM;
-       }
-
-       SET_IEEE80211_DEV(hw, &pdev->dev);
-
-       pci_set_drvdata(pdev, hw);
-
-       memset(hw->priv, 0, sizeof(*wl));
-
-       wl = brcms_attach(pdev->vendor, pdev->device,
-                         pci_resource_start(pdev, 0), PCI_BUS, pdev,
-                         pdev->irq);
-
-       if (!wl) {
-               pr_err("%s: %s: brcms_attach failed!\n", KBUILD_MODNAME,
-                      __func__);
-               return -ENODEV;
-       }
-       return 0;
-}
-
-static int brcms_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-       struct brcms_info *wl;
-       struct ieee80211_hw *hw;
-
-       hw = pci_get_drvdata(pdev);
-       wl = HW_TO_WL(hw);
-       if (!wl) {
-               wiphy_err(wl->wiphy,
-                         "brcms_suspend: pci_get_drvdata failed\n");
-               return -ENODEV;
-       }
-
-       /* only need to flag hw is down for proper resume */
-       LOCK(wl);
-       wl->pub->hw_up = false;
-       UNLOCK(wl);
-
-       pci_save_state(pdev);
-       pci_disable_device(pdev);
-       return pci_set_power_state(pdev, PCI_D3hot);
-}
-
-static int brcms_resume(struct pci_dev *pdev)
-{
-       struct brcms_info *wl;
-       struct ieee80211_hw *hw;
-       int err = 0;
-       u32 val;
-
-       hw = pci_get_drvdata(pdev);
-       wl = HW_TO_WL(hw);
-       if (!wl) {
-               wiphy_err(wl->wiphy,
-                         "wl: brcms_resume: pci_get_drvdata failed\n");
-               return -ENODEV;
-       }
-
-       err = pci_set_power_state(pdev, PCI_D0);
-       if (err)
-               return err;
-
-       pci_restore_state(pdev);
-
-       err = pci_enable_device(pdev);
-       if (err)
-               return err;
-
-       pci_set_master(pdev);
-
-       pci_read_config_dword(pdev, 0x40, &val);
-       if ((val & 0x0000ff00) != 0)
-               pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
-
-       /*
-       *  done. driver will be put in up state
-       *  in brcms_ops_add_interface() call.
-       */
-       return err;
-}
-
-/*
-* called from both kernel as from this kernel module.
-* precondition: perimeter lock is not acquired.
-*/
-static void brcms_remove(struct pci_dev *pdev)
-{
-       struct brcms_info *wl;
-       struct ieee80211_hw *hw;
-       int status;
-
-       hw = pci_get_drvdata(pdev);
-       wl = HW_TO_WL(hw);
-       if (!wl) {
-               pr_err("wl: brcms_remove: pci_get_drvdata failed\n");
-               return;
-       }
-
-       LOCK(wl);
-       status = wlc_chipmatch(pdev->vendor, pdev->device);
-       UNLOCK(wl);
-       if (!status) {
-               wiphy_err(wl->wiphy, "wl: brcms_remove: wlc_chipmatch "
-                                    "failed\n");
-               return;
-       }
-       if (wl->wlc) {
-               wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, false);
-               wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy);
-               ieee80211_unregister_hw(hw);
-               LOCK(wl);
-               brcms_down(wl);
-               UNLOCK(wl);
-       }
-       pci_disable_device(pdev);
-
-       brcms_free(wl);
-
-       pci_set_drvdata(pdev, NULL);
-       ieee80211_free_hw(hw);
-}
-
-static struct pci_driver brcms_pci_driver = {
-       .name     = KBUILD_MODNAME,
-       .probe    = brcms_pci_probe,
-       .suspend  = brcms_suspend,
-       .resume   = brcms_resume,
-       .remove   = __devexit_p(brcms_remove),
-       .id_table = brcms_pci_id_table,
-};
-
-/**
- * This is the main entry point for the WL driver.
- *
- * This function determines if a device pointed to by pdev is a WL device,
- * and if so, performs a brcms_attach() on it.
- *
- */
-static int __init brcms_module_init(void)
-{
-       int error = -ENODEV;
-
-#ifdef BCMDBG
-       if (msglevel != 0xdeadbeef)
-               brcm_msg_level = msglevel;
-       else {
-               char *var = getvar(NULL, "wl_msglevel");
-               if (var) {
-                       unsigned long value;
-
-                       (void)strict_strtoul(var, 0, &value);
-                       brcm_msg_level = value;
-               }
-       }
-       if (phymsglevel != 0xdeadbeef)
-               phyhal_msg_level = phymsglevel;
-       else {
-               char *var = getvar(NULL, "phy_msglevel");
-               if (var) {
-                       unsigned long value;
-
-                       (void)strict_strtoul(var, 0, &value);
-                       phyhal_msg_level = value;
-               }
-       }
-#endif                         /* BCMDBG */
-
-       error = pci_register_driver(&brcms_pci_driver);
-       if (!error)
-               return 0;
-
-
-
-       return error;
-}
-
-/**
- * This function unloads the WL driver from the system.
- *
- * This function unconditionally unloads the WL driver module from the
- * system.
- *
- */
-static void __exit brcms_module_exit(void)
-{
-       pci_unregister_driver(&brcms_pci_driver);
-
-}
-
-module_init(brcms_module_init);
-module_exit(brcms_module_exit);
-
-/**
- * This function frees the WL per-device resources.
- *
- * This function frees resources owned by the WL device pointed to
- * by the wl parameter.
- *
- * precondition: can both be called locked and unlocked
- *
- */
-static void brcms_free(struct brcms_info *wl)
-{
-       struct brcms_timer *t, *next;
-
-       /* free ucode data */
-       if (wl->fw.fw_cnt)
-               brcms_ucode_data_free();
-       if (wl->irq)
-               free_irq(wl->irq, wl);
-
-       /* kill dpc */
-       tasklet_kill(&wl->tasklet);
-
-       if (wl->pub) {
-               wlc_module_unregister(wl->pub, "linux", wl);
-       }
-
-       /* free common resources */
-       if (wl->wlc) {
-               wlc_detach(wl->wlc);
-               wl->wlc = NULL;
-               wl->pub = NULL;
-       }
-
-       /* virtual interface deletion is deferred so we cannot spinwait */
-
-       /* wait for all pending callbacks to complete */
-       while (atomic_read(&wl->callbacks) > 0)
-               schedule();
-
-       /* free timers */
-       for (t = wl->timers; t; t = next) {
-               next = t->next;
-#ifdef BCMDBG
-               kfree(t->name);
-#endif
-               kfree(t);
-       }
-
-       /*
-        * unregister_netdev() calls get_stats() which may read chip registers
-        * so we cannot unmap the chip registers until after calling unregister_netdev() .
-        */
-       if (wl->regsva && wl->bcm_bustype != SDIO_BUS &&
-           wl->bcm_bustype != JTAG_BUS) {
-               iounmap((void *)wl->regsva);
-       }
-       wl->regsva = NULL;
-}
-
-/* flags the given rate in rateset as requested */
-static void brcms_set_basic_rate(struct wl_rateset *rs, u16 rate, bool is_br)
-{
-       u32 i;
-
-       for (i = 0; i < rs->count; i++) {
-               if (rate != (rs->rates[i] & 0x7f))
-                       continue;
-
-               if (is_br)
-                       rs->rates[i] |= WLC_RATE_FLAG;
-               else
-                       rs->rates[i] &= WLC_RATE_MASK;
-               return;
-       }
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-void brcms_txflowcontrol(struct brcms_info *wl, struct brcms_if *wlif,
-                        bool state, int prio)
-{
-       wiphy_err(wl->wiphy, "Shouldn't be here %s\n", __func__);
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-void brcms_init(struct brcms_info *wl)
-{
-       BCMMSG(WL_TO_HW(wl)->wiphy, "wl%d\n", wl->pub->unit);
-       brcms_reset(wl);
-
-       wlc_init(wl->wlc);
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-uint brcms_reset(struct brcms_info *wl)
-{
-       BCMMSG(WL_TO_HW(wl)->wiphy, "wl%d\n", wl->pub->unit);
-       wlc_reset(wl->wlc);
-
-       /* dpc will not be rescheduled */
-       wl->resched = 0;
-
-       return 0;
-}
-
-/*
- * These are interrupt on/off entry points. Disable interrupts
- * during interrupt state transition.
- */
-void brcms_intrson(struct brcms_info *wl)
-{
-       unsigned long flags;
-
-       INT_LOCK(wl, flags);
-       wlc_intrson(wl->wlc);
-       INT_UNLOCK(wl, flags);
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-bool wl_alloc_dma_resources(struct brcms_info *wl, uint addrwidth)
-{
-       return true;
-}
-
-u32 brcms_intrsoff(struct brcms_info *wl)
-{
-       unsigned long flags;
-       u32 status;
-
-       INT_LOCK(wl, flags);
-       status = wlc_intrsoff(wl->wlc);
-       INT_UNLOCK(wl, flags);
-       return status;
-}
-
-void brcms_intrsrestore(struct brcms_info *wl, u32 macintmask)
-{
-       unsigned long flags;
-
-       INT_LOCK(wl, flags);
-       wlc_intrsrestore(wl->wlc, macintmask);
-       INT_UNLOCK(wl, flags);
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-int brcms_up(struct brcms_info *wl)
-{
-       int error = 0;
-
-       if (wl->pub->up)
-               return 0;
-
-       error = wlc_up(wl->wlc);
-
-       return error;
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-void brcms_down(struct brcms_info *wl)
-{
-       uint callbacks, ret_val = 0;
-
-       /* call common down function */
-       ret_val = wlc_down(wl->wlc);
-       callbacks = atomic_read(&wl->callbacks) - ret_val;
-
-       /* wait for down callbacks to complete */
-       UNLOCK(wl);
-
-       /* For HIGH_only driver, it's important to actually schedule other work,
-        * not just spin wait since everything runs at schedule level
-        */
-       SPINWAIT((atomic_read(&wl->callbacks) > callbacks), 100 * 1000);
-
-       LOCK(wl);
-}
-
-static irqreturn_t brcms_isr(int irq, void *dev_id)
-{
-       struct brcms_info *wl;
-       bool ours, wantdpc;
-       unsigned long flags;
-
-       wl = (struct brcms_info *) dev_id;
-
-       ISR_LOCK(wl, flags);
-
-       /* call common first level interrupt handler */
-       ours = wlc_isr(wl->wlc, &wantdpc);
-       if (ours) {
-               /* if more to do... */
-               if (wantdpc) {
-
-                       /* ...and call the second level interrupt handler */
-                       /* schedule dpc */
-                       tasklet_schedule(&wl->tasklet);
-               }
-       }
-
-       ISR_UNLOCK(wl, flags);
-
-       return IRQ_RETVAL(ours);
-}
-
-static void brcms_dpc(unsigned long data)
-{
-       struct brcms_info *wl;
-
-       wl = (struct brcms_info *) data;
-
-       LOCK(wl);
-
-       /* call the common second level interrupt handler */
-       if (wl->pub->up) {
-               if (wl->resched) {
-                       unsigned long flags;
-
-                       INT_LOCK(wl, flags);
-                       wlc_intrsupd(wl->wlc);
-                       INT_UNLOCK(wl, flags);
-               }
-
-               wl->resched = wlc_dpc(wl->wlc, true);
-       }
-
-       /* wlc_dpc() may bring the driver down */
-       if (!wl->pub->up)
-               goto done;
-
-       /* re-schedule dpc */
-       if (wl->resched)
-               tasklet_schedule(&wl->tasklet);
-       else {
-               /* re-enable interrupts */
-               brcms_intrson(wl);
-       }
-
- done:
-       UNLOCK(wl);
-}
-
-/*
- * is called by the kernel from software irq context
- */
-static void brcms_timer(unsigned long data)
-{
-       _brcms_timer((struct brcms_timer *) data);
-}
-
-/*
-* precondition: perimeter lock is not acquired
- */
-static void _brcms_timer(struct brcms_timer *t)
-{
-       LOCK(t->wl);
-
-       if (t->set) {
-               if (t->periodic) {
-                       t->timer.expires = jiffies + t->ms * HZ / 1000;
-                       atomic_inc(&t->wl->callbacks);
-                       add_timer(&t->timer);
-                       t->set = true;
-               } else
-                       t->set = false;
-
-               t->fn(t->arg);
-       }
-
-       atomic_dec(&t->wl->callbacks);
-
-       UNLOCK(t->wl);
-}
-
-/*
- * Adds a timer to the list. Caller supplies a timer function.
- * Is called from wlc.
- *
- * precondition: perimeter lock has been acquired
- */
-struct brcms_timer *brcms_init_timer(struct brcms_info *wl,
-                                    void (*fn) (void *arg),
-                                    void *arg, const char *name)
-{
-       struct brcms_timer *t;
-
-       t = kzalloc(sizeof(struct brcms_timer), GFP_ATOMIC);
-       if (!t) {
-               wiphy_err(wl->wiphy, "wl%d: brcms_init_timer: out of memory\n",
-                         wl->pub->unit);
-               return 0;
-       }
-
-       init_timer(&t->timer);
-       t->timer.data = (unsigned long) t;
-       t->timer.function = brcms_timer;
-       t->wl = wl;
-       t->fn = fn;
-       t->arg = arg;
-       t->next = wl->timers;
-       wl->timers = t;
-
-#ifdef BCMDBG
-       t->name = kmalloc(strlen(name) + 1, GFP_ATOMIC);
-       if (t->name)
-               strcpy(t->name, name);
-#endif
-
-       return t;
-}
-
-/* BMAC_NOTE: Add timer adds only the kernel timer since it's going to be more accurate
- * as well as it's easier to make it periodic
- *
- * precondition: perimeter lock has been acquired
- */
-void brcms_add_timer(struct brcms_info *wl, struct brcms_timer *t, uint ms,
-                    int periodic)
-{
-#ifdef BCMDBG
-       if (t->set) {
-               wiphy_err(wl->wiphy, "%s: Already set. Name: %s, per %d\n",
-                         __func__, t->name, periodic);
-       }
-#endif
-       t->ms = ms;
-       t->periodic = (bool) periodic;
-       t->set = true;
-       t->timer.expires = jiffies + ms * HZ / 1000;
-
-       atomic_inc(&wl->callbacks);
-       add_timer(&t->timer);
-}
-
-/*
- * return true if timer successfully deleted, false if still pending
- *
- * precondition: perimeter lock has been acquired
- */
-bool brcms_del_timer(struct brcms_info *wl, struct brcms_timer *t)
-{
-       if (t->set) {
-               t->set = false;
-               if (!del_timer(&t->timer)) {
-                       return false;
-               }
-               atomic_dec(&wl->callbacks);
-       }
-
-       return true;
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-void brcms_free_timer(struct brcms_info *wl, struct brcms_timer *t)
-{
-       struct brcms_timer *tmp;
-
-       /* delete the timer in case it is active */
-       brcms_del_timer(wl, t);
-
-       if (wl->timers == t) {
-               wl->timers = wl->timers->next;
-#ifdef BCMDBG
-               kfree(t->name);
-#endif
-               kfree(t);
-               return;
-
-       }
-
-       tmp = wl->timers;
-       while (tmp) {
-               if (tmp->next == t) {
-                       tmp->next = t->next;
-#ifdef BCMDBG
-                       kfree(t->name);
-#endif
-                       kfree(t);
-                       return;
-               }
-               tmp = tmp->next;
-       }
-
-}
-
-/*
- * runs in software irq context
- *
- * precondition: perimeter lock is not acquired
- */
-static int wl_linux_watchdog(void *ctx)
-{
-       return 0;
-}
-
-struct firmware_hdr {
-       u32 offset;
-       u32 len;
-       u32 idx;
-};
-
-char *brcms_firmwares[MAX_FW_IMAGES] = {
-       "brcm/bcm43xx",
-       NULL
-};
-
-/*
- * precondition: perimeter lock has been acquired
- */
-int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)
-{
-       int i, entry;
-       const u8 *pdata;
-       struct firmware_hdr *hdr;
-       for (i = 0; i < wl->fw.fw_cnt; i++) {
-               hdr = (struct firmware_hdr *)wl->fw.fw_hdr[i]->data;
-               for (entry = 0; entry < wl->fw.hdr_num_entries[i];
-                    entry++, hdr++) {
-                       if (hdr->idx == idx) {
-                               pdata = wl->fw.fw_bin[i]->data + hdr->offset;
-                               *pbuf = kmalloc(hdr->len, GFP_ATOMIC);
-                               if (*pbuf == NULL) {
-                                       wiphy_err(wl->wiphy, "fail to alloc %d"
-                                                 " bytes\n", hdr->len);
-                                       goto fail;
-                               }
-                               memcpy(*pbuf, pdata, hdr->len);
-                               return 0;
-                       }
-               }
-       }
-       wiphy_err(wl->wiphy, "ERROR: ucode buf tag:%d can not be found!\n",
-                 idx);
-       *pbuf = NULL;
-fail:
-       return -ENODATA;
-}
-
-/*
- * Precondition: Since this function is called in brcms_pci_probe() context,
- * no locking is required.
- */
-int brcms_ucode_init_uint(struct brcms_info *wl, u32 *data, u32 idx)
-{
-       int i, entry;
-       const u8 *pdata;
-       struct firmware_hdr *hdr;
-       for (i = 0; i < wl->fw.fw_cnt; i++) {
-               hdr = (struct firmware_hdr *)wl->fw.fw_hdr[i]->data;
-               for (entry = 0; entry < wl->fw.hdr_num_entries[i];
-                    entry++, hdr++) {
-                       if (hdr->idx == idx) {
-                               pdata = wl->fw.fw_bin[i]->data + hdr->offset;
-                               if (hdr->len != 4) {
-                                       wiphy_err(wl->wiphy,
-                                                 "ERROR: fw hdr len\n");
-                                       return -ENOMSG;
-                               }
-                               *data = *((u32 *) pdata);
-                               return 0;
-                       }
-               }
-       }
-       wiphy_err(wl->wiphy, "ERROR: ucode tag:%d can not be found!\n", idx);
-       return -ENOMSG;
-}
-
-/*
- * Precondition: Since this function is called in brcms_pci_probe() context,
- * no locking is required.
- */
-static int brcms_request_fw(struct brcms_info *wl, struct pci_dev *pdev)
-{
-       int status;
-       struct device *device = &pdev->dev;
-       char fw_name[100];
-       int i;
-
-       memset((void *)&wl->fw, 0, sizeof(struct brcms_firmware));
-       for (i = 0; i < MAX_FW_IMAGES; i++) {
-               if (brcms_firmwares[i] == NULL)
-                       break;
-               sprintf(fw_name, "%s-%d.fw", brcms_firmwares[i],
-                       UCODE_LOADER_API_VER);
-               status = request_firmware(&wl->fw.fw_bin[i], fw_name, device);
-               if (status) {
-                       wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n",
-                                 KBUILD_MODNAME, fw_name);
-                       return status;
-               }
-               sprintf(fw_name, "%s_hdr-%d.fw", brcms_firmwares[i],
-                       UCODE_LOADER_API_VER);
-               status = request_firmware(&wl->fw.fw_hdr[i], fw_name, device);
-               if (status) {
-                       wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n",
-                                 KBUILD_MODNAME, fw_name);
-                       return status;
-               }
-               wl->fw.hdr_num_entries[i] =
-                   wl->fw.fw_hdr[i]->size / (sizeof(struct firmware_hdr));
-       }
-       wl->fw.fw_cnt = i;
-       return brcms_ucode_data_init(wl);
-}
-
-/*
- * precondition: can both be called locked and unlocked
- */
-void brcms_ucode_free_buf(void *p)
-{
-       kfree(p);
-}
-
-/*
- * Precondition: Since this function is called in brcms_pci_probe() context,
- * no locking is required.
- */
-static void brcms_release_fw(struct brcms_info *wl)
-{
-       int i;
-       for (i = 0; i < MAX_FW_IMAGES; i++) {
-               release_firmware(wl->fw.fw_bin[i]);
-               release_firmware(wl->fw.fw_hdr[i]);
-       }
-}
-
-
-/*
- * checks validity of all firmware images loaded from user space
- *
- * Precondition: Since this function is called in brcms_pci_probe() context,
- * no locking is required.
- */
-int brcms_check_firmwares(struct brcms_info *wl)
-{
-       int i;
-       int entry;
-       int rc = 0;
-       const struct firmware *fw;
-       const struct firmware *fw_hdr;
-       struct firmware_hdr *ucode_hdr;
-       for (i = 0; i < MAX_FW_IMAGES && rc == 0; i++) {
-               fw =  wl->fw.fw_bin[i];
-               fw_hdr = wl->fw.fw_hdr[i];
-               if (fw == NULL && fw_hdr == NULL) {
-                       break;
-               } else if (fw == NULL || fw_hdr == NULL) {
-                       wiphy_err(wl->wiphy, "%s: invalid bin/hdr fw\n",
-                                 __func__);
-                       rc = -EBADF;
-               } else if (fw_hdr->size % sizeof(struct firmware_hdr)) {
-                       wiphy_err(wl->wiphy, "%s: non integral fw hdr file "
-                               "size %zu/%zu\n", __func__, fw_hdr->size,
-                               sizeof(struct firmware_hdr));
-                       rc = -EBADF;
-               } else if (fw->size < MIN_FW_SIZE || fw->size > MAX_FW_SIZE) {
-                       wiphy_err(wl->wiphy, "%s: out of bounds fw file size "
-                                 "%zu\n", __func__, fw->size);
-                       rc = -EBADF;
-               } else {
-                       /* check if ucode section overruns firmware image */
-                       ucode_hdr = (struct firmware_hdr *)fw_hdr->data;
-                       for (entry = 0; entry < wl->fw.hdr_num_entries[i] &&
-                            !rc; entry++, ucode_hdr++) {
-                               if (ucode_hdr->offset + ucode_hdr->len >
-                                   fw->size) {
-                                       wiphy_err(wl->wiphy,
-                                                 "%s: conflicting bin/hdr\n",
-                                                 __func__);
-                                       rc = -EBADF;
-                               }
-                       }
-               }
-       }
-       if (rc == 0 && wl->fw.fw_cnt != i) {
-               wiphy_err(wl->wiphy, "%s: invalid fw_cnt=%d\n", __func__,
-                       wl->fw.fw_cnt);
-               rc = -EBADF;
-       }
-       return rc;
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-bool brcms_rfkill_set_hw_state(struct brcms_info *wl)
-{
-       bool blocked = wlc_check_radio_disabled(wl->wlc);
-
-       UNLOCK(wl);
-       wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, blocked);
-       if (blocked)
-               wiphy_rfkill_start_polling(wl->pub->ieee_hw->wiphy);
-       LOCK(wl);
-       return blocked;
-}
-
-/*
- * precondition: perimeter lock has been acquired
- */
-void brcms_msleep(struct brcms_info *wl, uint ms)
-{
-       UNLOCK(wl);
-       msleep(ms);
-       LOCK(wl);
-}
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
deleted file mode 100644 (file)
index 48ec6b0..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _wl_mac80211_h_
-#define _wl_mac80211_h_
-
-/* softmac ioctl definitions */
-#define WLC_SET_SHORTSLOT_OVERRIDE             146
-
-
-/* BMAC Note: High-only driver is no longer working in softirq context as it needs to block and
- * sleep so perimeter lock has to be a semaphore instead of spinlock. This requires timers to be
- * submitted to workqueue instead of being on kernel timer
- */
-struct brcms_timer {
-       struct timer_list timer;
-       struct brcms_info *wl;
-       void (*fn) (void *);
-       void *arg;              /* argument to fn */
-       uint ms;
-       bool periodic;
-       bool set;
-       struct brcms_timer *next;
-#ifdef BCMDBG
-       char *name;             /* Description of the timer */
-#endif
-};
-
-struct brcms_if {
-       uint subunit;           /* WDS/BSS unit */
-       struct pci_dev *pci_dev;
-};
-
-#define MAX_FW_IMAGES          4
-struct brcms_firmware {
-       u32 fw_cnt;
-       const struct firmware *fw_bin[MAX_FW_IMAGES];
-       const struct firmware *fw_hdr[MAX_FW_IMAGES];
-       u32 hdr_num_entries[MAX_FW_IMAGES];
-};
-
-struct brcms_info {
-       struct wlc_pub *pub;            /* pointer to public wlc state */
-       void *wlc;              /* pointer to private common os-independent data */
-       u32 magic;
-
-       int irq;
-
-       spinlock_t lock;        /* per-device perimeter lock */
-       spinlock_t isr_lock;    /* per-device ISR synchronization lock */
-
-       /* bus type and regsva for unmap in brcms_free() */
-       uint bcm_bustype;       /* bus type */
-       void *regsva;           /* opaque chip registers virtual address */
-
-       /* timer related fields */
-       atomic_t callbacks;     /* # outstanding callback functions */
-       struct brcms_timer *timers;     /* timer cleanup queue */
-
-       struct tasklet_struct tasklet;  /* dpc tasklet */
-       bool resched;           /* dpc needs to be and is rescheduled */
-#ifdef LINUXSTA_PS
-       u32 pci_psstate[16];    /* pci ps-state save/restore */
-#endif
-       struct brcms_firmware fw;
-       struct wiphy *wiphy;
-};
-#endif                         /* _wl_mac80211_h_ */
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_ucode.h b/drivers/staging/brcm80211/brcmsmac/wl_ucode.h
deleted file mode 100644 (file)
index 4b90121..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "wlc_types.h"         /* forward structure declarations */
-
-#define MIN_FW_SIZE 40000      /* minimum firmware file size in bytes */
-#define MAX_FW_SIZE 150000
-
-#define UCODE_LOADER_API_VER 0
-
-struct d11init {
-       u16 addr;
-       u16 size;
-       u32 value;
-};
-
-extern struct d11init *d11lcn0bsinitvals24;
-extern struct d11init *d11lcn0initvals24;
-extern struct d11init *d11lcn1bsinitvals24;
-extern struct d11init *d11lcn1initvals24;
-extern struct d11init *d11lcn2bsinitvals24;
-extern struct d11init *d11lcn2initvals24;
-extern struct d11init *d11n0absinitvals16;
-extern struct d11init *d11n0bsinitvals16;
-extern struct d11init *d11n0initvals16;
-extern u32 *bcm43xx_16_mimo;
-extern u32 bcm43xx_16_mimosz;
-extern u32 *bcm43xx_24_lcn;
-extern u32 bcm43xx_24_lcnsz;
-
-extern int brcms_ucode_data_init(struct brcms_info *wl);
-extern void brcms_ucode_data_free(void);
-
-extern int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf,
-                               unsigned int idx);
-extern int brcms_ucode_init_uint(struct brcms_info *wl, unsigned *data,
-                             unsigned int idx);
-extern void brcms_ucode_free_buf(void *);
-extern int  brcms_check_firmwares(struct brcms_info *wl);
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c b/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c
deleted file mode 100644 (file)
index cf0be6b..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2010 Broadcom Corporation
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <linux/types.h>
-#include <bcmdefs.h>
-#include <wl_ucode.h>
-
-enum {
-       D11UCODE_NAMETAG_START = 0,
-       D11LCN0BSINITVALS24,
-       D11LCN0INITVALS24,
-       D11LCN1BSINITVALS24,
-       D11LCN1INITVALS24,
-       D11LCN2BSINITVALS24,
-       D11LCN2INITVALS24,
-       D11N0ABSINITVALS16,
-       D11N0BSINITVALS16,
-       D11N0INITVALS16,
-       D11UCODE_OVERSIGHT16_MIMO,
-       D11UCODE_OVERSIGHT16_MIMOSZ,
-       D11UCODE_OVERSIGHT24_LCN,
-       D11UCODE_OVERSIGHT24_LCNSZ,
-       D11UCODE_OVERSIGHT_BOMMAJOR,
-       D11UCODE_OVERSIGHT_BOMMINOR
-};
-
-struct d11init *d11lcn0bsinitvals24;
-struct d11init *d11lcn0initvals24;
-struct d11init *d11lcn1bsinitvals24;
-struct d11init *d11lcn1initvals24;
-struct d11init *d11lcn2bsinitvals24;
-struct d11init *d11lcn2initvals24;
-struct d11init *d11n0absinitvals16;
-struct d11init *d11n0bsinitvals16;
-struct d11init *d11n0initvals16;
-u32 *bcm43xx_16_mimo;
-u32 bcm43xx_16_mimosz;
-u32 *bcm43xx_24_lcn;
-u32 bcm43xx_24_lcnsz;
-u32 *bcm43xx_bommajor;
-u32 *bcm43xx_bomminor;
-
-int brcms_ucode_data_init(struct brcms_info *wl)
-{
-       int rc;
-       rc = brcms_check_firmwares(wl);
-
-       rc = rc < 0 ? rc :
-               brcms_ucode_init_buf(wl, (void **)&d11lcn0bsinitvals24,
-                                    D11LCN0BSINITVALS24);
-       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn0initvals24,
-                                            D11LCN0INITVALS24);
-       rc = rc < 0 ? rc :
-               brcms_ucode_init_buf(wl, (void **)&d11lcn1bsinitvals24,
-                                    D11LCN1BSINITVALS24);
-       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn1initvals24,
-                                            D11LCN1INITVALS24);
-       rc = rc < 0 ? rc :
-               brcms_ucode_init_buf(wl, (void **)&d11lcn2bsinitvals24,
-                                    D11LCN2BSINITVALS24);
-       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11lcn2initvals24,
-                                            D11LCN2INITVALS24);
-       rc = rc < 0 ? rc :
-               brcms_ucode_init_buf(wl, (void **)&d11n0absinitvals16,
-                                    D11N0ABSINITVALS16);
-       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11n0bsinitvals16,
-                                            D11N0BSINITVALS16);
-       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&d11n0initvals16,
-                                            D11N0INITVALS16);
-       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_16_mimo,
-                                            D11UCODE_OVERSIGHT16_MIMO);
-       rc = rc < 0 ? rc : brcms_ucode_init_uint(wl, &bcm43xx_16_mimosz,
-                                             D11UCODE_OVERSIGHT16_MIMOSZ);
-       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_24_lcn,
-                                            D11UCODE_OVERSIGHT24_LCN);
-       rc = rc < 0 ? rc : brcms_ucode_init_uint(wl, &bcm43xx_24_lcnsz,
-                                             D11UCODE_OVERSIGHT24_LCNSZ);
-       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_bommajor,
-                                            D11UCODE_OVERSIGHT_BOMMAJOR);
-       rc = rc < 0 ? rc : brcms_ucode_init_buf(wl, (void **)&bcm43xx_bomminor,
-                                            D11UCODE_OVERSIGHT_BOMMINOR);
-       return rc;
-}
-
-void brcms_ucode_data_free(void)
-{
-       brcms_ucode_free_buf((void *)d11lcn0bsinitvals24);
-       brcms_ucode_free_buf((void *)d11lcn0initvals24);
-       brcms_ucode_free_buf((void *)d11lcn1bsinitvals24);
-       brcms_ucode_free_buf((void *)d11lcn1initvals24);
-       brcms_ucode_free_buf((void *)d11lcn2bsinitvals24);
-       brcms_ucode_free_buf((void *)d11lcn2initvals24);
-       brcms_ucode_free_buf((void *)d11n0absinitvals16);
-       brcms_ucode_free_buf((void *)d11n0bsinitvals16);
-       brcms_ucode_free_buf((void *)d11n0initvals16);
-       brcms_ucode_free_buf((void *)bcm43xx_16_mimo);
-       brcms_ucode_free_buf((void *)bcm43xx_24_lcn);
-       brcms_ucode_free_buf((void *)bcm43xx_bommajor);
-       brcms_ucode_free_buf((void *)bcm43xx_bomminor);
-
-       return;
-}
index fe031f220fe48a1bcd7c8280dbb3b6ae9ce1600c..57c6e8a03fcdffe587f49d6f4ca1f0e76c836dbc 100644 (file)
@@ -45,7 +45,7 @@
 #include "wlc_channel.h"
 #include "wlc_main.h"
 #include "wl_export.h"
-#include "wl_ucode.h"
+#include "ucode_loader.h"
 #include "wlc_antsel.h"
 #include "wlc_alloc.h"
 #include "wl_dbg.h"
index 1a2108cc14198c8ab2802085ebbaa1159e216fc4..d5ba632c676767470cc1a4b4314f0c03ee62f0e8 100644 (file)
@@ -49,7 +49,7 @@
 #include "wl_export.h"
 #include "wlc_alloc.h"
 #include "wl_dbg.h"
-#include "wl_mac80211.h"
+#include "brcms_mac80211.h"
 
 /*
  * WPA(2) definitions