Merge tag 'mac80211-next-for-davem-2015-03-30' into iwlwifi-next

Lots of updates for net-next; along with the usual flurry
of small fixes, cleanups and internal features we have:
 * VHT support for TDLS and IBSS (conditional on drivers though)
 * first TX performance improvements (the biggest will come later)
 * many suspend/resume (race) fixes
 * name_assign_type support from Tom Gundersen

21 files changed, 145 insertions, 51 deletions

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index d6d2f0f00caa..d372ebfd933d 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1386,7 +1386,8 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar,
         lockdep_assert_held(&ar->conf_mutex);
 
         bss = cfg80211_get_bss(ar->hw->wiphy, ar->hw->conf.chandef.chan,
-                               info->bssid, NULL, 0, 0, 0);
+                               info->bssid, NULL, 0, IEEE80211_BSS_TYPE_ANY,
+                               IEEE80211_PRIVACY_ANY);
         if (bss) {
                 const struct cfg80211_bss_ies *ies;
 
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 85da63a67faf..d740f14f3539 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -686,20 +686,21 @@ ath6kl_add_bss_if_needed(struct ath6kl_vif *vif,
 {
         struct ath6kl *ar = vif->ar;
         struct cfg80211_bss *bss;
-        u16 cap_mask, cap_val;
+        u16 cap_val;
+        enum ieee80211_bss_type bss_type;
         u8 *ie;
 
         if (nw_type & ADHOC_NETWORK) {
-                cap_mask = WLAN_CAPABILITY_IBSS;
                 cap_val = WLAN_CAPABILITY_IBSS;
+                bss_type = IEEE80211_BSS_TYPE_IBSS;
         } else {
-                cap_mask = WLAN_CAPABILITY_ESS;
                 cap_val = WLAN_CAPABILITY_ESS;
+                bss_type = IEEE80211_BSS_TYPE_ESS;
         }
 
         bss = cfg80211_get_bss(ar->wiphy, chan, bssid,
                                vif->ssid, vif->ssid_len,
-                               cap_mask, cap_val);
+                               bss_type, IEEE80211_PRIVACY_ANY);
         if (bss == NULL) {
                 /*
                  * Since cfg80211 may not yet know about the BSS,
@@ -1495,6 +1496,7 @@ static int ath6kl_cfg80211_set_power_mgmt(struct wiphy *wiphy,
 
 static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy,
                                                       const char *name,
+                                                      unsigned char name_assign_type,
                                                       enum nl80211_iftype type,
                                                       u32 *flags,
                                                       struct vif_params *params)
@@ -1513,7 +1515,7 @@ static struct wireless_dev *ath6kl_cfg80211_add_iface(struct wiphy *wiphy,
                 return ERR_PTR(-EINVAL);
         }
 
-        wdev = ath6kl_interface_add(ar, name, type, if_idx, nw_type);
+        wdev = ath6kl_interface_add(ar, name, name_assign_type, type, if_idx, nw_type);
         if (!wdev)
                 return ERR_PTR(-ENOMEM);
 
@@ -3633,13 +3635,14 @@ void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif)
 }
 
 struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,
+                                          unsigned char name_assign_type,
                                           enum nl80211_iftype type,
                                           u8 fw_vif_idx, u8 nw_type)
 {
         struct net_device *ndev;
         struct ath6kl_vif *vif;
 
-        ndev = alloc_netdev(sizeof(*vif), name, NET_NAME_UNKNOWN, ether_setup);
+        ndev = alloc_netdev(sizeof(*vif), name, name_assign_type, ether_setup);
         if (!ndev)
                 return NULL;
 
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.h b/drivers/net/wireless/ath/ath6kl/cfg80211.h
index b59becd91aea..5aa57a7639bf 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.h
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.h
@@ -25,6 +25,7 @@ enum ath6kl_cfg_suspend_mode {
 };
 
 struct wireless_dev *ath6kl_interface_add(struct ath6kl *ar, const char *name,
+                                          unsigned char name_assign_type,
                                           enum nl80211_iftype type,
                                           u8 fw_vif_idx, u8 nw_type);
 void ath6kl_cfg80211_ch_switch_notify(struct ath6kl_vif *vif, int freq,
diff --git a/drivers/net/wireless/ath/ath6kl/core.c b/drivers/net/wireless/ath/ath6kl/core.c
index 0df74b245af4..4ec02cea0f43 100644
--- a/drivers/net/wireless/ath/ath6kl/core.c
+++ b/drivers/net/wireless/ath/ath6kl/core.c
@@ -211,8 +211,8 @@ int ath6kl_core_init(struct ath6kl *ar, enum ath6kl_htc_type htc_type)
         rtnl_lock();
 
         /* Add an initial station interface */
-        wdev = ath6kl_interface_add(ar, "wlan%d", NL80211_IFTYPE_STATION, 0,
-                                    INFRA_NETWORK);
+        wdev = ath6kl_interface_add(ar, "wlan%d", NET_NAME_ENUM,
+                                    NL80211_IFTYPE_STATION, 0, INFRA_NETWORK);
 
         rtnl_unlock();
 
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 2d5ea21be47e..adfd815e3f7d 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -395,7 +395,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
 
         bss = cfg80211_get_bss(wiphy, sme->channel, sme->bssid,
                                sme->ssid, sme->ssid_len,
-                               WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+                               IEEE80211_BSS_TYPE_ESS, IEEE80211_PRIVACY_ANY);
         if (!bss) {
                 wil_err(wil, "Unable to find BSS\n");
                 return -ENOENT;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
index b59b8c6c42ab..bcbccba4cdbf 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
@@ -625,6 +625,7 @@ static bool brcmf_is_ibssmode(struct brcmf_cfg80211_vif *vif)
 
 static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,
                                                      const char *name,
+                                                     unsigned char name_assign_type,
                                                      enum nl80211_iftype type,
                                                      u32 *flags,
                                                      struct vif_params *params)
@@ -648,7 +649,7 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy,
         case NL80211_IFTYPE_P2P_CLIENT:
         case NL80211_IFTYPE_P2P_GO:
         case NL80211_IFTYPE_P2P_DEVICE:
-                wdev = brcmf_p2p_add_vif(wiphy, name, type, flags, params);
+                wdev = brcmf_p2p_add_vif(wiphy, name, name_assign_type, type, flags, params);
                 if (!IS_ERR(wdev))
                         brcmf_cfg80211_update_proto_addr_mode(wdev);
                 return wdev;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
index effb48ebd864..b44ea85dd9db 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
@@ -2246,11 +2246,13 @@ static void brcmf_p2p_delete_p2pdev(struct brcmf_p2p_info *p2p,
  *
  * @wiphy: wiphy device of new interface.
  * @name: name of the new interface.
+ * @name_assign_type: origin of the interface name
  * @type: nl80211 interface type.
  * @flags: not used.
  * @params: contains mac address for P2P device.
  */
 struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
+                                       unsigned char name_assign_type,
                                        enum nl80211_iftype type, u32 *flags,
                                        struct vif_params *params)
 {
@@ -2310,6 +2312,7 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
         }
 
         strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);
+        ifp->ndev->name_assign_type = name_assign_type;
         err = brcmf_net_attach(ifp, true);
         if (err) {
                 brcmf_err("Registering netdevice failed\n");
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/p2p.h b/drivers/net/wireless/brcm80211/brcmfmac/p2p.h
index 6821b26224be..872f382d9e49 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.h
@@ -149,6 +149,7 @@ struct brcmf_p2p_info {
 s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg);
 void brcmf_p2p_detach(struct brcmf_p2p_info *p2p);
 struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,
+                                       unsigned char name_assign_type,
                                        enum nl80211_iftype type, u32 *flags,
                                        struct vif_params *params);
 int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev);
diff --git a/drivers/net/wireless/cw1200/sta.c b/drivers/net/wireless/cw1200/sta.c
index 4a47c7f8a246..1b58b2e2a538 100644
--- a/drivers/net/wireless/cw1200/sta.c
+++ b/drivers/net/wireless/cw1200/sta.c
@@ -1240,8 +1240,8 @@ static void cw1200_do_join(struct cw1200_common *priv)
 
         bssid = priv->vif->bss_conf.bssid;
 
-        bss = cfg80211_get_bss(priv->hw->wiphy, priv->channel,
-                        bssid, NULL, 0, 0, 0);
+        bss = cfg80211_get_bss(priv->hw->wiphy, priv->channel, bssid, NULL, 0,
+                               IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
 
         if (!bss && !conf->ibss_joined) {
                 wsm_unlock_tx(priv);
diff --git a/drivers/net/wireless/ipw2x00/Kconfig b/drivers/net/wireless/ipw2x00/Kconfig
index 21de4fe6cf2d..d6ec44d7a391 100644
--- a/drivers/net/wireless/ipw2x00/Kconfig
+++ b/drivers/net/wireless/ipw2x00/Kconfig
@@ -66,7 +66,7 @@ config IPW2100_DEBUG
 config IPW2200
         tristate "Intel PRO/Wireless 2200BG and 2915ABG Network Connection"
         depends on PCI && CFG80211
-        select CFG80211_WEXT
+        select CFG80211_WEXT_EXPORT
         select WIRELESS_EXT
         select WEXT_SPY
         select WEXT_PRIV
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index cceb026e0793..5abd62ed8cb4 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -1130,20 +1130,23 @@ done:
         IWL_DEBUG_MAC80211(priv, "leave\n");
 }
 
-static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
-                                     struct ieee80211_vif *vif,
-                                     enum ieee80211_rssi_event rssi_event)
+static void iwlagn_mac_event_callback(struct ieee80211_hw *hw,
+                                      struct ieee80211_vif *vif,
+                                      const struct ieee80211_event *event)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
 
+        if (event->type != RSSI_EVENT)
+                return;
+
         IWL_DEBUG_MAC80211(priv, "enter\n");
         mutex_lock(&priv->mutex);
 
         if (priv->lib->bt_params &&
             priv->lib->bt_params->advanced_bt_coexist) {
-                if (rssi_event == RSSI_EVENT_LOW)
+                if (event->u.rssi.data == RSSI_EVENT_LOW)
                         priv->bt_enable_pspoll = true;
-                else if (rssi_event == RSSI_EVENT_HIGH)
+                else if (event->u.rssi.data == RSSI_EVENT_HIGH)
                         priv->bt_enable_pspoll = false;
 
                 iwlagn_send_advance_bt_config(priv);
@@ -1614,7 +1617,7 @@ const struct ieee80211_ops iwlagn_hw_ops = {
         .channel_switch = iwlagn_mac_channel_switch,
         .flush = iwlagn_mac_flush,
         .tx_last_beacon = iwlagn_mac_tx_last_beacon,
-        .rssi_callback = iwlagn_mac_rssi_callback,
+        .event_callback = iwlagn_mac_event_callback,
         .set_tim = iwlagn_mac_set_tim,
 };
 
diff --git a/drivers/net/wireless/iwlwifi/mvm/coex.c b/drivers/net/wireless/iwlwifi/mvm/coex.c
index 770b0e2a9b46..13a0a03158de 100644
--- a/drivers/net/wireless/iwlwifi/mvm/coex.c
+++ b/drivers/net/wireless/iwlwifi/mvm/coex.c
@@ -807,7 +807,7 @@ static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac,
 }
 
 void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                           enum ieee80211_rssi_event rssi_event)
+                           enum ieee80211_rssi_event_data rssi_event)
 {
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         struct iwl_bt_iterator_data data = {
diff --git a/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c b/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
index 4f303639147b..d954591e0be5 100644
--- a/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
+++ b/drivers/net/wireless/iwlwifi/mvm/coex_legacy.c
@@ -1128,7 +1128,7 @@ static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac,
 }
 
 void iwl_mvm_bt_rssi_event_old(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                               enum ieee80211_rssi_event rssi_event)
+                               enum ieee80211_rssi_event_data rssi_event)
 {
         struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
         struct iwl_bt_iterator_data data = {
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 500064f5d8f1..2b7e6cb1dbd9 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -1289,7 +1289,7 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,
                              struct iwl_rx_cmd_buffer *rxb,
                              struct iwl_device_cmd *cmd);
 void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                           enum ieee80211_rssi_event rssi_event);
+                           enum ieee80211_rssi_event_data);
 void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm);
 u16 iwl_mvm_coex_agg_time_limit(struct iwl_mvm *mvm,
                                 struct ieee80211_sta *sta);
@@ -1309,7 +1309,7 @@ int iwl_mvm_rx_bt_coex_notif_old(struct iwl_mvm *mvm,
                                  struct iwl_rx_cmd_buffer *rxb,
                                  struct iwl_device_cmd *cmd);
 void iwl_mvm_bt_rssi_event_old(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-                               enum ieee80211_rssi_event rssi_event);
+                               enum ieee80211_rssi_event_data);
 u16 iwl_mvm_coex_agg_time_limit_old(struct iwl_mvm *mvm,
                                     struct ieee80211_sta *sta);
 bool iwl_mvm_bt_coex_is_mimo_allowed_old(struct iwl_mvm *mvm,
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index a92985a6ea21..1a4d558022d8 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -1356,8 +1356,8 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
 
         /* Find the BSS we want using available scan results */
         bss = cfg80211_get_bss(wiphy, sme->channel, sme->bssid,
-                sme->ssid, sme->ssid_len,
-                WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+                sme->ssid, sme->ssid_len, IEEE80211_BSS_TYPE_ESS,
+                IEEE80211_PRIVACY_ANY);
         if (!bss) {
                 wiphy_err(wiphy, "assoc: bss %pM not in scan results\n",
                           sme->bssid);
@@ -2000,7 +2000,7 @@ static int lbs_join_ibss(struct wiphy *wiphy, struct net_device *dev,
          * bss list is populated already */
         bss = cfg80211_get_bss(wiphy, params->chandef.chan, params->bssid,
                 params->ssid, params->ssid_len,
-                WLAN_CAPABILITY_IBSS, WLAN_CAPABILITY_IBSS);
+                IEEE80211_BSS_TYPE_IBSS, IEEE80211_PRIVACY_ANY);
 
         if (bss) {
                 ret = lbs_ibss_join_existing(priv, params, bss);
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 4a4c6586a8d2..941925991476 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -330,6 +330,83 @@ static const struct ieee80211_rate hwsim_rates[] = {
         { .bitrate = 540 }
 };
 
+#define OUI_QCA 0x001374
+#define QCA_NL80211_SUBCMD_TEST 1
+enum qca_nl80211_vendor_subcmds {
+        QCA_WLAN_VENDOR_ATTR_TEST = 8,
+        QCA_WLAN_VENDOR_ATTR_MAX = QCA_WLAN_VENDOR_ATTR_TEST
+};
+
+static const struct nla_policy
+hwsim_vendor_test_policy[QCA_WLAN_VENDOR_ATTR_MAX + 1] = {
+        [QCA_WLAN_VENDOR_ATTR_MAX] = { .type = NLA_U32 },
+};
+
+static int mac80211_hwsim_vendor_cmd_test(struct wiphy *wiphy,
+                                          struct wireless_dev *wdev,
+                                          const void *data, int data_len)
+{
+        struct sk_buff *skb;
+        struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX + 1];
+        int err;
+        u32 val;
+
+        err = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_MAX, data, data_len,
+                        hwsim_vendor_test_policy);
+        if (err)
+                return err;
+        if (!tb[QCA_WLAN_VENDOR_ATTR_TEST])
+                return -EINVAL;
+        val = nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_TEST]);
+        wiphy_debug(wiphy, "%s: test=%u\n", __func__, val);
+
+        /* Send a vendor event as a test. Note that this would not normally be
+         * done within a command handler, but rather, based on some other
+         * trigger. For simplicity, this command is used to trigger the event
+         * here.
+         *
+         * event_idx = 0 (index in mac80211_hwsim_vendor_commands)
+         */
+        skb = cfg80211_vendor_event_alloc(wiphy, wdev, 100, 0, GFP_KERNEL);
+        if (skb) {
+                /* skb_put() or nla_put() will fill up data within
+                 * NL80211_ATTR_VENDOR_DATA.
+                 */
+
+                /* Add vendor data */
+                nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TEST, val + 1);
+
+                /* Send the event - this will call nla_nest_end() */
+                cfg80211_vendor_event(skb, GFP_KERNEL);
+        }
+
+        /* Send a response to the command */
+        skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 10);
+        if (!skb)
+                return -ENOMEM;
+
+        /* skb_put() or nla_put() will fill up data within
+         * NL80211_ATTR_VENDOR_DATA
+         */
+        nla_put_u32(skb, QCA_WLAN_VENDOR_ATTR_TEST, val + 2);
+
+        return cfg80211_vendor_cmd_reply(skb);
+}
+
+static struct wiphy_vendor_command mac80211_hwsim_vendor_commands[] = {
+        {
+                .info = { .vendor_id = OUI_QCA,
+                          .subcmd = QCA_NL80211_SUBCMD_TEST },
+                .flags = WIPHY_VENDOR_CMD_NEED_NETDEV,
+                .doit = mac80211_hwsim_vendor_cmd_test,
+        }
+};
+
+/* Advertise support vendor specific events */
+static const struct nl80211_vendor_cmd_info mac80211_hwsim_vendor_events[] = {
+        { .vendor_id = OUI_QCA, .subcmd = 1 },
+};
+
 static const struct ieee80211_iface_limit hwsim_if_limits[] = {
         { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) },
         { .max = 2048,  .types = BIT(NL80211_IFTYPE_STATION) |
@@ -906,8 +983,7 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
                 goto nla_put_failure;
         }
 
-        if (nla_put(skb, HWSIM_ATTR_ADDR_TRANSMITTER,
-                    ETH_ALEN, data->addresses[1].addr))
+        if (nla_put(skb, HWSIM_ATTR_ADDR_TRANSMITTER, ETH_ALEN, hdr->addr2))
                 goto nla_put_failure;
 
         /* We get the skb->data */
@@ -1519,21 +1595,16 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
                 vp->aid = info->aid;
         }
 
-        if (changed & BSS_CHANGED_BEACON_INT) {
-                wiphy_debug(hw->wiphy, "  BCNINT: %d\n", info->beacon_int);
-                data->beacon_int = info->beacon_int * 1024;
-        }
-
         if (changed & BSS_CHANGED_BEACON_ENABLED) {
-                wiphy_debug(hw->wiphy, "  BCN EN: %d\n", info->enable_beacon);
+                wiphy_debug(hw->wiphy, "  BCN EN: %d (BI=%u)\n",
+                            info->enable_beacon, info->beacon_int);
                 vp->bcn_en = info->enable_beacon;
                 if (data->started &&
                     !hrtimer_is_queued(&data->beacon_timer.timer) &&
                     info->enable_beacon) {
                         u64 tsf, until_tbtt;
                         u32 bcn_int;
-                        if (WARN_ON(!data->beacon_int))
-                                data->beacon_int = 1000 * 1024;
+                        data->beacon_int = info->beacon_int * 1024;
                         tsf = mac80211_hwsim_get_tsf(hw, vif);
                         bcn_int = data->beacon_int;
                         until_tbtt = bcn_int - do_div(tsf, bcn_int);
@@ -1547,8 +1618,10 @@ static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw,
                                 mac80211_hwsim_bcn_en_iter, &count);
                         wiphy_debug(hw->wiphy, "  beaconing vifs remaining: %u",
                                     count);
-                        if (count == 0)
+                        if (count == 0) {
                                 tasklet_hrtimer_cancel(&data->beacon_timer);
+                                data->beacon_int = 0;
+                        }
                 }
         }
 
@@ -2417,6 +2490,12 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
         hw->max_rates = 4;
         hw->max_rate_tries = 11;
 
+        hw->wiphy->vendor_commands = mac80211_hwsim_vendor_commands;
+        hw->wiphy->n_vendor_commands =
+                ARRAY_SIZE(mac80211_hwsim_vendor_commands);
+        hw->wiphy->vendor_events = mac80211_hwsim_vendor_events;
+        hw->wiphy->n_vendor_events = ARRAY_SIZE(mac80211_hwsim_vendor_events);
+
         if (param->reg_strict)
                 hw->wiphy->regulatory_flags |= REGULATORY_STRICT_REG;
         if (param->regd) {
@@ -2608,7 +2687,7 @@ static struct mac80211_hwsim_data *get_hwsim_data_ref_from_addr(const u8 *addr)
 
         spin_lock_bh(&hwsim_radio_lock);
         list_for_each_entry(data, &hwsim_radios, list) {
-                if (memcmp(data->addresses[1].addr, addr, ETH_ALEN) == 0) {
+                if (mac80211_hwsim_addr_match(data, addr)) {
                         _found = true;
                         break;
                 }
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 41c8e25df954..2d489bfaea08 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1954,13 +1954,13 @@ done:
                 if (mode == NL80211_IFTYPE_ADHOC)
                         bss = cfg80211_get_bss(priv->wdev.wiphy, channel,
                                                bssid, ssid, ssid_len,
-                                               WLAN_CAPABILITY_IBSS,
-                                               WLAN_CAPABILITY_IBSS);
+                                               IEEE80211_BSS_TYPE_IBSS,
+                                               IEEE80211_PRIVACY_ANY);
                 else
                         bss = cfg80211_get_bss(priv->wdev.wiphy, channel,
                                                bssid, ssid, ssid_len,
-                                               WLAN_CAPABILITY_ESS,
-                                               WLAN_CAPABILITY_ESS);
+                                               IEEE80211_BSS_TYPE_ESS,
+                                               IEEE80211_PRIVACY_ANY);
 
                 if (!bss) {
                         if (is_scanning_required) {
@@ -2399,10 +2399,11 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
 
 #define MWIFIEX_MAX_WQ_LEN  30
 /*
- *  create a new virtual interface with the given name
+ *  create a new virtual interface with the given name and name assign type
  */
 struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                                               const char *name,
+                                              unsigned char name_assign_type,
                                               enum nl80211_iftype type,
                                               u32 *flags,
                                               struct vif_params *params)
@@ -2523,7 +2524,7 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
         }
 
         dev = alloc_netdev_mqs(sizeof(struct mwifiex_private *), name,
-                               NET_NAME_UNKNOWN, ether_setup,
+                               name_assign_type, ether_setup,
                                IEEE80211_NUM_ACS, 1);
         if (!dev) {
                 wiphy_err(wiphy, "no memory available for netdevice\n");
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 7e74b4fccddd..6f55e84fcab1 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -466,7 +466,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
 
         rtnl_lock();
         /* Create station interface by default */
-        wdev = mwifiex_add_virtual_intf(adapter->wiphy, "mlan%d",
+        wdev = mwifiex_add_virtual_intf(adapter->wiphy, "mlan%d", NET_NAME_ENUM,
                                         NL80211_IFTYPE_STATION, NULL, NULL);
         if (IS_ERR(wdev)) {
                 dev_err(adapter->dev, "cannot create default STA interface\n");
@@ -475,7 +475,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
         }
 
         if (driver_mode & MWIFIEX_DRIVER_MODE_UAP) {
-                wdev = mwifiex_add_virtual_intf(adapter->wiphy, "uap%d",
+                wdev = mwifiex_add_virtual_intf(adapter->wiphy, "uap%d", NET_NAME_ENUM,
                                                 NL80211_IFTYPE_AP, NULL, NULL);
                 if (IS_ERR(wdev)) {
                         dev_err(adapter->dev, "cannot create AP interface\n");
@@ -485,7 +485,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
         }
 
         if (driver_mode & MWIFIEX_DRIVER_MODE_P2P) {
-                wdev = mwifiex_add_virtual_intf(adapter->wiphy, "p2p%d",
+                wdev = mwifiex_add_virtual_intf(adapter->wiphy, "p2p%d", NET_NAME_ENUM,
                                                 NL80211_IFTYPE_P2P_CLIENT, NULL,
                                                 NULL);
                 if (IS_ERR(wdev)) {
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index f0a6af179af0..3f0625f22265 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -1318,6 +1318,7 @@ u8 mwifiex_chan_type_to_sec_chan_offset(enum nl80211_channel_type chan_type);
 
 struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
                                               const char *name,
+                                              unsigned char name_assign_type,
                                               enum nl80211_iftype type,
                                               u32 *flags,
                                               struct vif_params *params);
diff --git a/drivers/net/wireless/orinoco/Kconfig b/drivers/net/wireless/orinoco/Kconfig
index 6d831d4d1b5f..f6fa3f4e294f 100644
--- a/drivers/net/wireless/orinoco/Kconfig
+++ b/drivers/net/wireless/orinoco/Kconfig
@@ -2,7 +2,7 @@ config HERMES
         tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
         depends on (PPC_PMAC || PCI || PCMCIA)
         depends on CFG80211
-        select CFG80211_WEXT
+        select CFG80211_WEXT_EXPORT
         select WIRELESS_EXT
         select WEXT_SPY
         select WEXT_PRIV
diff --git a/drivers/net/wireless/ti/wl18xx/event.c b/drivers/net/wireless/ti/wl18xx/event.c
index c28f06854195..548bb9e7e91e 100644
--- a/drivers/net/wireless/ti/wl18xx/event.c
+++ b/drivers/net/wireless/ti/wl18xx/event.c
@@ -77,7 +77,7 @@ static int wlcore_smart_config_sync_event(struct wl1271 *wl, u8 sync_channel,
         wl1271_debug(DEBUG_EVENT,
                      "SMART_CONFIG_SYNC_EVENT_ID, freq: %d (chan: %d band %d)",
                      freq, sync_channel, sync_band);
-        skb = cfg80211_vendor_event_alloc(wl->hw->wiphy, 20,
+        skb = cfg80211_vendor_event_alloc(wl->hw->wiphy, NULL, 20,
                                           WLCORE_VENDOR_EVENT_SC_SYNC,
                                           GFP_KERNEL);
 
@@ -98,7 +98,7 @@ static int wlcore_smart_config_decode_event(struct wl1271 *wl,
         wl1271_debug(DEBUG_EVENT, "SMART_CONFIG_DECODE_EVENT_ID");
         wl1271_dump_ascii(DEBUG_EVENT, "SSID:", ssid, ssid_len);
 
-        skb = cfg80211_vendor_event_alloc(wl->hw->wiphy,
+        skb = cfg80211_vendor_event_alloc(wl->hw->wiphy, NULL,
                                           ssid_len + pwd_len + 20,
                                           WLCORE_VENDOR_EVENT_SC_DECODE,
                                           GFP_KERNEL);