Merge tag 'wireless-drivers-next-for-davem-2015-03-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Major changes:

brcmfmac:

* sdio improvements
* add a debugfs file so users can provide us all the revinfo we could
  ask for

iwlwifi:

* add triggers for firmware dump collection
* remove support for -9.ucode
* new statitics API
* rate control improvements

ath9k:

* add per-vif TX power capability
* BT coexistance fixes

ath10k:

* qca6174: enable STA transmit beamforming (TxBF) support
* disable multi-vif power save by default

bcma:

* enable support for PCIe Gen 2 host devices

Signed-off-by: David S. Miller <davem@davemloft.net>

11 files changed, 100 insertions, 66 deletions

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 7c3ca2f50186..8e1f681f960b 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -2397,7 +2397,6 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
         ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
 }
 
-#define MWIFIEX_MAX_WQ_LEN  30
 /*
  *  create a new virtual interface with the given name
  */
@@ -2411,7 +2410,6 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
         struct mwifiex_private *priv;
         struct net_device *dev;
         void *mdev_priv;
-        char dfs_cac_str[MWIFIEX_MAX_WQ_LEN], dfs_chsw_str[MWIFIEX_MAX_WQ_LEN];
 
         if (!adapter)
                 return ERR_PTR(-EFAULT);
@@ -2576,12 +2574,10 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                 return ERR_PTR(-EFAULT);
         }
 
-        strcpy(dfs_cac_str, "MWIFIEX_DFS_CAC");
-        strcat(dfs_cac_str, name);
-        priv->dfs_cac_workqueue = alloc_workqueue(dfs_cac_str,
+        priv->dfs_cac_workqueue = alloc_workqueue("MWIFIEX_DFS_CAC%s",
                                                   WQ_HIGHPRI |
                                                   WQ_MEM_RECLAIM |
-                                                  WQ_UNBOUND, 1);
+                                                  WQ_UNBOUND, 1, name);
         if (!priv->dfs_cac_workqueue) {
                 wiphy_err(wiphy, "cannot register virtual network device\n");
                 free_netdev(dev);
@@ -2594,11 +2590,9 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
 
         INIT_DELAYED_WORK(&priv->dfs_cac_work, mwifiex_dfs_cac_work_queue);
 
-        strcpy(dfs_chsw_str, "MWIFIEX_DFS_CHSW");
-        strcat(dfs_chsw_str, name);
-        priv->dfs_chan_sw_workqueue = alloc_workqueue(dfs_chsw_str,
+        priv->dfs_chan_sw_workqueue = alloc_workqueue("MWIFIEX_DFS_CHSW%s",
                                                       WQ_HIGHPRI | WQ_UNBOUND |
-                                                      WQ_MEM_RECLAIM, 1);
+                                                      WQ_MEM_RECLAIM, 1, name);
         if (!priv->dfs_chan_sw_workqueue) {
                 wiphy_err(wiphy, "cannot register virtual network device\n");
                 free_netdev(dev);
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
index 88d0eade6bb1..cf2fa110e251 100644
--- a/drivers/net/wireless/mwifiex/decl.h
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -33,6 +33,7 @@
 #define MWIFIEX_MAX_BSS_NUM         (3)
 
 #define MWIFIEX_DMA_ALIGN_SZ        64
+#define MWIFIEX_RX_HEADROOM         64
 #define MAX_TXPD_SZ                 32
 #define INTF_HDR_ALIGN               4
 
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 0978b1cc58b6..0153ce6d5879 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -296,7 +296,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
         memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
         adapter->arp_filter_size = 0;
         adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;
-        adapter->ext_scan = false;
         adapter->key_api_major_ver = 0;
         adapter->key_api_minor_ver = 0;
         eth_broadcast_addr(adapter->perm_addr);
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 7e74b4fccddd..74488aba92bd 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -190,14 +190,16 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
 
         /* Check if already processing */
         if (adapter->mwifiex_processing) {
+                adapter->more_task_flag = true;
                 spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
                 goto exit_main_proc;
         } else {
                 adapter->mwifiex_processing = true;
-                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
         }
 process_start:
         do {
+                adapter->more_task_flag = false;
+                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
                 if ((adapter->hw_status == MWIFIEX_HW_STATUS_CLOSING) ||
                     (adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY))
                         break;
@@ -238,6 +240,7 @@ process_start:
                         adapter->pm_wakeup_fw_try = true;
                         mod_timer(&adapter->wakeup_timer, jiffies + (HZ*3));
                         adapter->if_ops.wakeup(adapter);
+                        spin_lock_irqsave(&adapter->main_proc_lock, flags);
                         continue;
                 }
 
@@ -295,8 +298,10 @@ process_start:
                 if ((adapter->ps_state == PS_STATE_SLEEP) ||
                     (adapter->ps_state == PS_STATE_PRE_SLEEP) ||
                     (adapter->ps_state == PS_STATE_SLEEP_CFM) ||
-                    adapter->tx_lock_flag)
+                    adapter->tx_lock_flag){
+                        spin_lock_irqsave(&adapter->main_proc_lock, flags);
                         continue;
+                }
 
                 if (!adapter->cmd_sent && !adapter->curr_cmd) {
                         if (mwifiex_exec_next_cmd(adapter) == -1) {
@@ -330,15 +335,12 @@ process_start:
                         }
                         break;
                 }
+                spin_lock_irqsave(&adapter->main_proc_lock, flags);
         } while (true);
 
         spin_lock_irqsave(&adapter->main_proc_lock, flags);
-        if (!adapter->delay_main_work &&
-            (adapter->int_status || IS_CARD_RX_RCVD(adapter))) {
-                spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
+        if (adapter->more_task_flag)
                 goto process_start;
-        }
-
         adapter->mwifiex_processing = false;
         spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
 
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index f0a6af179af0..16be45e9a66a 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -140,6 +140,9 @@ enum {
 
 #define MWIFIEX_DRV_INFO_SIZE_MAX 0x40000
 
+/* Address alignment */
+#define MWIFIEX_ALIGN_ADDR(p, a) (((long)(p) + (a) - 1) & ~((a) - 1))
+
 struct mwifiex_dbg {
         u32 num_cmd_host_to_card_failure;
         u32 num_cmd_sleep_cfm_host_to_card_failure;
@@ -774,6 +777,7 @@ struct mwifiex_adapter {
         /* spin lock for main process */
         spinlock_t main_proc_lock;
         u32 mwifiex_processing;
+        u8 more_task_flag;
         u16 tx_buf_size;
         u16 curr_tx_buf_size;
         u32 ioport;
@@ -1417,6 +1421,7 @@ u8 mwifiex_adjust_data_rate(struct mwifiex_private *priv,
                             u8 rx_rate, u8 ht_info);
 
 void mwifiex_dump_drv_info(struct mwifiex_adapter *adapter);
+void *mwifiex_alloc_rx_buf(int rx_len, gfp_t flags);
 
 #ifdef CONFIG_DEBUG_FS
 void mwifiex_debugfs_init(void);
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index a5828da59365..4b463c3b9906 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -203,7 +203,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
                 card->pcie.reg = data->reg;
                 card->pcie.blksz_fw_dl = data->blksz_fw_dl;
                 card->pcie.tx_buf_size = data->tx_buf_size;
-                card->pcie.supports_fw_dump = data->supports_fw_dump;
+                card->pcie.can_dump_fw = data->can_dump_fw;
                 card->pcie.can_ext_scan = data->can_ext_scan;
         }
 
@@ -498,7 +498,8 @@ static int mwifiex_init_rxq_ring(struct mwifiex_adapter *adapter)
 
         for (i = 0; i < MWIFIEX_MAX_TXRX_BD; i++) {
                 /* Allocate skb here so that firmware can DMA data from it */
-                skb = dev_alloc_skb(MWIFIEX_RX_DATA_BUF_SIZE);
+                skb = mwifiex_alloc_rx_buf(MWIFIEX_RX_DATA_BUF_SIZE,
+                                           GFP_KERNEL | GFP_DMA);
                 if (!skb) {
                         dev_err(adapter->dev,
                                 "Unable to allocate skb for RX ring.\n");
@@ -1297,7 +1298,8 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
                         }
                 }
 
-                skb_tmp = dev_alloc_skb(MWIFIEX_RX_DATA_BUF_SIZE);
+                skb_tmp = mwifiex_alloc_rx_buf(MWIFIEX_RX_DATA_BUF_SIZE,
+                                               GFP_KERNEL | GFP_DMA);
                 if (!skb_tmp) {
                         dev_err(adapter->dev,
                                 "Unable to allocate skb.\n");
@@ -2271,7 +2273,7 @@ static void mwifiex_pcie_fw_dump_work(struct mwifiex_adapter *adapter)
         int ret;
         static char *env[] = { "DRIVER=mwifiex_pcie", "EVENT=fw_dump", NULL };
 
-        if (!card->pcie.supports_fw_dump)
+        if (!card->pcie.can_dump_fw)
                 return;
 
         for (idx = 0; idx < ARRAY_SIZE(mem_type_mapping_tbl); idx++) {
diff --git a/drivers/net/wireless/mwifiex/pcie.h b/drivers/net/wireless/mwifiex/pcie.h
index 666d40e9dbc3..0e7ee8b72358 100644
--- a/drivers/net/wireless/mwifiex/pcie.h
+++ b/drivers/net/wireless/mwifiex/pcie.h
@@ -205,7 +205,7 @@ struct mwifiex_pcie_device {
         const struct mwifiex_pcie_card_reg *reg;
         u16 blksz_fw_dl;
         u16 tx_buf_size;
-        bool supports_fw_dump;
+        bool can_dump_fw;
         bool can_ext_scan;
 };
 
@@ -214,7 +214,7 @@ static const struct mwifiex_pcie_device mwifiex_pcie8766 = {
         .reg            = &mwifiex_reg_8766,
         .blksz_fw_dl = MWIFIEX_PCIE_BLOCK_SIZE_FW_DNLD,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
-        .supports_fw_dump = false,
+        .can_dump_fw = false,
         .can_ext_scan = true,
 };
 
@@ -223,7 +223,7 @@ static const struct mwifiex_pcie_device mwifiex_pcie8897 = {
         .reg            = &mwifiex_reg_8897,
         .blksz_fw_dl = MWIFIEX_PCIE_BLOCK_SIZE_FW_DNLD,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,
-        .supports_fw_dump = true,
+        .can_dump_fw = true,
         .can_ext_scan = true,
 };
 
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 91e36cda9543..57d85ab442bf 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -105,8 +105,8 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
                 card->tx_buf_size = data->tx_buf_size;
                 card->mp_tx_agg_buf_size = data->mp_tx_agg_buf_size;
                 card->mp_rx_agg_buf_size = data->mp_rx_agg_buf_size;
-                card->supports_fw_dump = data->supports_fw_dump;
-                card->auto_tdls = data->auto_tdls;
+                card->can_dump_fw = data->can_dump_fw;
+                card->can_auto_tdls = data->can_auto_tdls;
                 card->can_ext_scan = data->can_ext_scan;
         }
 
@@ -1357,7 +1357,7 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
                         return -1;
                 rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
 
-                skb = dev_alloc_skb(rx_len);
+                skb = mwifiex_alloc_rx_buf(rx_len, GFP_KERNEL | GFP_DMA);
                 if (!skb)
                         return -1;
 
@@ -1454,7 +1454,8 @@ static int mwifiex_process_int_status(struct mwifiex_adapter *adapter)
                         }
                         rx_len = (u16) (rx_blocks * MWIFIEX_SDIO_BLOCK_SIZE);
 
-                        skb = dev_alloc_skb(rx_len);
+                        skb = mwifiex_alloc_rx_buf(rx_len,
+                                                   GFP_KERNEL | GFP_DMA);
 
                         if (!skb) {
                                 dev_err(adapter->dev, "%s: failed to alloc skb",
@@ -1887,7 +1888,7 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
                 return -1;
         }
 
-        adapter->auto_tdls = card->auto_tdls;
+        adapter->auto_tdls = card->can_auto_tdls;
         adapter->ext_scan = card->can_ext_scan;
         return ret;
 }
@@ -2032,7 +2033,7 @@ static void mwifiex_sdio_fw_dump_work(struct work_struct *work)
 
         mwifiex_dump_drv_info(adapter);
 
-        if (!card->supports_fw_dump)
+        if (!card->can_dump_fw)
                 return;
 
         for (idx = 0; idx < ARRAY_SIZE(mem_type_mapping_tbl); idx++) {
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
index 957cca246618..c636944c77bc 100644
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
@@ -238,9 +238,6 @@ struct sdio_mmc_card {
         const struct mwifiex_sdio_card_reg *reg;
         u8 max_ports;
         u8 mp_agg_pkt_limit;
-        bool supports_sdio_new_mode;
-        bool has_control_mask;
-        bool supports_fw_dump;
         u16 tx_buf_size;
         u32 mp_tx_agg_buf_size;
         u32 mp_rx_agg_buf_size;
@@ -255,7 +252,10 @@ struct sdio_mmc_card {
         u8 curr_wr_port;
 
         u8 *mp_regs;
-        u8 auto_tdls;
+        bool supports_sdio_new_mode;
+        bool has_control_mask;
+        bool can_dump_fw;
+        bool can_auto_tdls;
         bool can_ext_scan;
 
         struct mwifiex_sdio_mpa_tx mpa_tx;
@@ -267,13 +267,13 @@ struct mwifiex_sdio_device {
         const struct mwifiex_sdio_card_reg *reg;
         u8 max_ports;
         u8 mp_agg_pkt_limit;
-        bool supports_sdio_new_mode;
-        bool has_control_mask;
-        bool supports_fw_dump;
         u16 tx_buf_size;
         u32 mp_tx_agg_buf_size;
         u32 mp_rx_agg_buf_size;
-        u8 auto_tdls;
+        bool supports_sdio_new_mode;
+        bool has_control_mask;
+        bool can_dump_fw;
+        bool can_auto_tdls;
         bool can_ext_scan;
 };
 
@@ -412,13 +412,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8786 = {
         .reg = &mwifiex_reg_sd87xx,
         .max_ports = 16,
         .mp_agg_pkt_limit = 8,
-        .supports_sdio_new_mode = false,
-        .has_control_mask = true,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
-        .supports_fw_dump = false,
-        .auto_tdls = false,
+        .supports_sdio_new_mode = false,
+        .has_control_mask = true,
+        .can_dump_fw = false,
+        .can_auto_tdls = false,
         .can_ext_scan = false,
 };
 
@@ -427,13 +427,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8787 = {
         .reg = &mwifiex_reg_sd87xx,
         .max_ports = 16,
         .mp_agg_pkt_limit = 8,
-        .supports_sdio_new_mode = false,
-        .has_control_mask = true,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
-        .supports_fw_dump = false,
-        .auto_tdls = false,
+        .supports_sdio_new_mode = false,
+        .has_control_mask = true,
+        .can_dump_fw = false,
+        .can_auto_tdls = false,
         .can_ext_scan = true,
 };
 
@@ -442,13 +442,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8797 = {
         .reg = &mwifiex_reg_sd87xx,
         .max_ports = 16,
         .mp_agg_pkt_limit = 8,
-        .supports_sdio_new_mode = false,
-        .has_control_mask = true,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
-        .supports_fw_dump = false,
-        .auto_tdls = false,
+        .supports_sdio_new_mode = false,
+        .has_control_mask = true,
+        .can_dump_fw = false,
+        .can_auto_tdls = false,
         .can_ext_scan = true,
 };
 
@@ -457,13 +457,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8897 = {
         .reg = &mwifiex_reg_sd8897,
         .max_ports = 32,
         .mp_agg_pkt_limit = 16,
-        .supports_sdio_new_mode = true,
-        .has_control_mask = false,
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
-        .supports_fw_dump = true,
-        .auto_tdls = false,
+        .supports_sdio_new_mode = true,
+        .has_control_mask = false,
+        .can_dump_fw = true,
+        .can_auto_tdls = false,
         .can_ext_scan = true,
 };
 
@@ -472,13 +472,13 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8887 = {
         .reg = &mwifiex_reg_sd8887,
         .max_ports = 32,
         .mp_agg_pkt_limit = 16,
-        .supports_sdio_new_mode = true,
-        .has_control_mask = false,
-        .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K,
+        .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_32K,
-        .supports_fw_dump = false,
-        .auto_tdls = true,
+        .supports_sdio_new_mode = true,
+        .has_control_mask = false,
+        .can_dump_fw = false,
+        .can_auto_tdls = true,
         .can_ext_scan = true,
 };
 
@@ -492,8 +492,8 @@ static const struct mwifiex_sdio_device mwifiex_sdio_sd8801 = {
         .tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_2K,
         .mp_tx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
         .mp_rx_agg_buf_size = MWIFIEX_MP_AGGR_BUF_SIZE_16K,
-        .supports_fw_dump = false,
-        .auto_tdls = false,
+        .can_dump_fw = false,
+        .can_auto_tdls = false,
         .can_ext_scan = true,
 };
 
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c
index ac93557cbdc9..ea4549f0e0b9 100644
--- a/drivers/net/wireless/mwifiex/txrx.c
+++ b/drivers/net/wireless/mwifiex/txrx.c
@@ -80,11 +80,13 @@ EXPORT_SYMBOL_GPL(mwifiex_handle_rx_packet);
 int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
                        struct mwifiex_tx_param *tx_param)
 {
-        int ret = -1;
+        int hroom, ret = -1;
         struct mwifiex_adapter *adapter = priv->adapter;
         u8 *head_ptr;
         struct txpd *local_tx_pd = NULL;
 
+        hroom = (adapter->iface_type == MWIFIEX_USB) ? 0 : INTF_HEADER_LEN;
+
         if (priv->bss_role == MWIFIEX_BSS_ROLE_UAP)
                 head_ptr = mwifiex_process_uap_txpd(priv, skb);
         else
@@ -92,11 +94,9 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb,
 
         if (head_ptr) {
                 if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA)
-                        local_tx_pd =
-                                (struct txpd *) (head_ptr + INTF_HEADER_LEN);
+                        local_tx_pd = (struct txpd *)(head_ptr + hroom);
                 if (adapter->iface_type == MWIFIEX_USB) {
                         adapter->data_sent = true;
-                        skb_pull(skb, INTF_HEADER_LEN);
                         ret = adapter->if_ops.host_to_card(adapter,
                                                            MWIFIEX_USB_EP_DATA,
                                                            skb, NULL);
diff --git a/drivers/net/wireless/mwifiex/util.c b/drivers/net/wireless/mwifiex/util.c
index 308550611f22..2148a573396b 100644
--- a/drivers/net/wireless/mwifiex/util.c
+++ b/drivers/net/wireless/mwifiex/util.c
@@ -367,6 +367,13 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv,
         if (!skb)
                 return -1;
 
+        if (!priv->mgmt_frame_mask ||
+            priv->wdev.iftype == NL80211_IFTYPE_UNSPECIFIED) {
+                dev_dbg(priv->adapter->dev,
+                        "do not receive mgmt frames on uninitialized intf");
+                return -1;
+        }
+
         rx_pd = (struct rxpd *)skb->data;
 
         skb_pull(skb, le16_to_cpu(rx_pd->rx_pkt_offset));
@@ -624,3 +631,26 @@ void mwifiex_hist_data_reset(struct mwifiex_private *priv)
         for (ix = 0; ix < MWIFIEX_MAX_SIG_STRENGTH; ix++)
                 atomic_set(&phist_data->sig_str[ix], 0);
 }
+
+void *mwifiex_alloc_rx_buf(int rx_len, gfp_t flags)
+{
+        struct sk_buff *skb;
+        int buf_len, pad;
+
+        buf_len = rx_len + MWIFIEX_RX_HEADROOM + MWIFIEX_DMA_ALIGN_SZ;
+
+        skb = __dev_alloc_skb(buf_len, flags);
+
+        if (!skb)
+                return NULL;
+
+        skb_reserve(skb, MWIFIEX_RX_HEADROOM);
+
+        pad = MWIFIEX_ALIGN_ADDR(skb->data, MWIFIEX_DMA_ALIGN_SZ) -
+              (long)skb->data;
+
+        skb_reserve(skb, pad);
+
+        return skb;
+}
+EXPORT_SYMBOL_GPL(mwifiex_alloc_rx_buf);