1 files changed, 45 insertions, 41 deletions

diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 620e3c0e88e0..3802c31fefcd 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -244,6 +244,10 @@ enum ndis_80211_power_mode {
         NDIS_80211_POWER_MODE_FAST_PSP,
 };
 
+enum ndis_80211_pmkid_cand_list_flag_bits {
+        NDIS_80211_PMKID_CAND_PREAUTH = cpu_to_le32(1 << 0)
+};
+
 struct ndis_80211_auth_request {
         __le32 length;
         u8 bssid[6];
@@ -387,19 +391,17 @@ struct ndis_80211_capability {
 struct ndis_80211_bssid_info {
         u8 bssid[6];
         u8 pmkid[16];
-};
+} __packed;
 
 struct ndis_80211_pmkid {
         __le32 length;
         __le32 bssid_info_count;
         struct ndis_80211_bssid_info bssid_info[0];
-};
+} __packed;
 
 /*
  *  private data
  */
-#define NET_TYPE_11FB   0
-
 #define CAP_MODE_80211A         1
 #define CAP_MODE_80211B         2
 #define CAP_MODE_80211G         4
@@ -1347,6 +1349,32 @@ static int set_channel(struct usbnet *usbdev, int channel)
         return ret;
 }
 
+static struct ieee80211_channel *get_current_channel(struct usbnet *usbdev,
+                                                     u16 *beacon_interval)
+{
+        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+        struct ieee80211_channel *channel;
+        struct ndis_80211_conf config;
+        int len, ret;
+
+        /* Get channel and beacon interval */
+        len = sizeof(config);
+        ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
+        netdev_dbg(usbdev->net, "%s(): OID_802_11_CONFIGURATION -> %d\n",
+                                __func__, ret);
+        if (ret < 0)
+                return NULL;
+
+        channel = ieee80211_get_channel(priv->wdev.wiphy,
+                                KHZ_TO_MHZ(le32_to_cpu(config.ds_config)));
+        if (!channel)
+                return NULL;
+
+        if (beacon_interval)
+                *beacon_interval = le16_to_cpu(config.beacon_period);
+        return channel;
+}
+
 /* index must be 0 - N, as per NDIS  */
 static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len,
                                                                 int index)
@@ -2650,13 +2678,12 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
 {
         struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
         struct ieee80211_channel *channel;
-        struct ndis_80211_conf config;
         struct ndis_80211_ssid ssid;
         struct cfg80211_bss *bss;
         s32 signal;
         u64 timestamp;
         u16 capability;
-        u16 beacon_interval;
+        u16 beacon_interval = 0;
         __le32 rssi;
         u8 ie_buf[34];
         int len, ret, ie_len;
@@ -2681,22 +2708,10 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
         }
 
         /* Get channel and beacon interval */
-        len = sizeof(config);
-        ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
-        netdev_dbg(usbdev->net, "%s(): OID_802_11_CONFIGURATION -> %d\n",
-                                __func__, ret);
-        if (ret >= 0) {
-                beacon_interval = le16_to_cpu(config.beacon_period);
-                channel = ieee80211_get_channel(priv->wdev.wiphy,
-                                KHZ_TO_MHZ(le32_to_cpu(config.ds_config)));
-                if (!channel) {
-                        netdev_warn(usbdev->net, "%s(): could not get channel."
-                                                 "\n", __func__);
-                        return;
-                }
-        } else {
-                netdev_warn(usbdev->net, "%s(): could not get configuration.\n",
-                                         __func__);
+        channel = get_current_channel(usbdev, &beacon_interval);
+        if (!channel) {
+                netdev_warn(usbdev->net, "%s(): could not get channel.\n",
+                                        __func__);
                 return;
         }
 
@@ -2841,8 +2856,9 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
                                                 req_ie_len, resp_ie,
                                                 resp_ie_len, 0, GFP_KERNEL);
                 else
-                        cfg80211_roamed(usbdev->net, NULL, bssid,
-                                        req_ie, req_ie_len,
+                        cfg80211_roamed(usbdev->net,
+                                        get_current_channel(usbdev, NULL),
+                                        bssid, req_ie, req_ie_len,
                                         resp_ie, resp_ie_len, GFP_KERNEL);
         } else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
                 cfg80211_ibss_joined(usbdev->net, bssid, GFP_KERNEL);
@@ -3008,25 +3024,13 @@ static void rndis_wlan_pmkid_cand_list_indication(struct usbnet *usbdev,
         for (i = 0; i < le32_to_cpu(cand_list->num_candidates); i++) {
                 struct ndis_80211_pmkid_candidate *cand =
                                                 &cand_list->candidate_list[i];
+                bool preauth = !!(cand->flags & NDIS_80211_PMKID_CAND_PREAUTH);
 
-                netdev_dbg(usbdev->net, "cand[%i]: flags: 0x%08x, bssid: %pM\n",
-                           i, le32_to_cpu(cand->flags), cand->bssid);
-
-#if 0
-                struct iw_pmkid_cand pcand;
-                union iwreq_data wrqu;
+                netdev_dbg(usbdev->net, "cand[%i]: flags: 0x%08x, preauth: %d, bssid: %pM\n",
+                           i, le32_to_cpu(cand->flags), preauth, cand->bssid);
 
-                memset(&pcand, 0, sizeof(pcand));
-                if (le32_to_cpu(cand->flags) & 0x01)
-                        pcand.flags |= IW_PMKID_CAND_PREAUTH;
-                pcand.index = i;
-                memcpy(pcand.bssid.sa_data, cand->bssid, ETH_ALEN);
-
-                memset(&wrqu, 0, sizeof(wrqu));
-                wrqu.data.length = sizeof(pcand);
-                wireless_send_event(usbdev->net, IWEVPMKIDCAND, &wrqu,
-                                                                (u8 *)&pcand);
-#endif
+                cfg80211_pmksa_candidate_notify(usbdev->net, i, cand->bssid,
+                                                preauth, GFP_ATOMIC);
         }
 }