Merge tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / drivers / staging / rtl8723bs / os_dep / ioctl_cfg80211.c

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 3b75739593124c0f90fba282991c7a42840d4f0c..5e7a61f24f8dc38daea774986696ec6cc1d9ce9d 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -542,20 +542,24 @@ check_bss:
                struct ieee80211_channel *notify_channel;
                u32 freq;
                u16 channel = cur_network->network.Configuration.DSConfig;
+               struct cfg80211_roam_info roam_info = {};
 
                freq = rtw_ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
 
                notify_channel = ieee80211_get_channel(wiphy, freq);
 
                DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
-               cfg80211_roamed(padapter->pnetdev
-                       , notify_channel
-                       , cur_network->network.MacAddress
-                       , pmlmepriv->assoc_req+sizeof(struct ieee80211_hdr_3addr)+2
-                       , pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2
-                       , pmlmepriv->assoc_rsp+sizeof(struct ieee80211_hdr_3addr)+6
-                       , pmlmepriv->assoc_rsp_len-sizeof(struct ieee80211_hdr_3addr)-6
-                       , GFP_ATOMIC);
+               roam_info.channel = notify_channel;
+               roam_info.bssid = cur_network->network.MacAddress;
+               roam_info.req_ie =
+                       pmlmepriv->assoc_req+sizeof(struct ieee80211_hdr_3addr)+2;
+               roam_info.req_ie_len =
+                       pmlmepriv->assoc_req_len-sizeof(struct ieee80211_hdr_3addr)-2;
+               roam_info.resp_ie =
+                       pmlmepriv->assoc_rsp+sizeof(struct ieee80211_hdr_3addr)+6;
+               roam_info.resp_ie_len =
+                       pmlmepriv->assoc_rsp_len-sizeof(struct ieee80211_hdr_3addr)-6;
+               cfg80211_roamed(padapter->pnetdev, &roam_info, GFP_ATOMIC);
        }
        else
        {
@@ -1310,7 +1314,7 @@ extern int netdev_open(struct net_device *pnetdev);
 
 static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
                                     struct net_device *ndev,
-                                    enum nl80211_iftype type, u32 *flags,
+                                    enum nl80211_iftype type,
                                     struct vif_params *params)
 {
        enum nl80211_iftype old_type;
@@ -2711,7 +2715,7 @@ static struct wireless_dev *
                struct wiphy *wiphy,
                const char *name,
                unsigned char name_assign_type,
-               enum nl80211_iftype type, u32 *flags, struct vif_params *params)
+               enum nl80211_iftype type, struct vif_params *params)
 {
        int ret = 0;
        struct net_device* ndev = NULL;
@@ -3406,7 +3410,7 @@ static void rtw_cfg80211_preinit_wiphy(struct adapter *padapter, struct wiphy *w
        wiphy->flags |= WIPHY_FLAG_OFFCHAN_TX | WIPHY_FLAG_HAVE_AP_SME;
 
 #if defined(CONFIG_PM)
-       wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
+       wiphy->max_sched_scan_reqs = 1;
 #ifdef CONFIG_PNO_SUPPORT
        wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;
 #endif