Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

23 files changed, 114 insertions, 80 deletions

diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index d48776e4f343..334c2ece855a 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -1955,8 +1955,9 @@ static void at76_dwork_hw_scan(struct work_struct *work)
 
 static int at76_hw_scan(struct ieee80211_hw *hw,
                         struct ieee80211_vif *vif,
-                        struct cfg80211_scan_request *req)
+                        struct ieee80211_scan_request *hw_req)
 {
+        struct cfg80211_scan_request *req = &hw_req->req;
         struct at76_priv *priv = hw->priv;
         struct at76_req_scan scan;
         u8 *ssid = NULL;
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index a21080028c54..b8314a534972 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3137,10 +3137,11 @@ exit:
 
 static int ath10k_hw_scan(struct ieee80211_hw *hw,
                           struct ieee80211_vif *vif,
-                          struct cfg80211_scan_request *req)
+                          struct ieee80211_scan_request *hw_req)
 {
         struct ath10k *ar = hw->priv;
         struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
+        struct cfg80211_scan_request *req = &hw_req->req;
         struct wmi_start_scan_arg arg;
         int ret = 0;
         int i;
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 83cb39efb636..f5727c7a53b8 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -2409,8 +2409,9 @@ void ath_offchannel_timer(unsigned long data)
 }
 
 static int ath9k_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                         struct cfg80211_scan_request *req)
+                         struct ieee80211_scan_request *hw_req)
 {
+        struct cfg80211_scan_request *req = &hw_req->req;
         struct ath_softc *sc = hw->priv;
         struct ath_common *common = ath9k_hw_common(sc->sc_ah);
         int ret = 0;
diff --git a/drivers/net/wireless/cw1200/scan.c b/drivers/net/wireless/cw1200/scan.c
index 9afcd4ce3368..b2fb6c632092 100644
--- a/drivers/net/wireless/cw1200/scan.c
+++ b/drivers/net/wireless/cw1200/scan.c
@@ -53,9 +53,10 @@ static int cw1200_scan_start(struct cw1200_common *priv, struct wsm_scan *scan)
 
 int cw1200_hw_scan(struct ieee80211_hw *hw,
                    struct ieee80211_vif *vif,
-                   struct cfg80211_scan_request *req)
+                   struct ieee80211_scan_request *hw_req)
 {
         struct cw1200_common *priv = hw->priv;
+        struct cfg80211_scan_request *req = &hw_req->req;
         struct wsm_template_frame frame = {
                 .frame_type = WSM_FRAME_TYPE_PROBE_REQUEST,
         };
diff --git a/drivers/net/wireless/cw1200/scan.h b/drivers/net/wireless/cw1200/scan.h
index 5a8296ccfa82..cc75459e5784 100644
--- a/drivers/net/wireless/cw1200/scan.h
+++ b/drivers/net/wireless/cw1200/scan.h
@@ -41,7 +41,7 @@ struct cw1200_scan {
 
 int cw1200_hw_scan(struct ieee80211_hw *hw,
                    struct ieee80211_vif *vif,
-                   struct cfg80211_scan_request *req);
+                   struct ieee80211_scan_request *hw_req);
 void cw1200_scan_work(struct work_struct *work);
 void cw1200_scan_timeout(struct work_struct *work);
 void cw1200_clear_recent_scan_work(struct work_struct *work);
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index ecc674627e6e..03de7467aecf 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -1572,8 +1572,9 @@ il_scan_initiate(struct il_priv *il, struct ieee80211_vif *vif)
 
 int
 il_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-               struct cfg80211_scan_request *req)
+               struct ieee80211_scan_request *hw_req)
 {
+        struct cfg80211_scan_request *req = &hw_req->req;
         struct il_priv *il = hw->priv;
         int ret;
 
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index ea5c0f863c4e..5b972798bdff 100644
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1787,7 +1787,7 @@ int il_scan_cancel(struct il_priv *il);
 int il_scan_cancel_timeout(struct il_priv *il, unsigned long ms);
 void il_force_scan_end(struct il_priv *il);
 int il_mac_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                   struct cfg80211_scan_request *req);
+                   struct ieee80211_scan_request *hw_req);
 void il_internal_short_hw_scan(struct il_priv *il);
 int il_force_reset(struct il_priv *il, bool external);
 u16 il_fill_probe_req(struct il_priv *il, struct ieee80211_mgmt *frame,
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 29af7b51e370..afb98f4fdaf3 100644
--- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@ -1495,9 +1495,10 @@ static int iwlagn_mac_change_interface(struct ieee80211_hw *hw,
 
 static int iwlagn_mac_hw_scan(struct ieee80211_hw *hw,
                               struct ieee80211_vif *vif,
-                              struct cfg80211_scan_request *req)
+                              struct ieee80211_scan_request *hw_req)
 {
         struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);
+        struct cfg80211_scan_request *req = &hw_req->req;
         int ret;
 
         IWL_DEBUG_MAC80211(priv, "enter\n");
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index 7215f5980186..7dd363dd3ad3 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -1537,9 +1537,10 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
 
 static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif,
-                               struct cfg80211_scan_request *req)
+                               struct ieee80211_scan_request *hw_req)
 {
         struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
+        struct cfg80211_scan_request *req = &hw_req->req;
         int ret;
 
         if (req->n_channels == 0 || req->n_channels > MAX_NUM_SCAN_CHANNELS)
@@ -1827,7 +1828,7 @@ static void iwl_mvm_mac_mgd_prepare_tx(struct ieee80211_hw *hw,
 static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif,
                                         struct cfg80211_sched_scan_request *req,
-                                        struct ieee80211_sched_scan_ies *ies)
+                                        struct ieee80211_scan_ies *ies)
 {
         struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
         int ret;
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index fcc6c29482d0..97630f9a7cb9 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -854,7 +854,7 @@ int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
 int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,
                               struct ieee80211_vif *vif,
                               struct cfg80211_sched_scan_request *req,
-                              struct ieee80211_sched_scan_ies *ies);
+                              struct ieee80211_scan_ies *ies);
 int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
                                        struct cfg80211_sched_scan_request *req);
 int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 4b6c7d4bd199..3206fa097255 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -204,7 +204,8 @@ static void iwl_mvm_scan_fill_channels(struct iwl_scan_cmd *cmd,
  */
 static u16 iwl_mvm_fill_probe_req(struct ieee80211_mgmt *frame, const u8 *ta,
                                   int n_ssids, const u8 *ssid, int ssid_len,
-                                  const u8 *ie, int ie_len,
+                                  const u8 *band_ie, int band_ie_len,
+                                  const u8 *common_ie, int common_ie_len,
                                   int left)
 {
         int len = 0;
@@ -244,12 +245,19 @@ static u16 iwl_mvm_fill_probe_req(struct ieee80211_mgmt *frame, const u8 *ta,
 
         len += ssid_len + 2;
 
-        if (WARN_ON(left < ie_len))
+        if (WARN_ON(left < band_ie_len + common_ie_len))
                 return len;
 
-        if (ie && ie_len) {
-                memcpy(pos, ie, ie_len);
-                len += ie_len;
+        if (band_ie && band_ie_len) {
+                memcpy(pos, band_ie, band_ie_len);
+                pos += band_ie_len;
+                len += band_ie_len;
+        }
+
+        if (common_ie && common_ie_len) {
+                memcpy(pos, common_ie, common_ie_len);
+                pos += common_ie_len;
+                len += common_ie_len;
         }
 
         return (u16)len;
@@ -382,7 +390,7 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm,
                             (struct ieee80211_mgmt *)cmd->data,
                             vif->addr,
                             req->n_ssids, ssid, ssid_len,
-                            req->ie, req->ie_len,
+                            req->ie, req->ie_len, NULL, 0,
                             mvm->fw->ucode_capa.max_probe_length));
 
         iwl_mvm_scan_fill_channels(cmd, req, basic_ssid, &params);
@@ -561,7 +569,7 @@ int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
 
 static void iwl_scan_offload_build_tx_cmd(struct iwl_mvm *mvm,
                                           struct ieee80211_vif *vif,
-                                          struct ieee80211_sched_scan_ies *ies,
+                                          struct ieee80211_scan_ies *ies,
                                           enum ieee80211_band band,
                                           struct iwl_tx_cmd *cmd,
                                           u8 *data)
@@ -577,7 +585,8 @@ static void iwl_scan_offload_build_tx_cmd(struct iwl_mvm *mvm,
         cmd_len = iwl_mvm_fill_probe_req((struct ieee80211_mgmt *)data,
                                          vif->addr,
                                          1, NULL, 0,
-                                         ies->ie[band], ies->len[band],
+                                         ies->ies[band], ies->len[band],
+                                         ies->common_ies, ies->common_ie_len,
                                          SCAN_OFFLOAD_PROBE_REQ_SIZE);
         cmd->len = cpu_to_le16(cmd_len);
 }
@@ -735,7 +744,7 @@ static void iwl_build_channel_cfg(struct iwl_mvm *mvm,
 int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,
                               struct ieee80211_vif *vif,
                               struct cfg80211_sched_scan_request *req,
-                              struct ieee80211_sched_scan_ies *ies)
+                              struct ieee80211_scan_ies *ies)
 {
         int band_2ghz = mvm->nvm_data->bands[IEEE80211_BAND_2GHZ].n_channels;
         int band_5ghz = mvm->nvm_data->bands[IEEE80211_BAND_5GHZ].n_channels;
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index a312c653d116..eba51460a5de 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -781,6 +781,36 @@ static void mac80211_hwsim_monitor_ack(struct ieee80211_channel *chan,
         netif_rx(skb);
 }
 
+struct mac80211_hwsim_addr_match_data {
+        u8 addr[ETH_ALEN];
+        bool ret;
+};
+
+static void mac80211_hwsim_addr_iter(void *data, u8 *mac,
+                                     struct ieee80211_vif *vif)
+{
+        struct mac80211_hwsim_addr_match_data *md = data;
+
+        if (memcmp(mac, md->addr, ETH_ALEN) == 0)
+                md->ret = true;
+}
+
+static bool mac80211_hwsim_addr_match(struct mac80211_hwsim_data *data,
+                                      const u8 *addr)
+{
+        struct mac80211_hwsim_addr_match_data md = {
+                .ret = false,
+        };
+
+        memcpy(md.addr, addr, ETH_ALEN);
+
+        ieee80211_iterate_active_interfaces_atomic(data->hw,
+                                                   IEEE80211_IFACE_ITER_NORMAL,
+                                                   mac80211_hwsim_addr_iter,
+                                                   &md);
+
+        return md.ret;
+}
 
 static bool hwsim_ps_rx_ok(struct mac80211_hwsim_data *data,
                            struct sk_buff *skb)
@@ -798,8 +828,7 @@ static bool hwsim_ps_rx_ok(struct mac80211_hwsim_data *data,
                 /* Allow unicast frames to own address if there is a pending
                  * PS-Poll */
                 if (data->ps_poll_pending &&
-                    memcmp(data->hw->wiphy->perm_addr, skb->data + 4,
-                           ETH_ALEN) == 0) {
+                    mac80211_hwsim_addr_match(data, skb->data + 4)) {
                         data->ps_poll_pending = false;
                         return true;
                 }
@@ -809,39 +838,6 @@ static bool hwsim_ps_rx_ok(struct mac80211_hwsim_data *data,
         return true;
 }
 
-
-struct mac80211_hwsim_addr_match_data {
-        bool ret;
-        const u8 *addr;
-};
-
-static void mac80211_hwsim_addr_iter(void *data, u8 *mac,
-                                     struct ieee80211_vif *vif)
-{
-        struct mac80211_hwsim_addr_match_data *md = data;
-        if (memcmp(mac, md->addr, ETH_ALEN) == 0)
-                md->ret = true;
-}
-
-
-static bool mac80211_hwsim_addr_match(struct mac80211_hwsim_data *data,
-                                      const u8 *addr)
-{
-        struct mac80211_hwsim_addr_match_data md;
-
-        if (memcmp(addr, data->hw->wiphy->perm_addr, ETH_ALEN) == 0)
-                return true;
-
-        md.ret = false;
-        md.addr = addr;
-        ieee80211_iterate_active_interfaces_atomic(data->hw,
-                                                   IEEE80211_IFACE_ITER_NORMAL,
-                                                   mac80211_hwsim_addr_iter,
-                                                   &md);
-
-        return md.ret;
-}
-
 static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw,
                                        struct sk_buff *my_skb,
                                        int dst_portid)
@@ -1740,9 +1736,10 @@ static void hw_scan_work(struct work_struct *work)
 
 static int mac80211_hwsim_hw_scan(struct ieee80211_hw *hw,
                                   struct ieee80211_vif *vif,
-                                  struct cfg80211_scan_request *req)
+                                  struct ieee80211_scan_request *hw_req)
 {
         struct mac80211_hwsim_data *hwsim = hw->priv;
+        struct cfg80211_scan_request *req = &hw_req->req;
 
         mutex_lock(&hwsim->mutex);
         if (WARN_ON(hwsim->tmp_chan || hwsim->hw_scan_request)) {
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 8e7b9c9696f6..e33a0347d3e2 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -2609,7 +2609,8 @@ static int
 mwifiex_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
                            const u8 *peer, u8 action_code, u8 dialog_token,
                            u16 status_code, u32 peer_capability,
-                           const u8 *extra_ies, size_t extra_ies_len)
+                           bool initiator, const u8 *extra_ies,
+                           size_t extra_ies_len)
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
         int ret;
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c
index 4e782f18ae34..38234851457e 100644
--- a/drivers/net/wireless/ti/wl1251/main.c
+++ b/drivers/net/wireless/ti/wl1251/main.c
@@ -991,8 +991,9 @@ out:
 
 static int wl1251_op_hw_scan(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif,
-                             struct cfg80211_scan_request *req)
+                             struct ieee80211_scan_request *hw_req)
 {
+        struct cfg80211_scan_request *req = &hw_req->req;
         struct wl1251 *wl = hw->priv;
         struct sk_buff *skb;
         size_t ssid_len = 0;
diff --git a/drivers/net/wireless/ti/wl12xx/scan.c b/drivers/net/wireless/ti/wl12xx/scan.c
index 7541bd1a4a4b..0c0d5cd98514 100644
--- a/drivers/net/wireless/ti/wl12xx/scan.c
+++ b/drivers/net/wireless/ti/wl12xx/scan.c
@@ -156,7 +156,7 @@ static int wl1271_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                          cmd->params.role_id, band,
                                          wl->scan.ssid, wl->scan.ssid_len,
                                          wl->scan.req->ie,
-                                         wl->scan.req->ie_len, false);
+                                         wl->scan.req->ie_len, NULL, 0, false);
         if (ret < 0) {
                 wl1271_error("PROBE request template failed");
                 goto out;
@@ -317,7 +317,7 @@ static void wl12xx_adjust_channels(struct wl1271_cmd_sched_scan_config *cmd,
 int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                                   struct wl12xx_vif *wlvif,
                                   struct cfg80211_sched_scan_request *req,
-                                  struct ieee80211_sched_scan_ies *ies)
+                                  struct ieee80211_scan_ies *ies)
 {
         struct wl1271_cmd_sched_scan_config *cfg = NULL;
         struct wlcore_scan_channels *cfg_channels = NULL;
@@ -378,8 +378,11 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                                                  wlvif->role_id, band,
                                                  req->ssids[0].ssid,
                                                  req->ssids[0].ssid_len,
-                                                 ies->ie[band],
-                                                 ies->len[band], true);
+                                                 ies->ies[band],
+                                                 ies->len[band],
+                                                 ies->common_ies,
+                                                 ies->common_ie_len,
+                                                 true);
                 if (ret < 0) {
                         wl1271_error("2.4GHz PROBE request template failed");
                         goto out;
@@ -392,8 +395,11 @@ int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                                                  wlvif->role_id, band,
                                                  req->ssids[0].ssid,
                                                  req->ssids[0].ssid_len,
-                                                 ies->ie[band],
-                                                 ies->len[band], true);
+                                                 ies->ies[band],
+                                                 ies->len[band],
+                                                 ies->common_ies,
+                                                 ies->common_ie_len,
+                                                 true);
                 if (ret < 0) {
                         wl1271_error("5GHz PROBE request template failed");
                         goto out;
@@ -449,7 +455,7 @@ out_free:
 
 int wl12xx_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif  *wlvif,
                             struct cfg80211_sched_scan_request *req,
-                            struct ieee80211_sched_scan_ies *ies)
+                            struct ieee80211_scan_ies *ies)
 {
         int ret;
 
diff --git a/drivers/net/wireless/ti/wl12xx/scan.h b/drivers/net/wireless/ti/wl12xx/scan.h
index 264af7ac2785..427f9af85a00 100644
--- a/drivers/net/wireless/ti/wl12xx/scan.h
+++ b/drivers/net/wireless/ti/wl12xx/scan.h
@@ -135,6 +135,6 @@ int wl12xx_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 void wl12xx_scan_completed(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 int wl12xx_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif  *wlvif,
                             struct cfg80211_sched_scan_request *req,
-                            struct ieee80211_sched_scan_ies *ies);
+                            struct ieee80211_scan_ies *ies);
 void wl12xx_scan_sched_scan_stop(struct wl1271 *wl,  struct wl12xx_vif *wlvif);
 #endif
diff --git a/drivers/net/wireless/ti/wl18xx/scan.c b/drivers/net/wireless/ti/wl18xx/scan.c
index 2b642f8c9266..98666f235a12 100644
--- a/drivers/net/wireless/ti/wl18xx/scan.c
+++ b/drivers/net/wireless/ti/wl18xx/scan.c
@@ -113,6 +113,8 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                  req->ssids ? req->ssids[0].ssid_len : 0,
                                  req->ie,
                                  req->ie_len,
+                                 NULL,
+                                 0,
                                  false);
                 if (ret < 0) {
                         wl1271_error("2.4GHz PROBE request template failed");
@@ -128,6 +130,8 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                  req->ssids ? req->ssids[0].ssid_len : 0,
                                  req->ie,
                                  req->ie_len,
+                                 NULL,
+                                 0,
                                  false);
                 if (ret < 0) {
                         wl1271_error("5GHz PROBE request template failed");
@@ -161,7 +165,7 @@ static
 int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
                                   struct wl12xx_vif *wlvif,
                                   struct cfg80211_sched_scan_request *req,
-                                  struct ieee80211_sched_scan_ies *ies)
+                                  struct ieee80211_scan_ies *ies)
 {
         struct wl18xx_cmd_scan_params *cmd;
         struct wlcore_scan_channels *cmd_channels = NULL;
@@ -237,8 +241,10 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
                                  cmd->role_id, band,
                                  req->ssids ? req->ssids[0].ssid : NULL,
                                  req->ssids ? req->ssids[0].ssid_len : 0,
-                                 ies->ie[band],
+                                 ies->ies[band],
                                  ies->len[band],
+                                 ies->common_ies,
+                                 ies->common_ie_len,
                                  true);
                 if (ret < 0) {
                         wl1271_error("2.4GHz PROBE request template failed");
@@ -252,8 +258,10 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
                                  cmd->role_id, band,
                                  req->ssids ? req->ssids[0].ssid : NULL,
                                  req->ssids ? req->ssids[0].ssid_len : 0,
-                                 ies->ie[band],
+                                 ies->ies[band],
                                  ies->len[band],
+                                 ies->common_ies,
+                                 ies->common_ie_len,
                                  true);
                 if (ret < 0) {
                         wl1271_error("5GHz PROBE request template failed");
@@ -277,7 +285,7 @@ out:
 
 int wl18xx_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                             struct cfg80211_sched_scan_request *req,
-                            struct ieee80211_sched_scan_ies *ies)
+                            struct ieee80211_scan_ies *ies)
 {
         return wl18xx_scan_sched_scan_config(wl, wlvif, req, ies);
 }
diff --git a/drivers/net/wireless/ti/wl18xx/scan.h b/drivers/net/wireless/ti/wl18xx/scan.h
index eadee42689d1..2e636aa5dba9 100644
--- a/drivers/net/wireless/ti/wl18xx/scan.h
+++ b/drivers/net/wireless/ti/wl18xx/scan.h
@@ -122,6 +122,6 @@ int wl18xx_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 void wl18xx_scan_completed(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 int wl18xx_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                             struct cfg80211_sched_scan_request *req,
-                            struct ieee80211_sched_scan_ies *ies);
+                            struct ieee80211_scan_ies *ies);
 void wl18xx_scan_sched_scan_stop(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 #endif
diff --git a/drivers/net/wireless/ti/wlcore/cmd.c b/drivers/net/wireless/ti/wlcore/cmd.c
index 40dc30f4faaa..e269c0a57017 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.c
+++ b/drivers/net/wireless/ti/wlcore/cmd.c
@@ -1124,7 +1124,8 @@ out:
 int wl12xx_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                u8 role_id, u8 band,
                                const u8 *ssid, size_t ssid_len,
-                               const u8 *ie, size_t ie_len, bool sched_scan)
+                               const u8 *ie0, size_t ie0_len, const u8 *ie1,
+                               size_t ie1_len, bool sched_scan)
 {
         struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
         struct sk_buff *skb;
@@ -1136,13 +1137,15 @@ int wl12xx_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,
         wl1271_debug(DEBUG_SCAN, "build probe request band %d", band);
 
         skb = ieee80211_probereq_get(wl->hw, vif, ssid, ssid_len,
-                                     ie_len);
+                                     ie0_len + ie1_len);
         if (!skb) {
                 ret = -ENOMEM;
                 goto out;
         }
-        if (ie_len)
-                memcpy(skb_put(skb, ie_len), ie, ie_len);
+        if (ie0_len)
+                memcpy(skb_put(skb, ie0_len), ie0, ie0_len);
+        if (ie1_len)
+                memcpy(skb_put(skb, ie1_len), ie1, ie1_len);
 
         if (sched_scan &&
             (wl->quirks & WLCORE_QUIRK_DUAL_PROBE_TMPL)) {
diff --git a/drivers/net/wireless/ti/wlcore/cmd.h b/drivers/net/wireless/ti/wlcore/cmd.h
index b084830a61cf..6788d7356ca5 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.h
+++ b/drivers/net/wireless/ti/wlcore/cmd.h
@@ -64,7 +64,8 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, struct wl12xx_vif *wlvif,
 int wl12xx_cmd_build_probe_req(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                u8 role_id, u8 band,
                                const u8 *ssid, size_t ssid_len,
-                               const u8 *ie, size_t ie_len, bool sched_scan);
+                               const u8 *ie, size_t ie_len, const u8 *common_ie,
+                               size_t common_ie_len, bool sched_scan);
 struct sk_buff *wl1271_cmd_build_ap_probe_req(struct wl1271 *wl,
                                               struct wl12xx_vif *wlvif,
                                               struct sk_buff *skb);
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 3d6028e62750..48f83868f9cb 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -3540,8 +3540,9 @@ out:
 
 static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif,
-                             struct cfg80211_scan_request *req)
+                             struct ieee80211_scan_request *hw_req)
 {
+        struct cfg80211_scan_request *req = &hw_req->req;
         struct wl1271 *wl = hw->priv;
         int ret;
         u8 *ssid = NULL;
@@ -3636,7 +3637,7 @@ out:
 static int wl1271_op_sched_scan_start(struct ieee80211_hw *hw,
                                       struct ieee80211_vif *vif,
                                       struct cfg80211_sched_scan_request *req,
-                                      struct ieee80211_sched_scan_ies *ies)
+                                      struct ieee80211_scan_ies *ies)
 {
         struct wl1271 *wl = hw->priv;
         struct wl12xx_vif *wlvif = wl12xx_vif_to_data(vif);
diff --git a/drivers/net/wireless/ti/wlcore/scan.h b/drivers/net/wireless/ti/wlcore/scan.h
index a6ab24b5c0f9..4dadd0c62cde 100644
--- a/drivers/net/wireless/ti/wlcore/scan.h
+++ b/drivers/net/wireless/ti/wlcore/scan.h
@@ -37,7 +37,7 @@ void wl1271_scan_complete_work(struct work_struct *work);
 int wl1271_scan_sched_scan_config(struct wl1271 *wl,
                                      struct wl12xx_vif *wlvif,
                                      struct cfg80211_sched_scan_request *req,
-                                     struct ieee80211_sched_scan_ies *ies);
+                                     struct ieee80211_scan_ies *ies);
 int wl1271_scan_sched_scan_start(struct wl1271 *wl, struct wl12xx_vif *wlvif);
 void wlcore_scan_sched_scan_results(struct wl1271 *wl);
 
diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 95a54504f0cc..71320509b56d 100644
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -95,7 +95,7 @@ struct wlcore_ops {
         int (*scan_stop)(struct wl1271 *wl, struct wl12xx_vif *wlvif);
         int (*sched_scan_start)(struct wl1271 *wl, struct wl12xx_vif *wlvif,
                                 struct cfg80211_sched_scan_request *req,
-                                struct ieee80211_sched_scan_ies *ies);
+                                struct ieee80211_scan_ies *ies);
         void (*sched_scan_stop)(struct wl1271 *wl, struct wl12xx_vif *wlvif);
         int (*get_spare_blocks)(struct wl1271 *wl, bool is_gem);
         int (*set_key)(struct wl1271 *wl, enum set_key_cmd cmd,