net:wireless:bcmdhd: rename bcmsdh_remove & bcmsdh_probe
[linux-2.6.git] / drivers / net / wireless / rndis_wlan.c
index 3d92b77..d66e298 100644 (file)
 #include <linux/mii.h>
 #include <linux/usb.h>
 #include <linux/usb/cdc.h>
-#include <linux/wireless.h>
 #include <linux/ieee80211.h>
 #include <linux/if_arp.h>
 #include <linux/ctype.h>
 #include <linux/spinlock.h>
-#include <net/iw_handler.h>
+#include <linux/slab.h>
 #include <net/cfg80211.h>
 #include <linux/usb/usbnet.h>
 #include <linux/usb/rndis_host.h>
@@ -83,11 +82,11 @@ MODULE_PARM_DESC(roamdelta,
        "set roaming tendency: 0=aggressive, 1=moderate, "
                                "2=conservative (default: moderate)");
 
-static int modparam_workaround_interval = 500;
+static int modparam_workaround_interval;
 module_param_named(workaround_interval, modparam_workaround_interval,
                                                        int, 0444);
 MODULE_PARM_DESC(workaround_interval,
-       "set stall workaround interval in msecs (default: 500)");
+       "set stall workaround interval in msecs (0=disabled) (default: 0)");
 
 
 /* various RNDIS OID defs */
@@ -117,6 +116,7 @@ MODULE_PARM_DESC(workaround_interval,
 #define OID_802_11_ADD_KEY                     cpu_to_le32(0x0d01011d)
 #define OID_802_11_REMOVE_KEY                  cpu_to_le32(0x0d01011e)
 #define OID_802_11_ASSOCIATION_INFORMATION     cpu_to_le32(0x0d01011f)
+#define OID_802_11_CAPABILITY                  cpu_to_le32(0x0d010122)
 #define OID_802_11_PMKID                       cpu_to_le32(0x0d010123)
 #define OID_802_11_NETWORK_TYPES_SUPPORTED     cpu_to_le32(0x0d010203)
 #define OID_802_11_NETWORK_TYPE_IN_USE         cpu_to_le32(0x0d010204)
@@ -127,6 +127,7 @@ MODULE_PARM_DESC(workaround_interval,
 #define OID_802_11_RTS_THRESHOLD               cpu_to_le32(0x0d01020a)
 #define OID_802_11_SUPPORTED_RATES             cpu_to_le32(0x0d01020e)
 #define OID_802_11_CONFIGURATION               cpu_to_le32(0x0d010211)
+#define OID_802_11_POWER_MODE                  cpu_to_le32(0x0d010216)
 #define OID_802_11_BSSID_LIST                  cpu_to_le32(0x0d010217)
 
 
@@ -154,6 +155,12 @@ MODULE_PARM_DESC(workaround_interval,
 #define RNDIS_STATUS_ADAPTER_NOT_OPEN          cpu_to_le32(0xc0010012)
 
 
+/* Known device types */
+#define RNDIS_UNKNOWN  0
+#define RNDIS_BCM4320A 1
+#define RNDIS_BCM4320B 2
+
+
 /* NDIS data structures. Taken from wpa_supplicant driver_ndis.c
  * slightly modified for datatype endianess, etc
  */
@@ -231,46 +238,56 @@ enum ndis_80211_addwep_bits {
        NDIS_80211_ADDWEP_TRANSMIT_KEY = cpu_to_le32(1 << 31)
 };
 
+enum ndis_80211_power_mode {
+       NDIS_80211_POWER_MODE_CAM,
+       NDIS_80211_POWER_MODE_MAX_PSP,
+       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];
        u8 padding[2];
        __le32 flags;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_pmkid_candidate {
        u8 bssid[6];
        u8 padding[2];
        __le32 flags;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_pmkid_cand_list {
        __le32 version;
        __le32 num_candidates;
        struct ndis_80211_pmkid_candidate candidate_list[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_status_indication {
        __le32 status_type;
        union {
-               enum ndis_80211_media_stream_mode       media_stream_mode;
-               enum ndis_80211_radio_status            radio_status;
+               __le32                                  media_stream_mode;
+               __le32                                  radio_status;
                struct ndis_80211_auth_request          auth_request[0];
                struct ndis_80211_pmkid_cand_list       cand_list;
        } u;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_ssid {
        __le32 length;
        u8 essid[NDIS_802_11_LENGTH_SSID];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_conf_freq_hop {
        __le32 length;
        __le32 hop_pattern;
        __le32 hop_set;
        __le32 dwell_time;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_conf {
        __le32 length;
@@ -278,7 +295,7 @@ struct ndis_80211_conf {
        __le32 atim_window;
        __le32 ds_config;
        struct ndis_80211_conf_freq_hop fh_config;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_bssid_ex {
        __le32 length;
@@ -293,25 +310,25 @@ struct ndis_80211_bssid_ex {
        u8 rates[NDIS_802_11_LENGTH_RATES_EX];
        __le32 ie_length;
        u8 ies[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_bssid_list_ex {
        __le32 num_items;
        struct ndis_80211_bssid_ex bssid[0];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_fixed_ies {
        u8 timestamp[8];
        __le16 beacon_interval;
        __le16 capabilities;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_wep_key {
        __le32 size;
        __le32 index;
        __le32 length;
        u8 material[32];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_key {
        __le32 size;
@@ -321,14 +338,14 @@ struct ndis_80211_key {
        u8 padding[6];
        u8 rsc[8];
        u8 material[32];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_remove_key {
        __le32 size;
        __le32 index;
        u8 bssid[6];
        u8 padding[2];
-} __attribute__((packed));
+} __packed;
 
 struct ndis_config_param {
        __le32 name_offs;
@@ -336,7 +353,7 @@ struct ndis_config_param {
        __le32 type;
        __le32 value_offs;
        __le32 value_length;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_assoc_info {
        __le32 length;
@@ -356,20 +373,35 @@ struct ndis_80211_assoc_info {
        } resp_ie;
        __le32 resp_ie_length;
        __le32 offset_resp_ies;
-} __attribute__((packed));
+} __packed;
+
+struct ndis_80211_auth_encr_pair {
+       __le32 auth_mode;
+       __le32 encr_mode;
+} __packed;
 
-/* these have to match what is in wpa_supplicant */
-enum wpa_alg { WPA_ALG_NONE, WPA_ALG_WEP, WPA_ALG_TKIP, WPA_ALG_CCMP };
-enum wpa_cipher { CIPHER_NONE, CIPHER_WEP40, CIPHER_TKIP, CIPHER_CCMP,
-                 CIPHER_WEP104 };
-enum wpa_key_mgmt { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE,
-                   KEY_MGMT_802_1X_NO_WPA, KEY_MGMT_WPA_NONE };
+struct ndis_80211_capability {
+       __le32 length;
+       __le32 version;
+       __le32 num_pmkids;
+       __le32 num_auth_encr_pair;
+       struct ndis_80211_auth_encr_pair auth_encr_pair[0];
+} __packed;
+
+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
@@ -379,6 +411,16 @@ enum wpa_key_mgmt { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE,
 #define WORK_LINK_DOWN         (1<<1)
 #define WORK_SET_MULTICAST_LIST        (1<<2)
 
+#define RNDIS_WLAN_ALG_NONE    0
+#define RNDIS_WLAN_ALG_WEP     (1<<0)
+#define RNDIS_WLAN_ALG_TKIP    (1<<1)
+#define RNDIS_WLAN_ALG_CCMP    (1<<2)
+
+#define RNDIS_WLAN_NUM_KEYS            4
+#define RNDIS_WLAN_KEY_MGMT_NONE       0
+#define RNDIS_WLAN_KEY_MGMT_802_1X     (1<<0)
+#define RNDIS_WLAN_KEY_MGMT_PSK                (1<<1)
+
 #define COMMAND_BUFFER_SIZE    (CONTROL_BUFFER_SIZE + sizeof(struct rndis_set))
 
 static const struct ieee80211_channel rndis_channels[] = {
@@ -413,6 +455,22 @@ static const struct ieee80211_rate rndis_rates[] = {
        { .bitrate = 540 }
 };
 
+static const u32 rndis_cipher_suites[] = {
+       WLAN_CIPHER_SUITE_WEP40,
+       WLAN_CIPHER_SUITE_WEP104,
+       WLAN_CIPHER_SUITE_TKIP,
+       WLAN_CIPHER_SUITE_CCMP,
+};
+
+struct rndis_wlan_encr_key {
+       int len;
+       u32 cipher;
+       u8 material[32];
+       u8 bssid[ETH_ALEN];
+       bool pairwise;
+       bool tx_key;
+};
+
 /* RNDIS device private data */
 struct rndis_wlan_private {
        struct usbnet *usbdev;
@@ -422,20 +480,22 @@ struct rndis_wlan_private {
        struct cfg80211_scan_request *scan_request;
 
        struct workqueue_struct *workqueue;
-       struct delayed_work stats_work;
+       struct delayed_work dev_poller_work;
        struct delayed_work scan_work;
        struct work_struct work;
        struct mutex command_lock;
-       spinlock_t stats_lock;
        unsigned long work_pending;
+       int last_qual;
+       s32 cqm_rssi_thold;
+       u32 cqm_rssi_hyst;
+       int last_cqm_event_rssi;
 
        struct ieee80211_supported_band band;
        struct ieee80211_channel channels[ARRAY_SIZE(rndis_channels)];
        struct ieee80211_rate rates[ARRAY_SIZE(rndis_rates)];
+       u32 cipher_suites[ARRAY_SIZE(rndis_cipher_suites)];
 
-       struct iw_statistics iwstats;
-       struct iw_statistics privstats;
-
+       int device_type;
        int caps;
        int multicast_size;
 
@@ -450,22 +510,17 @@ struct rndis_wlan_private {
        u32  param_workaround_interval;
 
        /* hardware state */
-       int radio_on;
+       bool radio_on;
+       int power_mode;
        int infra_mode;
-       struct ndis_80211_ssid essid;
+       bool connected;
+       u8 bssid[ETH_ALEN];
+       __le32 current_command_oid;
 
        /* encryption stuff */
-       int  encr_tx_key_index;
-       char encr_keys[4][32];
-       int  encr_key_len[4];
-       char encr_key_wpa[4];
+       u8 encr_tx_key_index;
+       struct rndis_wlan_encr_key encr_keys[RNDIS_WLAN_NUM_KEYS];
        int  wpa_version;
-       int  wpa_keymgmt;
-       int  wpa_authalg;
-       int  wpa_ie_len;
-       u8  *wpa_ie;
-       int  wpa_cipher_pair;
-       int  wpa_cipher_group;
 
        u8 command_buffer[COMMAND_BUFFER_SIZE];
 };
@@ -483,32 +538,87 @@ static int rndis_scan(struct wiphy *wiphy, struct net_device *dev,
 
 static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed);
 
-static int rndis_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type,
-                               int dbm);
+static int rndis_set_tx_power(struct wiphy *wiphy,
+                             enum nl80211_tx_power_setting type,
+                             int mbm);
 static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm);
 
-static struct cfg80211_ops rndis_config_ops = {
+static int rndis_connect(struct wiphy *wiphy, struct net_device *dev,
+                               struct cfg80211_connect_params *sme);
+
+static int rndis_disconnect(struct wiphy *wiphy, struct net_device *dev,
+                               u16 reason_code);
+
+static int rndis_join_ibss(struct wiphy *wiphy, struct net_device *dev,
+                                       struct cfg80211_ibss_params *params);
+
+static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev);
+
+static int rndis_set_channel(struct wiphy *wiphy, struct net_device *dev,
+       struct ieee80211_channel *chan, enum nl80211_channel_type channel_type);
+
+static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev,
+                        u8 key_index, bool pairwise, const u8 *mac_addr,
+                        struct key_params *params);
+
+static int rndis_del_key(struct wiphy *wiphy, struct net_device *netdev,
+                        u8 key_index, bool pairwise, const u8 *mac_addr);
+
+static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
+                                u8 key_index, bool unicast, bool multicast);
+
+static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev,
+                                       u8 *mac, struct station_info *sinfo);
+
+static int rndis_dump_station(struct wiphy *wiphy, struct net_device *dev,
+                              int idx, u8 *mac, struct station_info *sinfo);
+
+static int rndis_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
+                               struct cfg80211_pmksa *pmksa);
+
+static int rndis_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
+                               struct cfg80211_pmksa *pmksa);
+
+static int rndis_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev);
+
+static int rndis_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
+                               bool enabled, int timeout);
+
+static int rndis_set_cqm_rssi_config(struct wiphy *wiphy,
+                                       struct net_device *dev,
+                                       s32 rssi_thold, u32 rssi_hyst);
+
+static const struct cfg80211_ops rndis_config_ops = {
        .change_virtual_intf = rndis_change_virtual_intf,
        .scan = rndis_scan,
        .set_wiphy_params = rndis_set_wiphy_params,
        .set_tx_power = rndis_set_tx_power,
        .get_tx_power = rndis_get_tx_power,
+       .connect = rndis_connect,
+       .disconnect = rndis_disconnect,
+       .join_ibss = rndis_join_ibss,
+       .leave_ibss = rndis_leave_ibss,
+       .set_channel = rndis_set_channel,
+       .add_key = rndis_add_key,
+       .del_key = rndis_del_key,
+       .set_default_key = rndis_set_default_key,
+       .get_station = rndis_get_station,
+       .dump_station = rndis_dump_station,
+       .set_pmksa = rndis_set_pmksa,
+       .del_pmksa = rndis_del_pmksa,
+       .flush_pmksa = rndis_flush_pmksa,
+       .set_power_mgmt = rndis_set_power_mgmt,
+       .set_cqm_rssi_config = rndis_set_cqm_rssi_config,
 };
 
 static void *rndis_wiphy_privid = &rndis_wiphy_privid;
 
 
-static const unsigned char zero_bssid[ETH_ALEN] = {0,};
-static const unsigned char ffff_bssid[ETH_ALEN] = { 0xff, 0xff, 0xff,
-                                                       0xff, 0xff, 0xff };
-
-
 static struct rndis_wlan_private *get_rndis_wlan_priv(struct usbnet *dev)
 {
        return (struct rndis_wlan_private *)dev->driver_priv;
 }
 
-
 static u32 get_bcm4320_power_dbm(struct rndis_wlan_private *priv)
 {
        switch (priv->param_power_output) {
@@ -524,6 +634,40 @@ static u32 get_bcm4320_power_dbm(struct rndis_wlan_private *priv)
        }
 }
 
+static bool is_wpa_key(struct rndis_wlan_private *priv, u8 idx)
+{
+       int cipher = priv->encr_keys[idx].cipher;
+
+       return (cipher == WLAN_CIPHER_SUITE_CCMP ||
+               cipher == WLAN_CIPHER_SUITE_TKIP);
+}
+
+static int rndis_cipher_to_alg(u32 cipher)
+{
+       switch (cipher) {
+       default:
+               return RNDIS_WLAN_ALG_NONE;
+       case WLAN_CIPHER_SUITE_WEP40:
+       case WLAN_CIPHER_SUITE_WEP104:
+               return RNDIS_WLAN_ALG_WEP;
+       case WLAN_CIPHER_SUITE_TKIP:
+               return RNDIS_WLAN_ALG_TKIP;
+       case WLAN_CIPHER_SUITE_CCMP:
+               return RNDIS_WLAN_ALG_CCMP;
+       }
+}
+
+static int rndis_akm_suite_to_key_mgmt(u32 akm_suite)
+{
+       switch (akm_suite) {
+       default:
+               return RNDIS_WLAN_KEY_MGMT_NONE;
+       case WLAN_AKM_SUITE_8021X:
+               return RNDIS_WLAN_KEY_MGMT_802_1X;
+       case WLAN_AKM_SUITE_PSK:
+               return RNDIS_WLAN_KEY_MGMT_PSK;
+       }
+}
 
 #ifdef DEBUG
 static const char *oid_to_string(__le32 oid)
@@ -563,6 +707,7 @@ static const char *oid_to_string(__le32 oid)
                OID_STR(OID_802_11_ADD_KEY);
                OID_STR(OID_802_11_REMOVE_KEY);
                OID_STR(OID_802_11_ASSOCIATION_INFORMATION);
+               OID_STR(OID_802_11_CAPABILITY);
                OID_STR(OID_802_11_PMKID);
                OID_STR(OID_802_11_NETWORK_TYPES_SUPPORTED);
                OID_STR(OID_802_11_NETWORK_TYPE_IN_USE);
@@ -573,6 +718,7 @@ static const char *oid_to_string(__le32 oid)
                OID_STR(OID_802_11_RTS_THRESHOLD);
                OID_STR(OID_802_11_SUPPORTED_RATES);
                OID_STR(OID_802_11_CONFIGURATION);
+               OID_STR(OID_802_11_POWER_MODE);
                OID_STR(OID_802_11_BSSID_LIST);
 #undef OID_STR
        }
@@ -586,7 +732,6 @@ static const char *oid_to_string(__le32 oid)
 }
 #endif
 
-
 /* translate error code */
 static int rndis_error_status(__le32 rndis_status)
 {
@@ -610,7 +755,6 @@ static int rndis_error_status(__le32 rndis_status)
        return ret;
 }
 
-
 static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(dev);
@@ -621,6 +765,7 @@ static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len)
                struct rndis_query_c    *get_c;
        } u;
        int ret, buflen;
+       int resplen, respoffs, copylen;
 
        buflen = *len + sizeof(*u.get);
        if (buflen < CONTROL_BUFFER_SIZE)
@@ -641,24 +786,52 @@ static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len)
        u.get->msg_len = cpu_to_le32(sizeof *u.get);
        u.get->oid = oid;
 
+       priv->current_command_oid = oid;
        ret = rndis_command(dev, u.header, buflen);
+       priv->current_command_oid = 0;
        if (ret < 0)
-               devdbg(dev, "rndis_query_oid(%s): rndis_command() failed, %d "
-                       "(%08x)", oid_to_string(oid), ret,
-                       le32_to_cpu(u.get_c->status));
+               netdev_dbg(dev->net, "%s(%s): rndis_command() failed, %d (%08x)\n",
+                          __func__, oid_to_string(oid), ret,
+                          le32_to_cpu(u.get_c->status));
 
        if (ret == 0) {
-               ret = le32_to_cpu(u.get_c->len);
-               *len = (*len > ret) ? ret : *len;
-               memcpy(data, u.buf + le32_to_cpu(u.get_c->offset) + 8, *len);
-               ret = rndis_error_status(u.get_c->status);
+               resplen = le32_to_cpu(u.get_c->len);
+               respoffs = le32_to_cpu(u.get_c->offset) + 8;
+
+               if (respoffs > buflen) {
+                       /* Device returned data offset outside buffer, error. */
+                       netdev_dbg(dev->net, "%s(%s): received invalid "
+                               "data offset: %d > %d\n", __func__,
+                               oid_to_string(oid), respoffs, buflen);
 
+                       ret = -EINVAL;
+                       goto exit_unlock;
+               }
+
+               if ((resplen + respoffs) > buflen) {
+                       /* Device would have returned more data if buffer would
+                        * have been big enough. Copy just the bits that we got.
+                        */
+                       copylen = buflen - respoffs;
+               } else {
+                       copylen = resplen;
+               }
+
+               if (copylen > *len)
+                       copylen = *len;
+
+               memcpy(data, u.buf + respoffs, copylen);
+
+               *len = resplen;
+
+               ret = rndis_error_status(u.get_c->status);
                if (ret < 0)
-                       devdbg(dev, "rndis_query_oid(%s): device returned "
-                               "error,  0x%08x (%d)", oid_to_string(oid),
-                               le32_to_cpu(u.get_c->status), ret);
+                       netdev_dbg(dev->net, "%s(%s): device returned error,  0x%08x (%d)\n",
+                                  __func__, oid_to_string(oid),
+                                  le32_to_cpu(u.get_c->status), ret);
        }
 
+exit_unlock:
        mutex_unlock(&priv->command_lock);
 
        if (u.buf != priv->command_buffer)
@@ -666,8 +839,8 @@ static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len)
        return ret;
 }
 
-
-static int rndis_set_oid(struct usbnet *dev, __le32 oid, void *data, int len)
+static int rndis_set_oid(struct usbnet *dev, __le32 oid, const void *data,
+                        int len)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(dev);
        union {
@@ -701,19 +874,21 @@ static int rndis_set_oid(struct usbnet *dev, __le32 oid, void *data, int len)
        u.set->handle = cpu_to_le32(0);
        memcpy(u.buf + sizeof(*u.set), data, len);
 
+       priv->current_command_oid = oid;
        ret = rndis_command(dev, u.header, buflen);
+       priv->current_command_oid = 0;
        if (ret < 0)
-               devdbg(dev, "rndis_set_oid(%s): rndis_command() failed, %d "
-                       "(%08x)", oid_to_string(oid), ret,
-                       le32_to_cpu(u.set_c->status));
+               netdev_dbg(dev->net, "%s(%s): rndis_command() failed, %d (%08x)\n",
+                          __func__, oid_to_string(oid), ret,
+                          le32_to_cpu(u.set_c->status));
 
        if (ret == 0) {
                ret = rndis_error_status(u.set_c->status);
 
                if (ret < 0)
-                       devdbg(dev, "rndis_set_oid(%s): device returned error, "
-                               "0x%08x (%d)", oid_to_string(oid),
-                               le32_to_cpu(u.set_c->status), ret);
+                       netdev_dbg(dev->net, "%s(%s): device returned error, 0x%08x (%d)\n",
+                                  __func__, oid_to_string(oid),
+                                  le32_to_cpu(u.set_c->status), ret);
        }
 
        mutex_unlock(&priv->command_lock);
@@ -723,7 +898,6 @@ static int rndis_set_oid(struct usbnet *dev, __le32 oid, void *data, int len)
        return ret;
 }
 
-
 static int rndis_reset(struct usbnet *usbdev)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
@@ -736,6 +910,7 @@ static int rndis_reset(struct usbnet *usbdev)
        memset(reset, 0, sizeof(*reset));
        reset->msg_type = RNDIS_MSG_RESET;
        reset->msg_len = cpu_to_le32(sizeof(*reset));
+       priv->current_command_oid = 0;
        ret = rndis_command(usbdev, (void *)reset, CONTROL_BUFFER_SIZE);
 
        mutex_unlock(&priv->command_lock);
@@ -745,7 +920,6 @@ static int rndis_reset(struct usbnet *usbdev)
        return 0;
 }
 
-
 /*
  * Specs say that we can only set config parameters only soon after device
  * initialization.
@@ -783,11 +957,11 @@ static int rndis_set_config_parameter(struct usbnet *dev, char *param,
 #endif
 
        if (value_type == 2)
-               devdbg(dev, "setting config parameter: %s, value: %s",
-                                               param, (u8 *)value);
+               netdev_dbg(dev->net, "setting config parameter: %s, value: %s\n",
+                          param, (u8 *)value);
        else
-               devdbg(dev, "setting config parameter: %s, value: %d",
-                                               param, *(u32 *)value);
+               netdev_dbg(dev->net, "setting config parameter: %s, value: %d\n",
+                          param, *(u32 *)value);
 
        infobuf->name_offs = cpu_to_le32(sizeof(*infobuf));
        infobuf->name_length = cpu_to_le32(param_len);
@@ -810,20 +984,21 @@ static int rndis_set_config_parameter(struct usbnet *dev, char *param,
        }
 
 #ifdef DEBUG
-       devdbg(dev, "info buffer (len: %d):", info_len);
+       netdev_dbg(dev->net, "info buffer (len: %d)\n", info_len);
        for (i = 0; i < info_len; i += 12) {
                u32 *tmp = (u32 *)((u8 *)infobuf + i);
-               devdbg(dev, "%08X:%08X:%08X",
-                       cpu_to_be32(tmp[0]),
-                       cpu_to_be32(tmp[1]),
-                       cpu_to_be32(tmp[2]));
+               netdev_dbg(dev->net, "%08X:%08X:%08X\n",
+                          cpu_to_be32(tmp[0]),
+                          cpu_to_be32(tmp[1]),
+                          cpu_to_be32(tmp[2]));
        }
 #endif
 
        ret = rndis_set_oid(dev, OID_GEN_RNDIS_CONFIG_PARAMETER,
                                                        infobuf, info_len);
        if (ret != 0)
-               devdbg(dev, "setting rndis config parameter failed, %d.", ret);
+               netdev_dbg(dev->net, "setting rndis config parameter failed, %d\n",
+                          ret);
 
        kfree(infobuf);
        return ret;
@@ -832,16 +1007,9 @@ static int rndis_set_config_parameter(struct usbnet *dev, char *param,
 static int rndis_set_config_parameter_str(struct usbnet *dev,
                                                char *param, char *value)
 {
-       return(rndis_set_config_parameter(dev, param, 2, value));
+       return rndis_set_config_parameter(dev, param, 2, value);
 }
 
-/*static int rndis_set_config_parameter_u32(struct usbnet *dev,
-                                               char *param, u32 value)
-{
-       return(rndis_set_config_parameter(dev, param, 0, &value));
-}*/
-
-
 /*
  * data conversion functions
  */
@@ -851,91 +1019,64 @@ static int level_to_qual(int level)
        return qual >= 0 ? (qual <= 100 ? qual : 100) : 0;
 }
 
-
-static void dsconfig_to_freq(unsigned int dsconfig, struct iw_freq *freq)
-{
-       freq->e = 0;
-       freq->i = 0;
-       freq->flags = 0;
-
-       /* see comment in wireless.h above the "struct iw_freq"
-        * definition for an explanation of this if
-        * NOTE: 1000000 is due to the kHz
-        */
-       if (dsconfig > 1000000) {
-               freq->m = dsconfig / 10;
-               freq->e = 1;
-       } else
-               freq->m = dsconfig;
-
-       /* convert from kHz to Hz */
-       freq->e += 3;
-}
-
-
-static int freq_to_dsconfig(struct iw_freq *freq, unsigned int *dsconfig)
-{
-       if (freq->m < 1000 && freq->e == 0) {
-               if (freq->m >= 1 && freq->m <= 14)
-                       *dsconfig = ieee80211_dsss_chan_to_freq(freq->m) * 1000;
-               else
-                       return -1;
-       } else {
-               int i;
-               *dsconfig = freq->m;
-               for (i = freq->e; i > 0; i--)
-                       *dsconfig *= 10;
-               *dsconfig /= 1000;
-       }
-
-       return 0;
-}
-
-
 /*
  * common functions
  */
-static int
-add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index);
+static int set_infra_mode(struct usbnet *usbdev, int mode);
+static void restore_keys(struct usbnet *usbdev);
+static int rndis_check_bssid_list(struct usbnet *usbdev, u8 *match_bssid,
+                                       bool *matched);
 
-static int get_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
+static int rndis_start_bssid_list_scan(struct usbnet *usbdev)
 {
-       int ret, len;
-
-       len = sizeof(*ssid);
-       ret = rndis_query_oid(usbdev, OID_802_11_SSID, ssid, &len);
-
-       if (ret != 0)
-               ssid->length = 0;
-
-#ifdef DEBUG
-       {
-               unsigned char tmp[NDIS_802_11_LENGTH_SSID + 1];
+       __le32 tmp;
 
-               memcpy(tmp, ssid->essid, le32_to_cpu(ssid->length));
-               tmp[le32_to_cpu(ssid->length)] = 0;
-               devdbg(usbdev, "get_essid: '%s', ret: %d", tmp, ret);
-       }
-#endif
-       return ret;
+       /* Note: OID_802_11_BSSID_LIST_SCAN clears internal BSS list. */
+       tmp = cpu_to_le32(1);
+       return rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
+                                                       sizeof(tmp));
 }
 
-
 static int set_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        int ret;
 
        ret = rndis_set_oid(usbdev, OID_802_11_SSID, ssid, sizeof(*ssid));
+       if (ret < 0) {
+               netdev_warn(usbdev->net, "setting SSID failed (%08X)\n", ret);
+               return ret;
+       }
        if (ret == 0) {
-               memcpy(&priv->essid, ssid, sizeof(priv->essid));
-               priv->radio_on = 1;
-               devdbg(usbdev, "set_essid: radio_on = 1");
+               priv->radio_on = true;
+               netdev_dbg(usbdev->net, "%s(): radio_on = true\n", __func__);
        }
 
        return ret;
 }
 
+static int set_bssid(struct usbnet *usbdev, const u8 *bssid)
+{
+       int ret;
+
+       ret = rndis_set_oid(usbdev, OID_802_11_BSSID, bssid, ETH_ALEN);
+       if (ret < 0) {
+               netdev_warn(usbdev->net, "setting BSSID[%pM] failed (%08X)\n",
+                           bssid, ret);
+               return ret;
+       }
+
+       return ret;
+}
+
+static int clear_bssid(struct usbnet *usbdev)
+{
+       static const u8 broadcast_mac[ETH_ALEN] = {
+               0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+       };
+
+       return set_bssid(usbdev, broadcast_mac);
+}
 
 static int get_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
 {
@@ -957,18 +1098,21 @@ static int get_association_info(struct usbnet *usbdev,
                                info, &len);
 }
 
-static int is_associated(struct usbnet *usbdev)
+static bool is_associated(struct usbnet *usbdev)
 {
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        u8 bssid[ETH_ALEN];
        int ret;
 
+       if (!priv->radio_on)
+               return false;
+
        ret = get_bssid(usbdev, bssid);
 
-       return(ret == 0 && memcmp(bssid, zero_bssid, ETH_ALEN) != 0);
+       return (ret == 0 && !is_zero_ether_addr(bssid));
 }
 
-
-static int disassociate(struct usbnet *usbdev, int reset_ssid)
+static int disassociate(struct usbnet *usbdev, bool reset_ssid)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        struct ndis_80211_ssid ssid;
@@ -977,8 +1121,9 @@ static int disassociate(struct usbnet *usbdev, int reset_ssid)
        if (priv->radio_on) {
                ret = rndis_set_oid(usbdev, OID_802_11_DISASSOCIATE, NULL, 0);
                if (ret == 0) {
-                       priv->radio_on = 0;
-                       devdbg(usbdev, "disassociate: radio_on = 0");
+                       priv->radio_on = false;
+                       netdev_dbg(usbdev->net, "%s(): radio_on = false\n",
+                                  __func__);
 
                        if (reset_ssid)
                                msleep(100);
@@ -988,6 +1133,11 @@ static int disassociate(struct usbnet *usbdev, int reset_ssid)
        /* disassociate causes radio to be turned off; if reset_ssid
         * is given, set random ssid to enable radio */
        if (reset_ssid) {
+               /* Set device to infrastructure mode so we don't get ad-hoc
+                * 'media connect' indications with the random ssid.
+                */
+               set_infra_mode(usbdev, NDIS_80211_INFRA_INFRA);
+
                ssid.length = cpu_to_le32(sizeof(ssid.essid));
                get_random_bytes(&ssid.essid[2], sizeof(ssid.essid)-2);
                ssid.essid[0] = 0x1;
@@ -999,59 +1149,61 @@ static int disassociate(struct usbnet *usbdev, int reset_ssid)
        return ret;
 }
 
-
-static int set_auth_mode(struct usbnet *usbdev, int wpa_version, int authalg)
+static int set_auth_mode(struct usbnet *usbdev, u32 wpa_version,
+                               enum nl80211_auth_type auth_type, int keymgmt)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        __le32 tmp;
        int auth_mode, ret;
 
-       devdbg(usbdev, "set_auth_mode: wpa_version=0x%x authalg=0x%x "
-               "keymgmt=0x%x", wpa_version, authalg, priv->wpa_keymgmt);
+       netdev_dbg(usbdev->net, "%s(): wpa_version=0x%x authalg=0x%x keymgmt=0x%x\n",
+                  __func__, wpa_version, auth_type, keymgmt);
 
-       if (wpa_version & IW_AUTH_WPA_VERSION_WPA2) {
-               if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_802_1X)
+       if (wpa_version & NL80211_WPA_VERSION_2) {
+               if (keymgmt & RNDIS_WLAN_KEY_MGMT_802_1X)
                        auth_mode = NDIS_80211_AUTH_WPA2;
                else
                        auth_mode = NDIS_80211_AUTH_WPA2_PSK;
-       } else if (wpa_version & IW_AUTH_WPA_VERSION_WPA) {
-               if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_802_1X)
+       } else if (wpa_version & NL80211_WPA_VERSION_1) {
+               if (keymgmt & RNDIS_WLAN_KEY_MGMT_802_1X)
                        auth_mode = NDIS_80211_AUTH_WPA;
-               else if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_PSK)
+               else if (keymgmt & RNDIS_WLAN_KEY_MGMT_PSK)
                        auth_mode = NDIS_80211_AUTH_WPA_PSK;
                else
                        auth_mode = NDIS_80211_AUTH_WPA_NONE;
-       } else if (authalg & IW_AUTH_ALG_SHARED_KEY) {
-               if (authalg & IW_AUTH_ALG_OPEN_SYSTEM)
-                       auth_mode = NDIS_80211_AUTH_AUTO_SWITCH;
-               else
-                       auth_mode = NDIS_80211_AUTH_SHARED;
-       } else
+       } else if (auth_type == NL80211_AUTHTYPE_SHARED_KEY)
+               auth_mode = NDIS_80211_AUTH_SHARED;
+       else if (auth_type == NL80211_AUTHTYPE_OPEN_SYSTEM)
                auth_mode = NDIS_80211_AUTH_OPEN;
+       else if (auth_type == NL80211_AUTHTYPE_AUTOMATIC)
+               auth_mode = NDIS_80211_AUTH_AUTO_SWITCH;
+       else
+               return -ENOTSUPP;
 
        tmp = cpu_to_le32(auth_mode);
        ret = rndis_set_oid(usbdev, OID_802_11_AUTHENTICATION_MODE, &tmp,
                                                                sizeof(tmp));
        if (ret != 0) {
-               devwarn(usbdev, "setting auth mode failed (%08X)", ret);
+               netdev_warn(usbdev->net, "setting auth mode failed (%08X)\n",
+                           ret);
                return ret;
        }
 
        priv->wpa_version = wpa_version;
-       priv->wpa_authalg = authalg;
+
        return 0;
 }
 
-
 static int set_priv_filter(struct usbnet *usbdev)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        __le32 tmp;
 
-       devdbg(usbdev, "set_priv_filter: wpa_version=0x%x", priv->wpa_version);
+       netdev_dbg(usbdev->net, "%s(): wpa_version=0x%x\n",
+                  __func__, priv->wpa_version);
 
-       if (priv->wpa_version & IW_AUTH_WPA_VERSION_WPA2 ||
-           priv->wpa_version & IW_AUTH_WPA_VERSION_WPA)
+       if (priv->wpa_version & NL80211_WPA_VERSION_2 ||
+           priv->wpa_version & NL80211_WPA_VERSION_1)
                tmp = cpu_to_le32(NDIS_80211_PRIV_8021X_WEP);
        else
                tmp = cpu_to_le32(NDIS_80211_PRIV_ACCEPT_ALL);
@@ -1060,27 +1212,23 @@ static int set_priv_filter(struct usbnet *usbdev)
                                                                sizeof(tmp));
 }
 
-
 static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise)
 {
-       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        __le32 tmp;
        int encr_mode, ret;
 
-       devdbg(usbdev, "set_encr_mode: cipher_pair=0x%x cipher_group=0x%x",
-               pairwise,
-               groupwise);
+       netdev_dbg(usbdev->net, "%s(): cipher_pair=0x%x cipher_group=0x%x\n",
+                  __func__, pairwise, groupwise);
 
-       if (pairwise & IW_AUTH_CIPHER_CCMP)
+       if (pairwise & RNDIS_WLAN_ALG_CCMP)
                encr_mode = NDIS_80211_ENCR_CCMP_ENABLED;
-       else if (pairwise & IW_AUTH_CIPHER_TKIP)
+       else if (pairwise & RNDIS_WLAN_ALG_TKIP)
                encr_mode = NDIS_80211_ENCR_TKIP_ENABLED;
-       else if (pairwise &
-                (IW_AUTH_CIPHER_WEP40 | IW_AUTH_CIPHER_WEP104))
+       else if (pairwise & RNDIS_WLAN_ALG_WEP)
                encr_mode = NDIS_80211_ENCR_WEP_ENABLED;
-       else if (groupwise & IW_AUTH_CIPHER_CCMP)
+       else if (groupwise & RNDIS_WLAN_ALG_CCMP)
                encr_mode = NDIS_80211_ENCR_CCMP_ENABLED;
-       else if (groupwise & IW_AUTH_CIPHER_TKIP)
+       else if (groupwise & RNDIS_WLAN_ALG_TKIP)
                encr_mode = NDIS_80211_ENCR_TKIP_ENABLED;
        else
                encr_mode = NDIS_80211_ENCR_DISABLED;
@@ -1089,66 +1237,46 @@ static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise)
        ret = rndis_set_oid(usbdev, OID_802_11_ENCRYPTION_STATUS, &tmp,
                                                                sizeof(tmp));
        if (ret != 0) {
-               devwarn(usbdev, "setting encr mode failed (%08X)", ret);
+               netdev_warn(usbdev->net, "setting encr mode failed (%08X)\n",
+                           ret);
                return ret;
        }
 
-       priv->wpa_cipher_pair = pairwise;
-       priv->wpa_cipher_group = groupwise;
-       return 0;
-}
-
-
-static int set_assoc_params(struct usbnet *usbdev)
-{
-       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-
-       set_auth_mode(usbdev, priv->wpa_version, priv->wpa_authalg);
-       set_priv_filter(usbdev);
-       set_encr_mode(usbdev, priv->wpa_cipher_pair, priv->wpa_cipher_group);
-
        return 0;
 }
 
-
 static int set_infra_mode(struct usbnet *usbdev, int mode)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        __le32 tmp;
-       int ret, i;
+       int ret;
 
-       devdbg(usbdev, "set_infra_mode: infra_mode=0x%x", priv->infra_mode);
+       netdev_dbg(usbdev->net, "%s(): infra_mode=0x%x\n",
+                  __func__, priv->infra_mode);
 
        tmp = cpu_to_le32(mode);
        ret = rndis_set_oid(usbdev, OID_802_11_INFRASTRUCTURE_MODE, &tmp,
                                                                sizeof(tmp));
        if (ret != 0) {
-               devwarn(usbdev, "setting infra mode failed (%08X)", ret);
+               netdev_warn(usbdev->net, "setting infra mode failed (%08X)\n",
+                           ret);
                return ret;
        }
 
        /* NDIS drivers clear keys when infrastructure mode is
         * changed. But Linux tools assume otherwise. So set the
         * keys */
-       if (priv->wpa_keymgmt == 0 ||
-               priv->wpa_keymgmt == IW_AUTH_KEY_MGMT_802_1X) {
-               for (i = 0; i < 4; i++) {
-                       if (priv->encr_key_len[i] > 0 && !priv->encr_key_wpa[i])
-                               add_wep_key(usbdev, priv->encr_keys[i],
-                                               priv->encr_key_len[i], i);
-               }
-       }
+       restore_keys(usbdev);
 
        priv->infra_mode = mode;
        return 0;
 }
 
-
 static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
 {
        __le32 tmp;
 
-       devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
+       netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
 
        if (rts_threshold < 0 || rts_threshold > 2347)
                rts_threshold = 2347;
@@ -1158,12 +1286,11 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
                                                                sizeof(tmp));
 }
 
-
 static int set_frag_threshold(struct usbnet *usbdev, u32 frag_threshold)
 {
        __le32 tmp;
 
-       devdbg(usbdev, "set_frag_threshold %i", frag_threshold);
+       netdev_dbg(usbdev->net, "%s(): %i\n", __func__, frag_threshold);
 
        if (frag_threshold < 256 || frag_threshold > 2346)
                frag_threshold = 2346;
@@ -1173,40 +1300,101 @@ static int set_frag_threshold(struct usbnet *usbdev, u32 frag_threshold)
                                                                sizeof(tmp));
 }
 
-
 static void set_default_iw_params(struct usbnet *usbdev)
 {
-       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-
-       priv->wpa_keymgmt = 0;
-       priv->wpa_version = 0;
-
        set_infra_mode(usbdev, NDIS_80211_INFRA_INFRA);
-       set_auth_mode(usbdev, IW_AUTH_WPA_VERSION_DISABLED,
-                               IW_AUTH_ALG_OPEN_SYSTEM);
+       set_auth_mode(usbdev, 0, NL80211_AUTHTYPE_OPEN_SYSTEM,
+                                               RNDIS_WLAN_KEY_MGMT_NONE);
        set_priv_filter(usbdev);
-       set_encr_mode(usbdev, IW_AUTH_CIPHER_NONE, IW_AUTH_CIPHER_NONE);
+       set_encr_mode(usbdev, RNDIS_WLAN_ALG_NONE, RNDIS_WLAN_ALG_NONE);
 }
 
-
 static int deauthenticate(struct usbnet *usbdev)
 {
        int ret;
 
-       ret = disassociate(usbdev, 1);
+       ret = disassociate(usbdev, true);
        set_default_iw_params(usbdev);
        return ret;
 }
 
+static int set_channel(struct usbnet *usbdev, int channel)
+{
+       struct ndis_80211_conf config;
+       unsigned int dsconfig;
+       int len, ret;
+
+       netdev_dbg(usbdev->net, "%s(%d)\n", __func__, channel);
+
+       /* this OID is valid only when not associated */
+       if (is_associated(usbdev))
+               return 0;
+
+       dsconfig = ieee80211_dsss_chan_to_freq(channel) * 1000;
+
+       len = sizeof(config);
+       ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
+       if (ret < 0) {
+               netdev_dbg(usbdev->net, "%s(): querying configuration failed\n",
+                          __func__);
+               return ret;
+       }
+
+       config.ds_config = cpu_to_le32(dsconfig);
+       ret = rndis_set_oid(usbdev, OID_802_11_CONFIGURATION, &config,
+                                                               sizeof(config));
+
+       netdev_dbg(usbdev->net, "%s(): %d -> %d\n", __func__, channel, ret);
+
+       return ret;
+}
+
+static struct ieee80211_channel *get_current_channel(struct usbnet *usbdev,
+                                                    u32 *beacon_period)
+{
+       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_period)
+               *beacon_period = le32_to_cpu(config.beacon_period);
+       return channel;
+}
 
 /* index must be 0 - N, as per NDIS  */
-static int add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index)
+static int add_wep_key(struct usbnet *usbdev, const u8 *key, int key_len,
+                                                               u8 index)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        struct ndis_80211_wep_key ndis_key;
+       u32 cipher;
        int ret;
 
-       if (key_len <= 0 || key_len > 32 || index < 0 || index >= 4)
+       netdev_dbg(usbdev->net, "%s(idx: %d, len: %d)\n",
+                  __func__, index, key_len);
+
+       if (index >= RNDIS_WLAN_NUM_KEYS)
+               return -EINVAL;
+
+       if (key_len == 5)
+               cipher = WLAN_CIPHER_SUITE_WEP40;
+       else if (key_len == 13)
+               cipher = WLAN_CIPHER_SUITE_WEP104;
+       else
                return -EINVAL;
 
        memset(&ndis_key, 0, sizeof(ndis_key));
@@ -1218,50 +1406,73 @@ static int add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index)
 
        if (index == priv->encr_tx_key_index) {
                ndis_key.index |= NDIS_80211_ADDWEP_TRANSMIT_KEY;
-               ret = set_encr_mode(usbdev, IW_AUTH_CIPHER_WEP104,
-                                               IW_AUTH_CIPHER_NONE);
+               ret = set_encr_mode(usbdev, RNDIS_WLAN_ALG_WEP,
+                                                       RNDIS_WLAN_ALG_NONE);
                if (ret)
-                       devwarn(usbdev, "encryption couldn't be enabled (%08X)",
-                                                                       ret);
+                       netdev_warn(usbdev->net, "encryption couldn't be enabled (%08X)\n",
+                                   ret);
        }
 
        ret = rndis_set_oid(usbdev, OID_802_11_ADD_WEP, &ndis_key,
                                                        sizeof(ndis_key));
        if (ret != 0) {
-               devwarn(usbdev, "adding encryption key %d failed (%08X)",
-                                                       index+1, ret);
+               netdev_warn(usbdev->net, "adding encryption key %d failed (%08X)\n",
+                           index + 1, ret);
                return ret;
        }
 
-       priv->encr_key_len[index] = key_len;
-       priv->encr_key_wpa[index] = 0;
-       memcpy(&priv->encr_keys[index], key, key_len);
+       priv->encr_keys[index].len = key_len;
+       priv->encr_keys[index].cipher = cipher;
+       memcpy(&priv->encr_keys[index].material, key, key_len);
+       memset(&priv->encr_keys[index].bssid, 0xff, ETH_ALEN);
 
        return 0;
 }
 
-
 static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
-                       int index, const struct sockaddr *addr,
-                       const u8 *rx_seq, int alg, int flags)
+                       u8 index, const u8 *addr, const u8 *rx_seq,
+                       int seq_len, u32 cipher, __le32 flags)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        struct ndis_80211_key ndis_key;
+       bool is_addr_ok;
        int ret;
 
-       if (index < 0 || index >= 4)
-               return -EINVAL;
-       if (key_len > sizeof(ndis_key.material) || key_len < 0)
+       if (index >= RNDIS_WLAN_NUM_KEYS) {
+               netdev_dbg(usbdev->net, "%s(): index out of range (%i)\n",
+                          __func__, index);
                return -EINVAL;
-       if ((flags & NDIS_80211_ADDKEY_SET_INIT_RECV_SEQ) && !rx_seq)
+       }
+       if (key_len > sizeof(ndis_key.material) || key_len < 0) {
+               netdev_dbg(usbdev->net, "%s(): key length out of range (%i)\n",
+                          __func__, key_len);
                return -EINVAL;
-       if ((flags & NDIS_80211_ADDKEY_PAIRWISE_KEY) && !addr)
+       }
+       if (flags & NDIS_80211_ADDKEY_SET_INIT_RECV_SEQ) {
+               if (!rx_seq || seq_len <= 0) {
+                       netdev_dbg(usbdev->net, "%s(): recv seq flag without buffer\n",
+                                  __func__);
+                       return -EINVAL;
+               }
+               if (rx_seq && seq_len > sizeof(ndis_key.rsc)) {
+                       netdev_dbg(usbdev->net, "%s(): too big recv seq buffer\n", __func__);
+                       return -EINVAL;
+               }
+       }
+
+       is_addr_ok = addr && !is_zero_ether_addr(addr) &&
+                                       !is_broadcast_ether_addr(addr);
+       if ((flags & NDIS_80211_ADDKEY_PAIRWISE_KEY) && !is_addr_ok) {
+               netdev_dbg(usbdev->net, "%s(): pairwise but bssid invalid (%pM)\n",
+                          __func__, addr);
                return -EINVAL;
+       }
 
-       devdbg(usbdev, "add_wpa_key(%i): flags:%i%i%i", index,
-                       !!(flags & NDIS_80211_ADDKEY_TRANSMIT_KEY),
-                       !!(flags & NDIS_80211_ADDKEY_PAIRWISE_KEY),
-                       !!(flags & NDIS_80211_ADDKEY_SET_INIT_RECV_SEQ));
+       netdev_dbg(usbdev->net, "%s(%i): flags:%i%i%i\n",
+                  __func__, index,
+                  !!(flags & NDIS_80211_ADDKEY_TRANSMIT_KEY),
+                  !!(flags & NDIS_80211_ADDKEY_PAIRWISE_KEY),
+                  !!(flags & NDIS_80211_ADDKEY_SET_INIT_RECV_SEQ));
 
        memset(&ndis_key, 0, sizeof(ndis_key));
 
@@ -1270,7 +1481,7 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
        ndis_key.length = cpu_to_le32(key_len);
        ndis_key.index = cpu_to_le32(index) | flags;
 
-       if (alg == IW_ENCODE_ALG_TKIP && key_len == 32) {
+       if (cipher == WLAN_CIPHER_SUITE_TKIP && key_len == 32) {
                /* wpa_supplicant gives us the Michael MIC RX/TX keys in
                 * different order than NDIS spec, so swap the order here. */
                memcpy(ndis_key.material, key, 16);
@@ -1280,11 +1491,11 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
                memcpy(ndis_key.material, key, key_len);
 
        if (flags & NDIS_80211_ADDKEY_SET_INIT_RECV_SEQ)
-               memcpy(ndis_key.rsc, rx_seq, 6);
+               memcpy(ndis_key.rsc, rx_seq, seq_len);
 
        if (flags & NDIS_80211_ADDKEY_PAIRWISE_KEY) {
                /* pairwise key */
-               memcpy(ndis_key.bssid, addr->sa_data, ETH_ALEN);
+               memcpy(ndis_key.bssid, addr, ETH_ALEN);
        } else {
                /* group key */
                if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
@@ -1295,12 +1506,19 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
 
        ret = rndis_set_oid(usbdev, OID_802_11_ADD_KEY, &ndis_key,
                                        le32_to_cpu(ndis_key.size));
-       devdbg(usbdev, "add_wpa_key: OID_802_11_ADD_KEY -> %08X", ret);
+       netdev_dbg(usbdev->net, "%s(): OID_802_11_ADD_KEY -> %08X\n",
+                  __func__, ret);
        if (ret != 0)
                return ret;
 
-       priv->encr_key_len[index] = key_len;
-       priv->encr_key_wpa[index] = 1;
+       memset(&priv->encr_keys[index], 0, sizeof(priv->encr_keys[index]));
+       priv->encr_keys[index].len = key_len;
+       priv->encr_keys[index].cipher = cipher;
+       memcpy(&priv->encr_keys[index].material, key, key_len);
+       if (flags & NDIS_80211_ADDKEY_PAIRWISE_KEY)
+               memcpy(&priv->encr_keys[index].bssid, ndis_key.bssid, ETH_ALEN);
+       else
+               memset(&priv->encr_keys[index].bssid, 0xff, ETH_ALEN);
 
        if (flags & NDIS_80211_ADDKEY_TRANSMIT_KEY)
                priv->encr_tx_key_index = index;
@@ -1308,31 +1526,66 @@ static int add_wpa_key(struct usbnet *usbdev, const u8 *key, int key_len,
        return 0;
 }
 
+static int restore_key(struct usbnet *usbdev, u8 key_idx)
+{
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       struct rndis_wlan_encr_key key;
+
+       if (is_wpa_key(priv, key_idx))
+               return 0;
+
+       key = priv->encr_keys[key_idx];
+
+       netdev_dbg(usbdev->net, "%s(): %i:%i\n", __func__, key_idx, key.len);
+
+       if (key.len == 0)
+               return 0;
+
+       return add_wep_key(usbdev, key.material, key.len, key_idx);
+}
+
+static void restore_keys(struct usbnet *usbdev)
+{
+       int i;
+
+       for (i = 0; i < 4; i++)
+               restore_key(usbdev, i);
+}
+
+static void clear_key(struct rndis_wlan_private *priv, u8 idx)
+{
+       memset(&priv->encr_keys[idx], 0, sizeof(priv->encr_keys[idx]));
+}
 
 /* remove_key is for both wep and wpa */
-static int remove_key(struct usbnet *usbdev, int index, u8 bssid[ETH_ALEN])
+static int remove_key(struct usbnet *usbdev, u8 index, const u8 *bssid)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        struct ndis_80211_remove_key remove_key;
        __le32 keyindex;
+       bool is_wpa;
        int ret;
 
-       if (priv->encr_key_len[index] == 0)
+       if (index >= RNDIS_WLAN_NUM_KEYS)
+               return -ENOENT;
+
+       if (priv->encr_keys[index].len == 0)
                return 0;
 
-       priv->encr_key_len[index] = 0;
-       priv->encr_key_wpa[index] = 0;
-       memset(&priv->encr_keys[index], 0, sizeof(priv->encr_keys[index]));
+       is_wpa = is_wpa_key(priv, index);
+
+       netdev_dbg(usbdev->net, "%s(): %i:%s:%i\n",
+                  __func__, index, is_wpa ? "wpa" : "wep",
+                  priv->encr_keys[index].len);
 
-       if (priv->wpa_cipher_pair == IW_AUTH_CIPHER_TKIP ||
-           priv->wpa_cipher_pair == IW_AUTH_CIPHER_CCMP ||
-           priv->wpa_cipher_group == IW_AUTH_CIPHER_TKIP ||
-           priv->wpa_cipher_group == IW_AUTH_CIPHER_CCMP) {
+       clear_key(priv, index);
+
+       if (is_wpa) {
                remove_key.size = cpu_to_le32(sizeof(remove_key));
                remove_key.index = cpu_to_le32(index);
                if (bssid) {
                        /* pairwise key */
-                       if (memcmp(bssid, ffff_bssid, ETH_ALEN) != 0)
+                       if (!is_broadcast_ether_addr(bssid))
                                remove_key.index |=
                                        NDIS_80211_ADDKEY_PAIRWISE_KEY;
                        memcpy(remove_key.bssid, bssid,
@@ -1350,80 +1603,283 @@ static int remove_key(struct usbnet *usbdev, int index, u8 bssid[ETH_ALEN])
                ret = rndis_set_oid(usbdev, OID_802_11_REMOVE_WEP, &keyindex,
                                                        sizeof(keyindex));
                if (ret != 0) {
-                       devwarn(usbdev,
-                               "removing encryption key %d failed (%08X)",
-                               index, ret);
+                       netdev_warn(usbdev->net,
+                                   "removing encryption key %d failed (%08X)\n",
+                                   index, ret);
                        return ret;
                }
        }
 
        /* if it is transmit key, disable encryption */
        if (index == priv->encr_tx_key_index)
-               set_encr_mode(usbdev, IW_AUTH_CIPHER_NONE, IW_AUTH_CIPHER_NONE);
+               set_encr_mode(usbdev, RNDIS_WLAN_ALG_NONE, RNDIS_WLAN_ALG_NONE);
 
        return 0;
 }
 
-
 static void set_multicast_list(struct usbnet *usbdev)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-       struct dev_mc_list *mclist;
-       __le32 filter;
-       int ret, i, size;
-       char *buf;
+       struct netdev_hw_addr *ha;
+       __le32 filter, basefilter;
+       int ret;
+       char *mc_addrs = NULL;
+       int mc_count;
 
-       filter = RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST;
+       basefilter = filter = RNDIS_PACKET_TYPE_DIRECTED |
+                             RNDIS_PACKET_TYPE_BROADCAST;
 
        if (usbdev->net->flags & IFF_PROMISC) {
                filter |= RNDIS_PACKET_TYPE_PROMISCUOUS |
                        RNDIS_PACKET_TYPE_ALL_LOCAL;
-       } else if (usbdev->net->flags & IFF_ALLMULTI ||
-                  usbdev->net->mc_count > priv->multicast_size) {
+       } else if (usbdev->net->flags & IFF_ALLMULTI) {
+               filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST;
+       }
+
+       if (filter != basefilter)
+               goto set_filter;
+
+       /*
+        * mc_list should be accessed holding the lock, so copy addresses to
+        * local buffer first.
+        */
+       netif_addr_lock_bh(usbdev->net);
+       mc_count = netdev_mc_count(usbdev->net);
+       if (mc_count > priv->multicast_size) {
                filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST;
-       } else if (usbdev->net->mc_count > 0) {
-               size = min(priv->multicast_size, usbdev->net->mc_count);
-               buf = kmalloc(size * ETH_ALEN, GFP_KERNEL);
-               if (!buf) {
-                       devwarn(usbdev,
-                               "couldn't alloc %d bytes of memory",
-                               size * ETH_ALEN);
+       } else if (mc_count) {
+               int i = 0;
+
+               mc_addrs = kmalloc(mc_count * ETH_ALEN, GFP_ATOMIC);
+               if (!mc_addrs) {
+                       netdev_warn(usbdev->net,
+                                   "couldn't alloc %d bytes of memory\n",
+                                   mc_count * ETH_ALEN);
+                       netif_addr_unlock_bh(usbdev->net);
                        return;
                }
 
-               mclist = usbdev->net->mc_list;
-               for (i = 0; i < size && mclist; mclist = mclist->next) {
-                       if (mclist->dmi_addrlen != ETH_ALEN)
-                               continue;
+               netdev_for_each_mc_addr(ha, usbdev->net)
+                       memcpy(mc_addrs + i++ * ETH_ALEN,
+                              ha->addr, ETH_ALEN);
+       }
+       netif_addr_unlock_bh(usbdev->net);
 
-                       memcpy(buf + i * ETH_ALEN, mclist->dmi_addr, ETH_ALEN);
-                       i++;
-               }
+       if (filter != basefilter)
+               goto set_filter;
 
-               ret = rndis_set_oid(usbdev, OID_802_3_MULTICAST_LIST, buf,
-                                                               i * ETH_ALEN);
-               if (ret == 0 && i > 0)
+       if (mc_count) {
+               ret = rndis_set_oid(usbdev, OID_802_3_MULTICAST_LIST, mc_addrs,
+                                   mc_count * ETH_ALEN);
+               kfree(mc_addrs);
+               if (ret == 0)
                        filter |= RNDIS_PACKET_TYPE_MULTICAST;
                else
                        filter |= RNDIS_PACKET_TYPE_ALL_MULTICAST;
 
-               devdbg(usbdev, "OID_802_3_MULTICAST_LIST(%d, max: %d) -> %d",
-                                               i, priv->multicast_size, ret);
-
-               kfree(buf);
+               netdev_dbg(usbdev->net, "OID_802_3_MULTICAST_LIST(%d, max: %d) -> %d\n",
+                          mc_count, priv->multicast_size, ret);
        }
 
+set_filter:
        ret = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &filter,
                                                        sizeof(filter));
        if (ret < 0) {
-               devwarn(usbdev, "couldn't set packet filter: %08x",
-                                                       le32_to_cpu(filter));
+               netdev_warn(usbdev->net, "couldn't set packet filter: %08x\n",
+                           le32_to_cpu(filter));
        }
 
-       devdbg(usbdev, "OID_GEN_CURRENT_PACKET_FILTER(%08x) -> %d",
-                                               le32_to_cpu(filter), ret);
+       netdev_dbg(usbdev->net, "OID_GEN_CURRENT_PACKET_FILTER(%08x) -> %d\n",
+                  le32_to_cpu(filter), ret);
 }
 
+#ifdef DEBUG
+static void debug_print_pmkids(struct usbnet *usbdev,
+                               struct ndis_80211_pmkid *pmkids,
+                               const char *func_str)
+{
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       int i, len, count, max_pmkids, entry_len;
+
+       max_pmkids = priv->wdev.wiphy->max_num_pmkids;
+       len = le32_to_cpu(pmkids->length);
+       count = le32_to_cpu(pmkids->bssid_info_count);
+
+       entry_len = (count > 0) ? (len - sizeof(*pmkids)) / count : -1;
+
+       netdev_dbg(usbdev->net, "%s(): %d PMKIDs (data len: %d, entry len: "
+                               "%d)\n", func_str, count, len, entry_len);
+
+       if (count > max_pmkids)
+               count = max_pmkids;
+
+       for (i = 0; i < count; i++) {
+               u32 *tmp = (u32 *)pmkids->bssid_info[i].pmkid;
+
+               netdev_dbg(usbdev->net, "%s():  bssid: %pM, "
+                               "pmkid: %08X:%08X:%08X:%08X\n",
+                               func_str, pmkids->bssid_info[i].bssid,
+                               cpu_to_be32(tmp[0]), cpu_to_be32(tmp[1]),
+                               cpu_to_be32(tmp[2]), cpu_to_be32(tmp[3]));
+       }
+}
+#else
+static void debug_print_pmkids(struct usbnet *usbdev,
+                               struct ndis_80211_pmkid *pmkids,
+                               const char *func_str)
+{
+       return;
+}
+#endif
+
+static struct ndis_80211_pmkid *get_device_pmkids(struct usbnet *usbdev)
+{
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       struct ndis_80211_pmkid *pmkids;
+       int len, ret, max_pmkids;
+
+       max_pmkids = priv->wdev.wiphy->max_num_pmkids;
+       len = sizeof(*pmkids) + max_pmkids * sizeof(pmkids->bssid_info[0]);
+
+       pmkids = kzalloc(len, GFP_KERNEL);
+       if (!pmkids)
+               return ERR_PTR(-ENOMEM);
+
+       pmkids->length = cpu_to_le32(len);
+       pmkids->bssid_info_count = cpu_to_le32(max_pmkids);
+
+       ret = rndis_query_oid(usbdev, OID_802_11_PMKID, pmkids, &len);
+       if (ret < 0) {
+               netdev_dbg(usbdev->net, "%s(): OID_802_11_PMKID(%d, %d)"
+                               " -> %d\n", __func__, len, max_pmkids, ret);
+
+               kfree(pmkids);
+               return ERR_PTR(ret);
+       }
+
+       if (le32_to_cpu(pmkids->bssid_info_count) > max_pmkids)
+               pmkids->bssid_info_count = cpu_to_le32(max_pmkids);
+
+       debug_print_pmkids(usbdev, pmkids, __func__);
+
+       return pmkids;
+}
+
+static int set_device_pmkids(struct usbnet *usbdev,
+                               struct ndis_80211_pmkid *pmkids)
+{
+       int ret, len, num_pmkids;
+
+       num_pmkids = le32_to_cpu(pmkids->bssid_info_count);
+       len = sizeof(*pmkids) + num_pmkids * sizeof(pmkids->bssid_info[0]);
+       pmkids->length = cpu_to_le32(len);
+
+       debug_print_pmkids(usbdev, pmkids, __func__);
+
+       ret = rndis_set_oid(usbdev, OID_802_11_PMKID, pmkids,
+                                               le32_to_cpu(pmkids->length));
+       if (ret < 0) {
+               netdev_dbg(usbdev->net, "%s(): OID_802_11_PMKID(%d, %d) -> %d"
+                               "\n", __func__, len, num_pmkids, ret);
+       }
+
+       kfree(pmkids);
+       return ret;
+}
+
+static struct ndis_80211_pmkid *remove_pmkid(struct usbnet *usbdev,
+                                               struct ndis_80211_pmkid *pmkids,
+                                               struct cfg80211_pmksa *pmksa,
+                                               int max_pmkids)
+{
+       int i, newlen, err;
+       unsigned int count;
+
+       count = le32_to_cpu(pmkids->bssid_info_count);
+
+       if (count > max_pmkids)
+               count = max_pmkids;
+
+       for (i = 0; i < count; i++)
+               if (!compare_ether_addr(pmkids->bssid_info[i].bssid,
+                                                       pmksa->bssid))
+                       break;
+
+       /* pmkid not found */
+       if (i == count) {
+               netdev_dbg(usbdev->net, "%s(): bssid not found (%pM)\n",
+                                       __func__, pmksa->bssid);
+               err = -ENOENT;
+               goto error;
+       }
+
+       for (; i + 1 < count; i++)
+               pmkids->bssid_info[i] = pmkids->bssid_info[i + 1];
+
+       count--;
+       newlen = sizeof(*pmkids) + count * sizeof(pmkids->bssid_info[0]);
+
+       pmkids->length = cpu_to_le32(newlen);
+       pmkids->bssid_info_count = cpu_to_le32(count);
+
+       return pmkids;
+error:
+       kfree(pmkids);
+       return ERR_PTR(err);
+}
+
+static struct ndis_80211_pmkid *update_pmkid(struct usbnet *usbdev,
+                                               struct ndis_80211_pmkid *pmkids,
+                                               struct cfg80211_pmksa *pmksa,
+                                               int max_pmkids)
+{
+       int i, err, newlen;
+       unsigned int count;
+
+       count = le32_to_cpu(pmkids->bssid_info_count);
+
+       if (count > max_pmkids)
+               count = max_pmkids;
+
+       /* update with new pmkid */
+       for (i = 0; i < count; i++) {
+               if (compare_ether_addr(pmkids->bssid_info[i].bssid,
+                                                       pmksa->bssid))
+                       continue;
+
+               memcpy(pmkids->bssid_info[i].pmkid, pmksa->pmkid,
+                                                               WLAN_PMKID_LEN);
+
+               return pmkids;
+       }
+
+       /* out of space, return error */
+       if (i == max_pmkids) {
+               netdev_dbg(usbdev->net, "%s(): out of space\n", __func__);
+               err = -ENOSPC;
+               goto error;
+       }
+
+       /* add new pmkid */
+       newlen = sizeof(*pmkids) + (count + 1) * sizeof(pmkids->bssid_info[0]);
+
+       pmkids = krealloc(pmkids, newlen, GFP_KERNEL);
+       if (!pmkids) {
+               err = -ENOMEM;
+               goto error;
+       }
+
+       pmkids->length = cpu_to_le32(newlen);
+       pmkids->bssid_info_count = cpu_to_le32(count + 1);
+
+       memcpy(pmkids->bssid_info[count].bssid, pmksa->bssid, ETH_ALEN);
+       memcpy(pmkids->bssid_info[count].pmkid, pmksa->pmkid, WLAN_PMKID_LEN);
+
+       return pmkids;
+error:
+       kfree(pmkids);
+       return ERR_PTR(err);
+}
 
 /*
  * cfg80211 ops
@@ -1433,7 +1889,8 @@ static int rndis_change_virtual_intf(struct wiphy *wiphy,
                                        enum nl80211_iftype type, u32 *flags,
                                        struct vif_params *params)
 {
-       struct usbnet *usbdev = netdev_priv(dev);
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
        int mode;
 
        switch (type) {
@@ -1447,10 +1904,11 @@ static int rndis_change_virtual_intf(struct wiphy *wiphy,
                return -EINVAL;
        }
 
+       priv->wdev.iftype = type;
+
        return set_infra_mode(usbdev, mode);
 }
 
-
 static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 {
        struct rndis_wlan_private *priv = wiphy_priv(wiphy);
@@ -1472,22 +1930,27 @@ static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed)
        return 0;
 }
 
-
-static int rndis_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type,
-                               int dbm)
+static int rndis_set_tx_power(struct wiphy *wiphy,
+                             enum nl80211_tx_power_setting type,
+                             int mbm)
 {
        struct rndis_wlan_private *priv = wiphy_priv(wiphy);
        struct usbnet *usbdev = priv->usbdev;
 
-       devdbg(usbdev, "rndis_set_tx_power type:0x%x dbm:%i", type, dbm);
+       netdev_dbg(usbdev->net, "%s(): type:0x%x mbm:%i\n",
+                  __func__, type, mbm);
+
+       if (mbm < 0 || (mbm % 100))
+               return -ENOTSUPP;
 
        /* Device doesn't support changing txpower after initialization, only
         * turn off/on radio. Support 'auto' mode and setting same dBm that is
         * currently used.
         */
-       if (type == TX_POWER_AUTOMATIC || dbm == get_bcm4320_power_dbm(priv)) {
+       if (type == NL80211_TX_POWER_AUTOMATIC ||
+           MBM_TO_DBM(mbm) == get_bcm4320_power_dbm(priv)) {
                if (!priv->radio_on)
-                       disassociate(usbdev, 1); /* turn on radio */
+                       disassociate(usbdev, true); /* turn on radio */
 
                return 0;
        }
@@ -1495,7 +1958,6 @@ static int rndis_set_tx_power(struct wiphy *wiphy, enum tx_power_setting type,
        return -ENOTSUPP;
 }
 
-
 static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm)
 {
        struct rndis_wlan_private *priv = wiphy_priv(wiphy);
@@ -1503,22 +1965,26 @@ static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm)
 
        *dbm = get_bcm4320_power_dbm(priv);
 
-       devdbg(usbdev, "rndis_get_tx_power dbm:%i", *dbm);
+       netdev_dbg(usbdev->net, "%s(): dbm:%i\n", __func__, *dbm);
 
        return 0;
 }
 
-
-#define SCAN_DELAY_JIFFIES (HZ)
+#define SCAN_DELAY_JIFFIES (6 * HZ)
 static int rndis_scan(struct wiphy *wiphy, struct net_device *dev,
                        struct cfg80211_scan_request *request)
 {
        struct usbnet *usbdev = netdev_priv(dev);
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        int ret;
-       __le32 tmp;
+       int delay = SCAN_DELAY_JIFFIES;
+
+       netdev_dbg(usbdev->net, "cfg80211.scan\n");
 
-       devdbg(usbdev, "cfg80211.scan");
+       /* Get current bssid list from device before new scan, as new scan
+        * clears internal bssid list.
+        */
+       rndis_check_bssid_list(usbdev, NULL, NULL);
 
        if (!request)
                return -EINVAL;
@@ -1528,24 +1994,24 @@ static int rndis_scan(struct wiphy *wiphy, struct net_device *dev,
 
        priv->scan_request = request;
 
-       tmp = cpu_to_le32(1);
-       ret = rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
-                                                       sizeof(tmp));
+       ret = rndis_start_bssid_list_scan(usbdev);
        if (ret == 0) {
+               if (priv->device_type == RNDIS_BCM4320A)
+                       delay = HZ;
+
                /* Wait before retrieving scan results from device */
-               queue_delayed_work(priv->workqueue, &priv->scan_work,
-                       SCAN_DELAY_JIFFIES);
+               queue_delayed_work(priv->workqueue, &priv->scan_work, delay);
        }
 
        return ret;
 }
 
-
-static struct cfg80211_bss *rndis_bss_info_update(struct usbnet *usbdev,
-                                       struct ndis_80211_bssid_ex *bssid)
+static bool rndis_bss_info_update(struct usbnet *usbdev,
+                                 struct ndis_80211_bssid_ex *bssid)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        struct ieee80211_channel *channel;
+       struct cfg80211_bss *bss;
        s32 signal;
        u64 timestamp;
        u16 capability;
@@ -1554,6 +2020,9 @@ static struct cfg80211_bss *rndis_bss_info_update(struct usbnet *usbdev,
        int ie_len, bssid_len;
        u8 *ie;
 
+       netdev_dbg(usbdev->net, " found bssid: '%.32s' [%pM], len: %d\n",
+                  bssid->ssid.essid, bssid->mac, le32_to_cpu(bssid->length));
+
        /* parse bssid structure */
        bssid_len = le32_to_cpu(bssid->length);
 
@@ -1581,52 +2050,111 @@ static struct cfg80211_bss *rndis_bss_info_update(struct usbnet *usbdev,
        capability = le16_to_cpu(fixed->capabilities);
        beacon_interval = le16_to_cpu(fixed->beacon_interval);
 
-       return cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid->mac,
+       bss = cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid->mac,
                timestamp, capability, beacon_interval, ie, ie_len, signal,
                GFP_KERNEL);
+       cfg80211_put_bss(bss);
+
+       return (bss != NULL);
+}
+
+static struct ndis_80211_bssid_ex *next_bssid_list_item(
+                                       struct ndis_80211_bssid_ex *bssid,
+                                       int *bssid_len, void *buf, int len)
+{
+       void *buf_end, *bssid_end;
+
+       buf_end = (char *)buf + len;
+       bssid_end = (char *)bssid + *bssid_len;
+
+       if ((int)(buf_end - bssid_end) < sizeof(bssid->length)) {
+               *bssid_len = 0;
+               return NULL;
+       } else {
+               bssid = (void *)((char *)bssid + *bssid_len);
+               *bssid_len = le32_to_cpu(bssid->length);
+               return bssid;
+       }
 }
 
+static bool check_bssid_list_item(struct ndis_80211_bssid_ex *bssid,
+                                 int bssid_len, void *buf, int len)
+{
+       void *buf_end, *bssid_end;
+
+       if (!bssid || bssid_len <= 0 || bssid_len > len)
+               return false;
+
+       buf_end = (char *)buf + len;
+       bssid_end = (char *)bssid + bssid_len;
 
-static int rndis_check_bssid_list(struct usbnet *usbdev)
+       return (int)(buf_end - bssid_end) >= 0 && (int)(bssid_end - buf) >= 0;
+}
+
+static int rndis_check_bssid_list(struct usbnet *usbdev, u8 *match_bssid,
+                                       bool *matched)
 {
        void *buf = NULL;
        struct ndis_80211_bssid_list_ex *bssid_list;
        struct ndis_80211_bssid_ex *bssid;
-       int ret = -EINVAL, len, count, bssid_len;
+       int ret = -EINVAL, len, count, bssid_len, real_count, new_len;
 
-       devdbg(usbdev, "check_bssid_list");
+       netdev_dbg(usbdev->net, "%s()\n", __func__);
 
        len = CONTROL_BUFFER_SIZE;
-       buf = kmalloc(len, GFP_KERNEL);
+resize_buf:
+       buf = kzalloc(len, GFP_KERNEL);
        if (!buf) {
                ret = -ENOMEM;
                goto out;
        }
 
-       ret = rndis_query_oid(usbdev, OID_802_11_BSSID_LIST, buf, &len);
-       if (ret != 0)
+       /* BSSID-list might have got bigger last time we checked, keep
+        * resizing until it won't get any bigger.
+        */
+       new_len = len;
+       ret = rndis_query_oid(usbdev, OID_802_11_BSSID_LIST, buf, &new_len);
+       if (ret != 0 || new_len < sizeof(struct ndis_80211_bssid_list_ex))
                goto out;
 
+       if (new_len > len) {
+               len = new_len;
+               kfree(buf);
+               goto resize_buf;
+       }
+
+       len = new_len;
+
        bssid_list = buf;
-       bssid = bssid_list->bssid;
-       bssid_len = le32_to_cpu(bssid->length);
        count = le32_to_cpu(bssid_list->num_items);
-       devdbg(usbdev, "check_bssid_list: %d BSSIDs found", count);
+       real_count = 0;
+       netdev_dbg(usbdev->net, "%s(): buflen: %d\n", __func__, len);
 
-       while (count && ((void *)bssid + bssid_len) <= (buf + len)) {
-               rndis_bss_info_update(usbdev, bssid);
+       bssid_len = 0;
+       bssid = next_bssid_list_item(bssid_list->bssid, &bssid_len, buf, len);
 
-               bssid = (void *)bssid + bssid_len;
-               bssid_len = le32_to_cpu(bssid->length);
-               count--;
+       /* Device returns incorrect 'num_items'. Workaround by ignoring the
+        * received 'num_items' and walking through full bssid buffer instead.
+        */
+       while (check_bssid_list_item(bssid, bssid_len, buf, len)) {
+               if (rndis_bss_info_update(usbdev, bssid) && match_bssid &&
+                   matched) {
+                       if (compare_ether_addr(bssid->mac, match_bssid))
+                               *matched = true;
+               }
+
+               real_count++;
+               bssid = next_bssid_list_item(bssid, &bssid_len, buf, len);
        }
 
+       netdev_dbg(usbdev->net, "%s(): num_items from device: %d, really found:"
+                               " %d\n", __func__, count, real_count);
+
 out:
        kfree(buf);
        return ret;
 }
 
-
 static void rndis_get_scan_results(struct work_struct *work)
 {
        struct rndis_wlan_private *priv =
@@ -1634,614 +2162,751 @@ static void rndis_get_scan_results(struct work_struct *work)
        struct usbnet *usbdev = priv->usbdev;
        int ret;
 
-       devdbg(usbdev, "get_scan_results");
+       netdev_dbg(usbdev->net, "get_scan_results\n");
 
        if (!priv->scan_request)
                return;
 
-       ret = rndis_check_bssid_list(usbdev);
+       ret = rndis_check_bssid_list(usbdev, NULL, NULL);
 
        cfg80211_scan_done(priv->scan_request, ret < 0);
 
        priv->scan_request = NULL;
 }
 
+static int rndis_connect(struct wiphy *wiphy, struct net_device *dev,
+                                       struct cfg80211_connect_params *sme)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       struct ieee80211_channel *channel = sme->channel;
+       struct ndis_80211_ssid ssid;
+       int pairwise = RNDIS_WLAN_ALG_NONE;
+       int groupwise = RNDIS_WLAN_ALG_NONE;
+       int keymgmt = RNDIS_WLAN_KEY_MGMT_NONE;
+       int length, i, ret, chan = -1;
+
+       if (channel)
+               chan = ieee80211_frequency_to_channel(channel->center_freq);
+
+       groupwise = rndis_cipher_to_alg(sme->crypto.cipher_group);
+       for (i = 0; i < sme->crypto.n_ciphers_pairwise; i++)
+               pairwise |=
+                       rndis_cipher_to_alg(sme->crypto.ciphers_pairwise[i]);
+
+       if (sme->crypto.n_ciphers_pairwise > 0 &&
+                       pairwise == RNDIS_WLAN_ALG_NONE) {
+               netdev_err(usbdev->net, "Unsupported pairwise cipher\n");
+               return -ENOTSUPP;
+       }
 
-/*
- * wireless extension handlers
- */
+       for (i = 0; i < sme->crypto.n_akm_suites; i++)
+               keymgmt |=
+                       rndis_akm_suite_to_key_mgmt(sme->crypto.akm_suites[i]);
 
-static int rndis_iw_commit(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       /* dummy op */
-       return 0;
-}
+       if (sme->crypto.n_akm_suites > 0 &&
+                       keymgmt == RNDIS_WLAN_KEY_MGMT_NONE) {
+               netdev_err(usbdev->net, "Invalid keymgmt\n");
+               return -ENOTSUPP;
+       }
 
+       netdev_dbg(usbdev->net, "cfg80211.connect('%.32s':[%pM]:%d:[%d,0x%x:0x%x]:[0x%x:0x%x]:0x%x)\n",
+                  sme->ssid, sme->bssid, chan,
+                  sme->privacy, sme->crypto.wpa_versions, sme->auth_type,
+                  groupwise, pairwise, keymgmt);
 
-static int rndis_iw_set_essid(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *essid)
-{
-       struct ndis_80211_ssid ssid;
-       int length = wrqu->essid.length;
-       struct usbnet *usbdev = netdev_priv(dev);
+       if (is_associated(usbdev))
+               disassociate(usbdev, false);
+
+       ret = set_infra_mode(usbdev, NDIS_80211_INFRA_INFRA);
+       if (ret < 0) {
+               netdev_dbg(usbdev->net, "connect: set_infra_mode failed, %d\n",
+                          ret);
+               goto err_turn_radio_on;
+       }
+
+       ret = set_auth_mode(usbdev, sme->crypto.wpa_versions, sme->auth_type,
+                                                               keymgmt);
+       if (ret < 0) {
+               netdev_dbg(usbdev->net, "connect: set_auth_mode failed, %d\n",
+                          ret);
+               goto err_turn_radio_on;
+       }
+
+       set_priv_filter(usbdev);
+
+       ret = set_encr_mode(usbdev, pairwise, groupwise);
+       if (ret < 0) {
+               netdev_dbg(usbdev->net, "connect: set_encr_mode failed, %d\n",
+                          ret);
+               goto err_turn_radio_on;
+       }
 
-       devdbg(usbdev, "SIOCSIWESSID: [flags:%d,len:%d] '%.32s'",
-               wrqu->essid.flags, wrqu->essid.length, essid);
+       if (channel) {
+               ret = set_channel(usbdev, chan);
+               if (ret < 0) {
+                       netdev_dbg(usbdev->net, "connect: set_channel failed, %d\n",
+                                  ret);
+                       goto err_turn_radio_on;
+               }
+       }
+
+       if (sme->key && ((groupwise | pairwise) & RNDIS_WLAN_ALG_WEP)) {
+               priv->encr_tx_key_index = sme->key_idx;
+               ret = add_wep_key(usbdev, sme->key, sme->key_len, sme->key_idx);
+               if (ret < 0) {
+                       netdev_dbg(usbdev->net, "connect: add_wep_key failed, %d (%d, %d)\n",
+                                  ret, sme->key_len, sme->key_idx);
+                       goto err_turn_radio_on;
+               }
+       }
+
+       if (sme->bssid && !is_zero_ether_addr(sme->bssid) &&
+                               !is_broadcast_ether_addr(sme->bssid)) {
+               ret = set_bssid(usbdev, sme->bssid);
+               if (ret < 0) {
+                       netdev_dbg(usbdev->net, "connect: set_bssid failed, %d\n",
+                                  ret);
+                       goto err_turn_radio_on;
+               }
+       } else
+               clear_bssid(usbdev);
 
+       length = sme->ssid_len;
        if (length > NDIS_802_11_LENGTH_SSID)
                length = NDIS_802_11_LENGTH_SSID;
 
+       memset(&ssid, 0, sizeof(ssid));
        ssid.length = cpu_to_le32(length);
-       if (length > 0)
-               memcpy(ssid.essid, essid, length);
-       else
-               memset(ssid.essid, 0, NDIS_802_11_LENGTH_SSID);
+       memcpy(ssid.essid, sme->ssid, length);
 
-       set_assoc_params(usbdev);
+       /* Pause and purge rx queue, so we don't pass packets before
+        * 'media connect'-indication.
+        */
+       usbnet_pause_rx(usbdev);
+       usbnet_purge_paused_rxq(usbdev);
 
-       if (!wrqu->essid.flags || length == 0)
-               return disassociate(usbdev, 1);
-       else
-               return set_essid(usbdev, &ssid);
+       ret = set_essid(usbdev, &ssid);
+       if (ret < 0)
+               netdev_dbg(usbdev->net, "connect: set_essid failed, %d\n", ret);
+       return ret;
+
+err_turn_radio_on:
+       disassociate(usbdev, true);
+
+       return ret;
 }
 
+static int rndis_disconnect(struct wiphy *wiphy, struct net_device *dev,
+                                                               u16 reason_code)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-static int rndis_iw_get_essid(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *essid)
+       netdev_dbg(usbdev->net, "cfg80211.disconnect(%d)\n", reason_code);
+
+       priv->connected = false;
+       memset(priv->bssid, 0, ETH_ALEN);
+
+       return deauthenticate(usbdev);
+}
+
+static int rndis_join_ibss(struct wiphy *wiphy, struct net_device *dev,
+                                       struct cfg80211_ibss_params *params)
 {
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       struct ieee80211_channel *channel = params->channel;
        struct ndis_80211_ssid ssid;
-       struct usbnet *usbdev = netdev_priv(dev);
-       int ret;
+       enum nl80211_auth_type auth_type;
+       int ret, alg, length, chan = -1;
 
-       ret = get_essid(usbdev, &ssid);
+       if (channel)
+               chan = ieee80211_frequency_to_channel(channel->center_freq);
 
-       if (ret == 0 && le32_to_cpu(ssid.length) > 0) {
-               wrqu->essid.flags = 1;
-               wrqu->essid.length = le32_to_cpu(ssid.length);
-               memcpy(essid, ssid.essid, wrqu->essid.length);
-               essid[wrqu->essid.length] = 0;
+       /* TODO: How to handle ad-hoc encryption?
+        * connect() has *key, join_ibss() doesn't. RNDIS requires key to be
+        * pre-shared for encryption (open/shared/wpa), is key set before
+        * join_ibss? Which auth_type to use (not in params)? What about WPA?
+        */
+       if (params->privacy) {
+               auth_type = NL80211_AUTHTYPE_SHARED_KEY;
+               alg = RNDIS_WLAN_ALG_WEP;
        } else {
-               memset(essid, 0, sizeof(NDIS_802_11_LENGTH_SSID));
-               wrqu->essid.flags = 0;
-               wrqu->essid.length = 0;
+               auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM;
+               alg = RNDIS_WLAN_ALG_NONE;
        }
-       devdbg(usbdev, "SIOCGIWESSID: %s", essid);
-       return ret;
-}
 
+       netdev_dbg(usbdev->net, "cfg80211.join_ibss('%.32s':[%pM]:%d:%d)\n",
+                  params->ssid, params->bssid, chan, params->privacy);
 
-static int rndis_iw_get_bssid(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = netdev_priv(dev);
-       unsigned char bssid[ETH_ALEN];
-       int ret;
+       if (is_associated(usbdev))
+               disassociate(usbdev, false);
 
-       ret = get_bssid(usbdev, bssid);
+       ret = set_infra_mode(usbdev, NDIS_80211_INFRA_ADHOC);
+       if (ret < 0) {
+               netdev_dbg(usbdev->net, "join_ibss: set_infra_mode failed, %d\n",
+                          ret);
+               goto err_turn_radio_on;
+       }
 
-       if (ret == 0)
-               devdbg(usbdev, "SIOCGIWAP: %pM", bssid);
-       else
-               devdbg(usbdev, "SIOCGIWAP: <not associated>");
+       ret = set_auth_mode(usbdev, 0, auth_type, RNDIS_WLAN_KEY_MGMT_NONE);
+       if (ret < 0) {
+               netdev_dbg(usbdev->net, "join_ibss: set_auth_mode failed, %d\n",
+                          ret);
+               goto err_turn_radio_on;
+       }
 
-       wrqu->ap_addr.sa_family = ARPHRD_ETHER;
-       memcpy(wrqu->ap_addr.sa_data, bssid, ETH_ALEN);
+       set_priv_filter(usbdev);
 
+       ret = set_encr_mode(usbdev, alg, RNDIS_WLAN_ALG_NONE);
+       if (ret < 0) {
+               netdev_dbg(usbdev->net, "join_ibss: set_encr_mode failed, %d\n",
+                          ret);
+               goto err_turn_radio_on;
+       }
+
+       if (channel) {
+               ret = set_channel(usbdev, chan);
+               if (ret < 0) {
+                       netdev_dbg(usbdev->net, "join_ibss: set_channel failed, %d\n",
+                                  ret);
+                       goto err_turn_radio_on;
+               }
+       }
+
+       if (params->bssid && !is_zero_ether_addr(params->bssid) &&
+                               !is_broadcast_ether_addr(params->bssid)) {
+               ret = set_bssid(usbdev, params->bssid);
+               if (ret < 0) {
+                       netdev_dbg(usbdev->net, "join_ibss: set_bssid failed, %d\n",
+                                  ret);
+                       goto err_turn_radio_on;
+               }
+       } else
+               clear_bssid(usbdev);
+
+       length = params->ssid_len;
+       if (length > NDIS_802_11_LENGTH_SSID)
+               length = NDIS_802_11_LENGTH_SSID;
+
+       memset(&ssid, 0, sizeof(ssid));
+       ssid.length = cpu_to_le32(length);
+       memcpy(ssid.essid, params->ssid, length);
+
+       /* Don't need to pause rx queue for ad-hoc. */
+       usbnet_purge_paused_rxq(usbdev);
+       usbnet_resume_rx(usbdev);
+
+       ret = set_essid(usbdev, &ssid);
+       if (ret < 0)
+               netdev_dbg(usbdev->net, "join_ibss: set_essid failed, %d\n",
+                          ret);
        return ret;
-}
 
+err_turn_radio_on:
+       disassociate(usbdev, true);
+
+       return ret;
+}
 
-static int rndis_iw_set_bssid(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
 {
-       struct usbnet *usbdev = netdev_priv(dev);
-       u8 *bssid = (u8 *)wrqu->ap_addr.sa_data;
-       int ret;
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-       devdbg(usbdev, "SIOCSIWAP: %pM", bssid);
+       netdev_dbg(usbdev->net, "cfg80211.leave_ibss()\n");
 
-       ret = rndis_set_oid(usbdev, OID_802_11_BSSID, bssid, ETH_ALEN);
+       priv->connected = false;
+       memset(priv->bssid, 0, ETH_ALEN);
 
-       /* user apps may set ap's mac address, which is not required;
-        * they may fail to work if this function fails, so return
-        * success */
-       if (ret)
-               devwarn(usbdev, "setting AP mac address failed (%08X)", ret);
+       return deauthenticate(usbdev);
+}
 
-       return 0;
+static int rndis_set_channel(struct wiphy *wiphy, struct net_device *netdev,
+       struct ieee80211_channel *chan, enum nl80211_channel_type channel_type)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+
+       return set_channel(usbdev,
+                       ieee80211_frequency_to_channel(chan->center_freq));
 }
 
+static int rndis_add_key(struct wiphy *wiphy, struct net_device *netdev,
+                        u8 key_index, bool pairwise, const u8 *mac_addr,
+                        struct key_params *params)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       __le32 flags;
+
+       netdev_dbg(usbdev->net, "%s(%i, %pM, %08x)\n",
+                  __func__, key_index, mac_addr, params->cipher);
+
+       switch (params->cipher) {
+       case WLAN_CIPHER_SUITE_WEP40:
+       case WLAN_CIPHER_SUITE_WEP104:
+               return add_wep_key(usbdev, params->key, params->key_len,
+                                                               key_index);
+       case WLAN_CIPHER_SUITE_TKIP:
+       case WLAN_CIPHER_SUITE_CCMP:
+               flags = 0;
+
+               if (params->seq && params->seq_len > 0)
+                       flags |= NDIS_80211_ADDKEY_SET_INIT_RECV_SEQ;
+               if (mac_addr)
+                       flags |= NDIS_80211_ADDKEY_PAIRWISE_KEY |
+                                       NDIS_80211_ADDKEY_TRANSMIT_KEY;
+
+               return add_wpa_key(usbdev, params->key, params->key_len,
+                               key_index, mac_addr, params->seq,
+                               params->seq_len, params->cipher, flags);
+       default:
+               netdev_dbg(usbdev->net, "%s(): unsupported cipher %08x\n",
+                          __func__, params->cipher);
+               return -ENOTSUPP;
+       }
+}
 
-static int rndis_iw_set_auth(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_del_key(struct wiphy *wiphy, struct net_device *netdev,
+                        u8 key_index, bool pairwise, const u8 *mac_addr)
 {
-       struct iw_param *p = &wrqu->param;
-       struct usbnet *usbdev = netdev_priv(dev);
-       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-       int ret = -ENOTSUPP;
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-       switch (p->flags & IW_AUTH_INDEX) {
-       case IW_AUTH_WPA_VERSION:
-               devdbg(usbdev, "SIOCSIWAUTH: WPA_VERSION, %08x", p->value);
-               priv->wpa_version = p->value;
-               ret = 0;
-               break;
+       netdev_dbg(usbdev->net, "%s(%i, %pM)\n", __func__, key_index, mac_addr);
 
-       case IW_AUTH_CIPHER_PAIRWISE:
-               devdbg(usbdev, "SIOCSIWAUTH: CIPHER_PAIRWISE, %08x", p->value);
-               priv->wpa_cipher_pair = p->value;
-               ret = 0;
-               break;
+       return remove_key(usbdev, key_index, mac_addr);
+}
 
-       case IW_AUTH_CIPHER_GROUP:
-               devdbg(usbdev, "SIOCSIWAUTH: CIPHER_GROUP, %08x", p->value);
-               priv->wpa_cipher_group = p->value;
-               ret = 0;
-               break;
+static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
+                                u8 key_index, bool unicast, bool multicast)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       struct rndis_wlan_encr_key key;
 
-       case IW_AUTH_KEY_MGMT:
-               devdbg(usbdev, "SIOCSIWAUTH: KEY_MGMT, %08x", p->value);
-               priv->wpa_keymgmt = p->value;
-               ret = 0;
-               break;
+       netdev_dbg(usbdev->net, "%s(%i)\n", __func__, key_index);
 
-       case IW_AUTH_TKIP_COUNTERMEASURES:
-               devdbg(usbdev, "SIOCSIWAUTH: TKIP_COUNTERMEASURES, %08x",
-                                                               p->value);
-               ret = 0;
-               break;
+       if (key_index >= RNDIS_WLAN_NUM_KEYS)
+               return -ENOENT;
 
-       case IW_AUTH_DROP_UNENCRYPTED:
-               devdbg(usbdev, "SIOCSIWAUTH: DROP_UNENCRYPTED, %08x", p->value);
-               ret = 0;
-               break;
+       priv->encr_tx_key_index = key_index;
 
-       case IW_AUTH_80211_AUTH_ALG:
-               devdbg(usbdev, "SIOCSIWAUTH: 80211_AUTH_ALG, %08x", p->value);
-               priv->wpa_authalg = p->value;
-               ret = 0;
-               break;
+       if (is_wpa_key(priv, key_index))
+               return 0;
 
-       case IW_AUTH_WPA_ENABLED:
-               devdbg(usbdev, "SIOCSIWAUTH: WPA_ENABLED, %08x", p->value);
-               if (wrqu->param.value)
-                       deauthenticate(usbdev);
-               ret = 0;
-               break;
+       key = priv->encr_keys[key_index];
 
-       case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-               devdbg(usbdev, "SIOCSIWAUTH: RX_UNENCRYPTED_EAPOL, %08x",
-                                                               p->value);
-               ret = 0;
-               break;
+       return add_wep_key(usbdev, key.material, key.len, key_index);
+}
 
-       case IW_AUTH_ROAMING_CONTROL:
-               devdbg(usbdev, "SIOCSIWAUTH: ROAMING_CONTROL, %08x", p->value);
-               ret = 0;
-               break;
+static void rndis_fill_station_info(struct usbnet *usbdev,
+                                               struct station_info *sinfo)
+{
+       __le32 linkspeed, rssi;
+       int ret, len;
 
-       case IW_AUTH_PRIVACY_INVOKED:
-               devdbg(usbdev, "SIOCSIWAUTH: invalid cmd %d",
-                               wrqu->param.flags & IW_AUTH_INDEX);
-               return -EOPNOTSUPP;
+       memset(sinfo, 0, sizeof(*sinfo));
 
-       default:
-               devdbg(usbdev, "SIOCSIWAUTH: UNKNOWN  %08x, %08x",
-                       p->flags & IW_AUTH_INDEX, p->value);
+       len = sizeof(linkspeed);
+       ret = rndis_query_oid(usbdev, OID_GEN_LINK_SPEED, &linkspeed, &len);
+       if (ret == 0) {
+               sinfo->txrate.legacy = le32_to_cpu(linkspeed) / 1000;
+               sinfo->filled |= STATION_INFO_TX_BITRATE;
        }
-       return ret;
-}
 
+       len = sizeof(rssi);
+       ret = rndis_query_oid(usbdev, OID_802_11_RSSI, &rssi, &len);
+       if (ret == 0) {
+               sinfo->signal = level_to_qual(le32_to_cpu(rssi));
+               sinfo->filled |= STATION_INFO_SIGNAL;
+       }
+}
 
-static int rndis_iw_get_auth(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev,
+                                       u8 *mac, struct station_info *sinfo)
 {
-       struct iw_param *p = &wrqu->param;
-       struct usbnet *usbdev = netdev_priv(dev);
-       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+
+       if (compare_ether_addr(priv->bssid, mac))
+               return -ENOENT;
+
+       rndis_fill_station_info(usbdev, sinfo);
 
-       switch (p->flags & IW_AUTH_INDEX) {
-       case IW_AUTH_WPA_VERSION:
-               p->value = priv->wpa_version;
-               break;
-       case IW_AUTH_CIPHER_PAIRWISE:
-               p->value = priv->wpa_cipher_pair;
-               break;
-       case IW_AUTH_CIPHER_GROUP:
-               p->value = priv->wpa_cipher_group;
-               break;
-       case IW_AUTH_KEY_MGMT:
-               p->value = priv->wpa_keymgmt;
-               break;
-       case IW_AUTH_80211_AUTH_ALG:
-               p->value = priv->wpa_authalg;
-               break;
-       default:
-               devdbg(usbdev, "SIOCGIWAUTH: invalid cmd %d",
-                               wrqu->param.flags & IW_AUTH_INDEX);
-               return -EOPNOTSUPP;
-       }
        return 0;
 }
 
-
-static int rndis_iw_set_encode(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_dump_station(struct wiphy *wiphy, struct net_device *dev,
+                              int idx, u8 *mac, struct station_info *sinfo)
 {
-       struct usbnet *usbdev = netdev_priv(dev);
-       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-       int ret, index, key_len;
-       u8 *key;
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-       index = (wrqu->encoding.flags & IW_ENCODE_INDEX);
+       if (idx != 0)
+               return -ENOENT;
 
-       /* iwconfig gives index as 1 - N */
-       if (index > 0)
-               index--;
-       else
-               index = priv->encr_tx_key_index;
+       memcpy(mac, priv->bssid, ETH_ALEN);
 
-       if (index < 0 || index >= 4) {
-               devwarn(usbdev, "encryption index out of range (%u)", index);
-               return -EINVAL;
+       rndis_fill_station_info(usbdev, sinfo);
+
+       return 0;
+}
+
+static int rndis_set_pmksa(struct wiphy *wiphy, struct net_device *netdev,
+                               struct cfg80211_pmksa *pmksa)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       struct ndis_80211_pmkid *pmkids;
+       u32 *tmp = (u32 *)pmksa->pmkid;
+
+       netdev_dbg(usbdev->net, "%s(%pM, %08X:%08X:%08X:%08X)\n", __func__,
+                       pmksa->bssid,
+                       cpu_to_be32(tmp[0]), cpu_to_be32(tmp[1]),
+                       cpu_to_be32(tmp[2]), cpu_to_be32(tmp[3]));
+
+       pmkids = get_device_pmkids(usbdev);
+       if (IS_ERR(pmkids)) {
+               /* couldn't read PMKID cache from device */
+               return PTR_ERR(pmkids);
        }
 
-       /* remove key if disabled */
-       if (wrqu->data.flags & IW_ENCODE_DISABLED) {
-               if (remove_key(usbdev, index, NULL))
-                       return -EINVAL;
-               else
-                       return 0;
+       pmkids = update_pmkid(usbdev, pmkids, pmksa, wiphy->max_num_pmkids);
+       if (IS_ERR(pmkids)) {
+               /* not found, list full, etc */
+               return PTR_ERR(pmkids);
        }
 
-       /* global encryption state (for all keys) */
-       if (wrqu->data.flags & IW_ENCODE_OPEN)
-               ret = set_auth_mode(usbdev, IW_AUTH_WPA_VERSION_DISABLED,
-                                               IW_AUTH_ALG_OPEN_SYSTEM);
-       else /*if (wrqu->data.flags & IW_ENCODE_RESTRICTED)*/
-               ret = set_auth_mode(usbdev, IW_AUTH_WPA_VERSION_DISABLED,
-                                               IW_AUTH_ALG_SHARED_KEY);
-       if (ret != 0)
-               return ret;
+       return set_device_pmkids(usbdev, pmkids);
+}
 
-       if (wrqu->data.length > 0) {
-               key_len = wrqu->data.length;
-               key = extra;
-       } else {
-               /* must be set as tx key */
-               if (priv->encr_key_len[index] == 0)
-                       return -EINVAL;
-               key_len = priv->encr_key_len[index];
-               key = priv->encr_keys[index];
-               priv->encr_tx_key_index = index;
+static int rndis_del_pmksa(struct wiphy *wiphy, struct net_device *netdev,
+                               struct cfg80211_pmksa *pmksa)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       struct ndis_80211_pmkid *pmkids;
+       u32 *tmp = (u32 *)pmksa->pmkid;
+
+       netdev_dbg(usbdev->net, "%s(%pM, %08X:%08X:%08X:%08X)\n", __func__,
+                       pmksa->bssid,
+                       cpu_to_be32(tmp[0]), cpu_to_be32(tmp[1]),
+                       cpu_to_be32(tmp[2]), cpu_to_be32(tmp[3]));
+
+       pmkids = get_device_pmkids(usbdev);
+       if (IS_ERR(pmkids)) {
+               /* Couldn't read PMKID cache from device */
+               return PTR_ERR(pmkids);
        }
 
-       if (add_wep_key(usbdev, key, key_len, index) != 0)
-               return -EINVAL;
-
-       if (index == priv->encr_tx_key_index)
-               /* ndis drivers want essid to be set after setting encr */
-               set_essid(usbdev, &priv->essid);
+       pmkids = remove_pmkid(usbdev, pmkids, pmksa, wiphy->max_num_pmkids);
+       if (IS_ERR(pmkids)) {
+               /* not found, etc */
+               return PTR_ERR(pmkids);
+       }
 
-       return 0;
+       return set_device_pmkids(usbdev, pmkids);
 }
 
+static int rndis_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       struct ndis_80211_pmkid pmkid;
+
+       netdev_dbg(usbdev->net, "%s()\n", __func__);
 
-static int rndis_iw_set_encode_ext(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+       memset(&pmkid, 0, sizeof(pmkid));
+
+       pmkid.length = cpu_to_le32(sizeof(pmkid));
+       pmkid.bssid_info_count = cpu_to_le32(0);
+
+       return rndis_set_oid(usbdev, OID_802_11_PMKID, &pmkid, sizeof(pmkid));
+}
+
+static int rndis_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
+                               bool enabled, int timeout)
 {
-       struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-       struct usbnet *usbdev = netdev_priv(dev);
-       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-       int keyidx, flags;
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       int power_mode;
+       __le32 mode;
+       int ret;
 
-       keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX;
+       if (priv->device_type != RNDIS_BCM4320B)
+               return -ENOTSUPP;
 
-       /* iwconfig gives index as 1 - N */
-       if (keyidx)
-               keyidx--;
+       netdev_dbg(usbdev->net, "%s(): %s, %d\n", __func__,
+                               enabled ? "enabled" : "disabled",
+                               timeout);
+
+       if (enabled)
+               power_mode = NDIS_80211_POWER_MODE_FAST_PSP;
        else
-               keyidx = priv->encr_tx_key_index;
+               power_mode = NDIS_80211_POWER_MODE_CAM;
 
-       if (keyidx < 0 || keyidx >= 4)
-               return -EINVAL;
+       if (power_mode == priv->power_mode)
+               return 0;
 
-       if (ext->alg == WPA_ALG_WEP) {
-               if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
-                       priv->encr_tx_key_index = keyidx;
-               return add_wep_key(usbdev, ext->key, ext->key_len, keyidx);
-       }
+       priv->power_mode = power_mode;
 
-       if ((wrqu->encoding.flags & IW_ENCODE_DISABLED) ||
-           ext->alg == IW_ENCODE_ALG_NONE || ext->key_len == 0)
-               return remove_key(usbdev, keyidx, NULL);
+       mode = cpu_to_le32(power_mode);
+       ret = rndis_set_oid(usbdev, OID_802_11_POWER_MODE, &mode, sizeof(mode));
 
-       flags = 0;
-       if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID)
-               flags |= NDIS_80211_ADDKEY_SET_INIT_RECV_SEQ;
-       if (!(ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY))
-               flags |= NDIS_80211_ADDKEY_PAIRWISE_KEY;
-       if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
-               flags |= NDIS_80211_ADDKEY_TRANSMIT_KEY;
+       netdev_dbg(usbdev->net, "%s(): OID_802_11_POWER_MODE -> %d\n",
+                               __func__, ret);
 
-       return add_wpa_key(usbdev, ext->key, ext->key_len, keyidx, &ext->addr,
-                               ext->rx_seq, ext->alg, flags);
+       return ret;
 }
 
-
-static int rndis_iw_set_genie(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_set_cqm_rssi_config(struct wiphy *wiphy,
+                                       struct net_device *dev,
+                                       s32 rssi_thold, u32 rssi_hyst)
 {
-       struct usbnet *usbdev = netdev_priv(dev);
-       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-       int ret = 0;
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
 
-#ifdef DEBUG
-       int j;
-       u8 *gie = extra;
-       for (j = 0; j < wrqu->data.length; j += 8)
-               devdbg(usbdev,
-                       "SIOCSIWGENIE %04x - "
-                       "%02x %02x %02x %02x %02x %02x %02x %02x", j,
-                       gie[j + 0], gie[j + 1], gie[j + 2], gie[j + 3],
-                       gie[j + 4], gie[j + 5], gie[j + 6], gie[j + 7]);
-#endif
-       /* clear existing IEs */
-       if (priv->wpa_ie_len) {
-               kfree(priv->wpa_ie);
-               priv->wpa_ie_len = 0;
-       }
+       priv->cqm_rssi_thold = rssi_thold;
+       priv->cqm_rssi_hyst = rssi_hyst;
+       priv->last_cqm_event_rssi = 0;
 
-       /* set new IEs */
-       priv->wpa_ie = kmalloc(wrqu->data.length, GFP_KERNEL);
-       if (priv->wpa_ie) {
-               priv->wpa_ie_len = wrqu->data.length;
-               memcpy(priv->wpa_ie, extra, priv->wpa_ie_len);
-       } else
-               ret = -ENOMEM;
-       return ret;
+       return 0;
 }
 
-
-static int rndis_iw_get_genie(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
+                                          struct ndis_80211_assoc_info *info)
 {
-       struct usbnet *usbdev = netdev_priv(dev);
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       struct ieee80211_channel *channel;
+       struct ndis_80211_ssid ssid;
+       struct cfg80211_bss *bss;
+       s32 signal;
+       u64 timestamp;
+       u16 capability;
+       u32 beacon_period = 0;
+       __le32 rssi;
+       u8 ie_buf[34];
+       int len, ret, ie_len;
+
+       /* Get signal quality, in case of error use rssi=0 and ignore error. */
+       len = sizeof(rssi);
+       rssi = 0;
+       ret = rndis_query_oid(usbdev, OID_802_11_RSSI, &rssi, &len);
+       signal = level_to_qual(le32_to_cpu(rssi));
 
-       devdbg(usbdev, "SIOCGIWGENIE");
+       netdev_dbg(usbdev->net, "%s(): OID_802_11_RSSI -> %d, "
+                  "rssi:%d, qual: %d\n", __func__, ret, le32_to_cpu(rssi),
+                  level_to_qual(le32_to_cpu(rssi)));
 
-       if (priv->wpa_ie_len == 0 || priv->wpa_ie == NULL) {
-               wrqu->data.length = 0;
-               return 0;
+       /* Get AP capabilities */
+       if (info) {
+               capability = le16_to_cpu(info->resp_ie.capa);
+       } else {
+               /* Set atleast ESS/IBSS capability */
+               capability = (priv->infra_mode == NDIS_80211_INFRA_INFRA) ?
+                               WLAN_CAPABILITY_ESS : WLAN_CAPABILITY_IBSS;
        }
 
-       if (wrqu->data.length < priv->wpa_ie_len)
-               return -E2BIG;
+       /* Get channel and beacon interval */
+       channel = get_current_channel(usbdev, &beacon_period);
+       if (!channel) {
+               netdev_warn(usbdev->net, "%s(): could not get channel.\n",
+                                       __func__);
+               return;
+       }
 
-       wrqu->data.length = priv->wpa_ie_len;
-       memcpy(extra, priv->wpa_ie, priv->wpa_ie_len);
+       /* Get SSID, in case of error, use zero length SSID and ignore error. */
+       len = sizeof(ssid);
+       memset(&ssid, 0, sizeof(ssid));
+       ret = rndis_query_oid(usbdev, OID_802_11_SSID, &ssid, &len);
+       netdev_dbg(usbdev->net, "%s(): OID_802_11_SSID -> %d, len: %d, ssid: "
+                               "'%.32s'\n", __func__, ret,
+                               le32_to_cpu(ssid.length), ssid.essid);
 
-       return 0;
-}
+       if (le32_to_cpu(ssid.length) > 32)
+               ssid.length = cpu_to_le32(32);
 
+       ie_buf[0] = WLAN_EID_SSID;
+       ie_buf[1] = le32_to_cpu(ssid.length);
+       memcpy(&ie_buf[2], ssid.essid, le32_to_cpu(ssid.length));
 
-static int rndis_iw_set_freq(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = netdev_priv(dev);
-       struct ndis_80211_conf config;
-       unsigned int dsconfig;
-       int len, ret;
+       ie_len = le32_to_cpu(ssid.length) + 2;
 
-       /* this OID is valid only when not associated */
-       if (is_associated(usbdev))
-               return 0;
+       /* no tsf */
+       timestamp = 0;
 
-       dsconfig = 0;
-       if (freq_to_dsconfig(&wrqu->freq, &dsconfig))
-               return -EINVAL;
+       netdev_dbg(usbdev->net, "%s(): channel:%d(freq), bssid:[%pM], tsf:%d, "
+               "capa:%x, beacon int:%d, resp_ie(len:%d, essid:'%.32s'), "
+               "signal:%d\n", __func__, (channel ? channel->center_freq : -1),
+               bssid, (u32)timestamp, capability, beacon_period, ie_len,
+               ssid.essid, signal);
 
-       len = sizeof(config);
-       ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
-       if (ret != 0) {
-               devdbg(usbdev, "SIOCSIWFREQ: querying configuration failed");
-               return 0;
-       }
+       bss = cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid,
+               timestamp, capability, beacon_period, ie_buf, ie_len,
+               signal, GFP_KERNEL);
+       cfg80211_put_bss(bss);
+}
 
-       config.ds_config = cpu_to_le32(dsconfig);
+/*
+ * workers, indication handlers, device poller
+ */
+static void rndis_wlan_do_link_up_work(struct usbnet *usbdev)
+{
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       struct ndis_80211_assoc_info *info = NULL;
+       u8 bssid[ETH_ALEN];
+       unsigned int resp_ie_len, req_ie_len;
+       unsigned int offset;
+       u8 *req_ie, *resp_ie;
+       int ret;
+       bool roamed = false;
+       bool match_bss;
 
-       devdbg(usbdev, "SIOCSIWFREQ: %d * 10^%d", wrqu->freq.m, wrqu->freq.e);
-       return rndis_set_oid(usbdev, OID_802_11_CONFIGURATION, &config,
-                                                               sizeof(config));
-}
+       if (priv->infra_mode == NDIS_80211_INFRA_INFRA && priv->connected) {
+               /* received media connect indication while connected, either
+                * device reassociated with same AP or roamed to new. */
+               roamed = true;
+       }
 
+       req_ie_len = 0;
+       resp_ie_len = 0;
+       req_ie = NULL;
+       resp_ie = NULL;
+
+       if (priv->infra_mode == NDIS_80211_INFRA_INFRA) {
+               info = kzalloc(CONTROL_BUFFER_SIZE, GFP_KERNEL);
+               if (!info) {
+                       /* No memory? Try resume work later */
+                       set_bit(WORK_LINK_UP, &priv->work_pending);
+                       queue_work(priv->workqueue, &priv->work);
+                       return;
+               }
 
-static int rndis_iw_get_freq(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = netdev_priv(dev);
-       struct ndis_80211_conf config;
-       int len, ret;
+               /* Get association info IEs from device. */
+               ret = get_association_info(usbdev, info, CONTROL_BUFFER_SIZE);
+               if (!ret) {
+                       req_ie_len = le32_to_cpu(info->req_ie_length);
+                       if (req_ie_len > CONTROL_BUFFER_SIZE)
+                               req_ie_len = CONTROL_BUFFER_SIZE;
+                       if (req_ie_len != 0) {
+                               offset = le32_to_cpu(info->offset_req_ies);
 
-       len = sizeof(config);
-       ret = rndis_query_oid(usbdev, OID_802_11_CONFIGURATION, &config, &len);
-       if (ret == 0)
-               dsconfig_to_freq(le32_to_cpu(config.ds_config), &wrqu->freq);
+                               if (offset > CONTROL_BUFFER_SIZE)
+                                       offset = CONTROL_BUFFER_SIZE;
 
-       devdbg(usbdev, "SIOCGIWFREQ: %d", wrqu->freq.m);
-       return ret;
-}
+                               req_ie = (u8 *)info + offset;
 
+                               if (offset + req_ie_len > CONTROL_BUFFER_SIZE)
+                                       req_ie_len =
+                                               CONTROL_BUFFER_SIZE - offset;
+                       }
 
-static int rndis_iw_get_rate(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = netdev_priv(dev);
-       __le32 tmp;
-       int ret, len;
+                       resp_ie_len = le32_to_cpu(info->resp_ie_length);
+                       if (resp_ie_len > CONTROL_BUFFER_SIZE)
+                               resp_ie_len = CONTROL_BUFFER_SIZE;
+                       if (resp_ie_len != 0) {
+                               offset = le32_to_cpu(info->offset_resp_ies);
 
-       len = sizeof(tmp);
-       ret = rndis_query_oid(usbdev, OID_GEN_LINK_SPEED, &tmp, &len);
-       if (ret == 0) {
-               wrqu->bitrate.value = le32_to_cpu(tmp) * 100;
-               wrqu->bitrate.disabled = 0;
-               wrqu->bitrate.flags = 1;
-       }
-       return ret;
-}
+                               if (offset > CONTROL_BUFFER_SIZE)
+                                       offset = CONTROL_BUFFER_SIZE;
 
+                               resp_ie = (u8 *)info + offset;
 
-static int rndis_iw_set_mlme(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = netdev_priv(dev);
-       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-       struct iw_mlme *mlme = (struct iw_mlme *)extra;
-       unsigned char bssid[ETH_ALEN];
+                               if (offset + resp_ie_len > CONTROL_BUFFER_SIZE)
+                                       resp_ie_len =
+                                               CONTROL_BUFFER_SIZE - offset;
+                       }
+               } else {
+                       /* Since rndis_wlan_craft_connected_bss() might use info
+                        * later and expects info to contain valid data if
+                        * non-null, free info and set NULL here.
+                        */
+                       kfree(info);
+                       info = NULL;
+               }
+       } else if (WARN_ON(priv->infra_mode != NDIS_80211_INFRA_ADHOC))
+               return;
 
-       get_bssid(usbdev, bssid);
+       ret = get_bssid(usbdev, bssid);
+       if (ret < 0)
+               memset(bssid, 0, sizeof(bssid));
 
-       if (memcmp(bssid, mlme->addr.sa_data, ETH_ALEN))
-               return -EINVAL;
+       netdev_dbg(usbdev->net, "link up work: [%pM]%s\n",
+                  bssid, roamed ? " roamed" : "");
 
-       switch (mlme->cmd) {
-       case IW_MLME_DEAUTH:
-               return deauthenticate(usbdev);
-       case IW_MLME_DISASSOC:
-               return disassociate(usbdev, priv->radio_on);
-       default:
-               return -EOPNOTSUPP;
+       /* Internal bss list in device should contain at least the currently
+        * connected bss and we can get it to cfg80211 with
+        * rndis_check_bssid_list().
+        *
+        * NDIS spec says: "If the device is associated, but the associated
+        *  BSSID is not in its BSSID scan list, then the driver must add an
+        *  entry for the BSSID at the end of the data that it returns in
+        *  response to query of OID_802_11_BSSID_LIST."
+        *
+        * NOTE: Seems to be true for BCM4320b variant, but not BCM4320a.
+        */
+       match_bss = false;
+       rndis_check_bssid_list(usbdev, bssid, &match_bss);
+
+       if (!is_zero_ether_addr(bssid) && !match_bss) {
+               /* Couldn't get bss from device, we need to manually craft bss
+                * for cfg80211.
+                */
+               rndis_wlan_craft_connected_bss(usbdev, bssid, info);
        }
 
-       return 0;
-}
+       if (priv->infra_mode == NDIS_80211_INFRA_INFRA) {
+               if (!roamed)
+                       cfg80211_connect_result(usbdev->net, bssid, req_ie,
+                                               req_ie_len, resp_ie,
+                                               resp_ie_len, 0, GFP_KERNEL);
+               else
+                       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);
+
+       if (info != NULL)
+               kfree(info);
+
+       priv->connected = true;
+       memcpy(priv->bssid, bssid, ETH_ALEN);
 
+       usbnet_resume_rx(usbdev);
+       netif_carrier_on(usbdev->net);
+}
 
-static struct iw_statistics *rndis_get_wireless_stats(struct net_device *dev)
+static void rndis_wlan_do_link_down_work(struct usbnet *usbdev)
 {
-       struct usbnet *usbdev = netdev_priv(dev);
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-       unsigned long flags;
-
-       spin_lock_irqsave(&priv->stats_lock, flags);
-       memcpy(&priv->iwstats, &priv->privstats, sizeof(priv->iwstats));
-       spin_unlock_irqrestore(&priv->stats_lock, flags);
-
-       return &priv->iwstats;
-}
-
-
-#define IW_IOCTL(x) [(x) - SIOCSIWCOMMIT]
-static const iw_handler rndis_iw_handler[] =
-{
-       IW_IOCTL(SIOCSIWCOMMIT)    = rndis_iw_commit,
-       IW_IOCTL(SIOCGIWNAME)      = (iw_handler) cfg80211_wext_giwname,
-       IW_IOCTL(SIOCSIWFREQ)      = rndis_iw_set_freq,
-       IW_IOCTL(SIOCGIWFREQ)      = rndis_iw_get_freq,
-       IW_IOCTL(SIOCSIWMODE)      = (iw_handler) cfg80211_wext_siwmode,
-       IW_IOCTL(SIOCGIWMODE)      = (iw_handler) cfg80211_wext_giwmode,
-       IW_IOCTL(SIOCGIWRANGE)     = (iw_handler) cfg80211_wext_giwrange,
-       IW_IOCTL(SIOCSIWAP)        = rndis_iw_set_bssid,
-       IW_IOCTL(SIOCGIWAP)        = rndis_iw_get_bssid,
-       IW_IOCTL(SIOCSIWSCAN)      = (iw_handler) cfg80211_wext_siwscan,
-       IW_IOCTL(SIOCGIWSCAN)      = (iw_handler) cfg80211_wext_giwscan,
-       IW_IOCTL(SIOCSIWESSID)     = rndis_iw_set_essid,
-       IW_IOCTL(SIOCGIWESSID)     = rndis_iw_get_essid,
-       IW_IOCTL(SIOCGIWRATE)      = rndis_iw_get_rate,
-       IW_IOCTL(SIOCSIWRTS)       = (iw_handler) cfg80211_wext_siwrts,
-       IW_IOCTL(SIOCGIWRTS)       = (iw_handler) cfg80211_wext_giwrts,
-       IW_IOCTL(SIOCSIWFRAG)      = (iw_handler) cfg80211_wext_siwfrag,
-       IW_IOCTL(SIOCGIWFRAG)      = (iw_handler) cfg80211_wext_giwfrag,
-       IW_IOCTL(SIOCSIWTXPOW)     = (iw_handler) cfg80211_wext_siwtxpower,
-       IW_IOCTL(SIOCGIWTXPOW)     = (iw_handler) cfg80211_wext_giwtxpower,
-       IW_IOCTL(SIOCSIWENCODE)    = rndis_iw_set_encode,
-       IW_IOCTL(SIOCSIWENCODEEXT) = rndis_iw_set_encode_ext,
-       IW_IOCTL(SIOCSIWAUTH)      = rndis_iw_set_auth,
-       IW_IOCTL(SIOCGIWAUTH)      = rndis_iw_get_auth,
-       IW_IOCTL(SIOCSIWGENIE)     = rndis_iw_set_genie,
-       IW_IOCTL(SIOCGIWGENIE)     = rndis_iw_get_genie,
-       IW_IOCTL(SIOCSIWMLME)      = rndis_iw_set_mlme,
-};
 
-static const iw_handler rndis_wlan_private_handler[] = {
-};
-
-static const struct iw_priv_args rndis_wlan_private_args[] = {
-};
+       if (priv->connected) {
+               priv->connected = false;
+               memset(priv->bssid, 0, ETH_ALEN);
 
+               deauthenticate(usbdev);
 
-static const struct iw_handler_def rndis_iw_handlers = {
-       .num_standard = ARRAY_SIZE(rndis_iw_handler),
-       .num_private  = ARRAY_SIZE(rndis_wlan_private_handler),
-       .num_private_args = ARRAY_SIZE(rndis_wlan_private_args),
-       .standard = (iw_handler *)rndis_iw_handler,
-       .private  = (iw_handler *)rndis_wlan_private_handler,
-       .private_args = (struct iw_priv_args *)rndis_wlan_private_args,
-       .get_wireless_stats = rndis_get_wireless_stats,
-};
+               cfg80211_disconnected(usbdev->net, 0, NULL, 0, GFP_KERNEL);
+       }
 
+       netif_carrier_off(usbdev->net);
+}
 
 static void rndis_wlan_worker(struct work_struct *work)
 {
        struct rndis_wlan_private *priv =
                container_of(work, struct rndis_wlan_private, work);
        struct usbnet *usbdev = priv->usbdev;
-       union iwreq_data evt;
-       unsigned char bssid[ETH_ALEN];
-       struct ndis_80211_assoc_info *info;
-       int assoc_size = sizeof(*info) + IW_CUSTOM_MAX + 32;
-       int ret, offset;
-
-       if (test_and_clear_bit(WORK_LINK_UP, &priv->work_pending)) {
-               netif_carrier_on(usbdev->net);
-
-               info = kzalloc(assoc_size, GFP_KERNEL);
-               if (!info)
-                       goto get_bssid;
-
-               /* Get association info IEs from device and send them back to
-                * userspace. */
-               ret = get_association_info(usbdev, info, assoc_size);
-               if (!ret) {
-                       evt.data.length = le32_to_cpu(info->req_ie_length);
-                       if (evt.data.length > 0) {
-                               offset = le32_to_cpu(info->offset_req_ies);
-                               wireless_send_event(usbdev->net,
-                                       IWEVASSOCREQIE, &evt,
-                                       (char *)info + offset);
-                       }
-
-                       evt.data.length = le32_to_cpu(info->resp_ie_length);
-                       if (evt.data.length > 0) {
-                               offset = le32_to_cpu(info->offset_resp_ies);
-                               wireless_send_event(usbdev->net,
-                                       IWEVASSOCRESPIE, &evt,
-                                       (char *)info + offset);
-                       }
-               }
-
-               kfree(info);
-
-get_bssid:
-               ret = get_bssid(usbdev, bssid);
-               if (!ret) {
-                       evt.data.flags = 0;
-                       evt.data.length = 0;
-                       memcpy(evt.ap_addr.sa_data, bssid, ETH_ALEN);
-                       wireless_send_event(usbdev->net, SIOCGIWAP, &evt, NULL);
-               }
-       }
 
-       if (test_and_clear_bit(WORK_LINK_DOWN, &priv->work_pending)) {
-               netif_carrier_off(usbdev->net);
+       if (test_and_clear_bit(WORK_LINK_UP, &priv->work_pending))
+               rndis_wlan_do_link_up_work(usbdev);
 
-               evt.data.flags = 0;
-               evt.data.length = 0;
-               memset(evt.ap_addr.sa_data, 0, ETH_ALEN);
-               wireless_send_event(usbdev->net, SIOCGIWAP, &evt, NULL);
-       }
+       if (test_and_clear_bit(WORK_LINK_DOWN, &priv->work_pending))
+               rndis_wlan_do_link_down_work(usbdev);
 
        if (test_and_clear_bit(WORK_SET_MULTICAST_LIST, &priv->work_pending))
                set_multicast_list(usbdev);
@@ -2259,22 +2924,22 @@ static void rndis_wlan_set_multicast_list(struct net_device *dev)
        queue_work(priv->workqueue, &priv->work);
 }
 
-
 static void rndis_wlan_auth_indication(struct usbnet *usbdev,
                                struct ndis_80211_status_indication *indication,
                                int len)
 {
        u8 *buf;
        const char *type;
-       int flags, buflen;
+       int flags, buflen, key_id;
        bool pairwise_error, group_error;
        struct ndis_80211_auth_request *auth_req;
+       enum nl80211_key_type key_type;
 
        /* must have at least one array entry */
        if (len < offsetof(struct ndis_80211_status_indication, u) +
                                sizeof(struct ndis_80211_auth_request)) {
-               devinfo(usbdev, "authentication indication: "
-                               "too short message (%i)", len);
+               netdev_info(usbdev->net, "authentication indication: too short message (%i)\n",
+                           len);
                return;
        }
 
@@ -2301,26 +2966,27 @@ static void rndis_wlan_auth_indication(struct usbnet *usbdev,
                        type = "group_error";
                }
 
-               devinfo(usbdev, "authentication indication: %s (0x%08x)", type,
-                               le32_to_cpu(auth_req->flags));
+               netdev_info(usbdev->net, "authentication indication: %s (0x%08x)\n",
+                           type, le32_to_cpu(auth_req->flags));
 
-               if (pairwise_error || group_error) {
-                       union iwreq_data wrqu;
-                       struct iw_michaelmicfailure micfailure;
+               if (pairwise_error) {
+                       key_type = NL80211_KEYTYPE_PAIRWISE;
+                       key_id = -1;
 
-                       memset(&micfailure, 0, sizeof(micfailure));
-                       if (pairwise_error)
-                               micfailure.flags |= IW_MICFAILURE_PAIRWISE;
-                       if (group_error)
-                               micfailure.flags |= IW_MICFAILURE_GROUP;
+                       cfg80211_michael_mic_failure(usbdev->net,
+                                                       auth_req->bssid,
+                                                       key_type, key_id, NULL,
+                                                       GFP_KERNEL);
+               }
 
-                       memcpy(micfailure.src_addr.sa_data, auth_req->bssid,
-                               ETH_ALEN);
+               if (group_error) {
+                       key_type = NL80211_KEYTYPE_GROUP;
+                       key_id = -1;
 
-                       memset(&wrqu, 0, sizeof(wrqu));
-                       wrqu.data.length = sizeof(micfailure);
-                       wireless_send_event(usbdev->net, IWEVMICHAELMICFAILURE,
-                                               &wrqu, (u8 *)&micfailure);
+                       cfg80211_michael_mic_failure(usbdev->net,
+                                                       auth_req->bssid,
+                                                       key_type, key_id, NULL,
+                                                       GFP_KERNEL);
                }
 
                buflen -= le32_to_cpu(auth_req->length);
@@ -2337,8 +3003,8 @@ static void rndis_wlan_pmkid_cand_list_indication(struct usbnet *usbdev,
 
        if (len < offsetof(struct ndis_80211_status_indication, u) +
                                sizeof(struct ndis_80211_pmkid_cand_list)) {
-               devinfo(usbdev, "pmkid candidate list indication: "
-                               "too short message (%i)", len);
+               netdev_info(usbdev->net, "pmkid candidate list indication: too short message (%i)\n",
+                           len);
                return;
        }
 
@@ -2348,41 +3014,30 @@ static void rndis_wlan_pmkid_cand_list_indication(struct usbnet *usbdev,
                        offsetof(struct ndis_80211_status_indication, u);
 
        if (len < expected_len) {
-               devinfo(usbdev, "pmkid candidate list indication: "
-                               "list larger than buffer (%i < %i)",
-                               len, expected_len);
+               netdev_info(usbdev->net, "pmkid candidate list indication: list larger than buffer (%i < %i)\n",
+                           len, expected_len);
                return;
        }
 
        cand_list = &indication->u.cand_list;
 
-       devinfo(usbdev, "pmkid candidate list indication: "
-                       "version %i, candidates %i",
-                       le32_to_cpu(cand_list->version),
-                       le32_to_cpu(cand_list->num_candidates));
+       netdev_info(usbdev->net, "pmkid candidate list indication: version %i, candidates %i\n",
+                   le32_to_cpu(cand_list->version),
+                   le32_to_cpu(cand_list->num_candidates));
 
        if (le32_to_cpu(cand_list->version) != 1)
                return;
 
        for (i = 0; i < le32_to_cpu(cand_list->num_candidates); i++) {
-               struct iw_pmkid_cand pcand;
-               union iwreq_data wrqu;
                struct ndis_80211_pmkid_candidate *cand =
                                                &cand_list->candidate_list[i];
+               bool preauth = !!(cand->flags & NDIS_80211_PMKID_CAND_PREAUTH);
 
-               devdbg(usbdev, "cand[%i]: flags: 0x%08x, bssid: %pM",
-                               i, le32_to_cpu(cand->flags), 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);
+               netdev_dbg(usbdev->net, "cand[%i]: flags: 0x%08x, preauth: %d, bssid: %pM\n",
+                          i, le32_to_cpu(cand->flags), preauth, cand->bssid);
 
-               memset(&wrqu, 0, sizeof(wrqu));
-               wrqu.data.length = sizeof(pcand);
-               wireless_send_event(usbdev->net, IWEVPMKIDCAND, &wrqu,
-                                                               (u8 *)&pcand);
+               cfg80211_pmksa_candidate_notify(usbdev->net, i, cand->bssid,
+                                               preauth, GFP_ATOMIC);
        }
 }
 
@@ -2390,22 +3045,21 @@ static void rndis_wlan_media_specific_indication(struct usbnet *usbdev,
                        struct rndis_indicate *msg, int buflen)
 {
        struct ndis_80211_status_indication *indication;
-       int len, offset;
+       unsigned int len, offset;
 
        offset = offsetof(struct rndis_indicate, status) +
                        le32_to_cpu(msg->offset);
        len = le32_to_cpu(msg->length);
 
        if (len < 8) {
-               devinfo(usbdev, "media specific indication, "
-                               "ignore too short message (%i < 8)", len);
+               netdev_info(usbdev->net, "media specific indication, ignore too short message (%i < 8)\n",
+                           len);
                return;
        }
 
-       if (offset + len > buflen) {
-               devinfo(usbdev, "media specific indication, "
-                               "too large to fit to buffer (%i > %i)",
-                               offset + len, buflen);
+       if (len > buflen || offset > buflen || offset + len > buflen) {
+               netdev_info(usbdev->net, "media specific indication, too large to fit to buffer (%i > %i)\n",
+                           offset + len, buflen);
                return;
        }
 
@@ -2413,13 +3067,13 @@ static void rndis_wlan_media_specific_indication(struct usbnet *usbdev,
 
        switch (le32_to_cpu(indication->status_type)) {
        case NDIS_80211_STATUSTYPE_RADIOSTATE:
-               devinfo(usbdev, "radio state indication: %i",
-                       le32_to_cpu(indication->u.radio_status));
+               netdev_info(usbdev->net, "radio state indication: %i\n",
+                           le32_to_cpu(indication->u.radio_status));
                return;
 
        case NDIS_80211_STATUSTYPE_MEDIASTREAMMODE:
-               devinfo(usbdev, "media stream mode indication: %i",
-                       le32_to_cpu(indication->u.media_stream_mode));
+               netdev_info(usbdev->net, "media stream mode indication: %i\n",
+                           le32_to_cpu(indication->u.media_stream_mode));
                return;
 
        case NDIS_80211_STATUSTYPE_AUTHENTICATION:
@@ -2431,13 +3085,11 @@ static void rndis_wlan_media_specific_indication(struct usbnet *usbdev,
                return;
 
        default:
-               devinfo(usbdev, "media specific indication: "
-                               "unknown status type 0x%08x",
-                               le32_to_cpu(indication->status_type));
+               netdev_info(usbdev->net, "media specific indication: unknown status type 0x%08x\n",
+                           le32_to_cpu(indication->status_type));
        }
 }
 
-
 static void rndis_wlan_indication(struct usbnet *usbdev, void *ind, int buflen)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
@@ -2445,7 +3097,19 @@ static void rndis_wlan_indication(struct usbnet *usbdev, void *ind, int buflen)
 
        switch (msg->status) {
        case RNDIS_STATUS_MEDIA_CONNECT:
-               devinfo(usbdev, "media connect");
+               if (priv->current_command_oid == OID_802_11_ADD_KEY) {
+                       /* OID_802_11_ADD_KEY causes sometimes extra
+                        * "media connect" indications which confuses driver
+                        * and userspace to think that device is
+                        * roaming/reassociating when it isn't.
+                        */
+                       netdev_dbg(usbdev->net, "ignored OID_802_11_ADD_KEY triggered 'media connect'\n");
+                       return;
+               }
+
+               usbnet_pause_rx(usbdev);
+
+               netdev_info(usbdev->net, "media connect\n");
 
                /* queue work to avoid recursive calls into rndis_command */
                set_bit(WORK_LINK_UP, &priv->work_pending);
@@ -2453,7 +3117,7 @@ static void rndis_wlan_indication(struct usbnet *usbdev, void *ind, int buflen)
                break;
 
        case RNDIS_STATUS_MEDIA_DISCONNECT:
-               devinfo(usbdev, "media disconnect");
+               netdev_info(usbdev->net, "media disconnect\n");
 
                /* queue work to avoid recursive calls into rndis_command */
                set_bit(WORK_LINK_DOWN, &priv->work_pending);
@@ -2465,19 +3129,20 @@ static void rndis_wlan_indication(struct usbnet *usbdev, void *ind, int buflen)
                break;
 
        default:
-               devinfo(usbdev, "indication: 0x%08x",
-                               le32_to_cpu(msg->status));
+               netdev_info(usbdev->net, "indication: 0x%08x\n",
+                           le32_to_cpu(msg->status));
                break;
        }
 }
 
-
-static int rndis_wlan_get_caps(struct usbnet *usbdev)
+static int rndis_wlan_get_caps(struct usbnet *usbdev, struct wiphy *wiphy)
 {
        struct {
                __le32  num_items;
                __le32  items[8];
        } networks_supported;
+       struct ndis_80211_capability *caps;
+       u8 caps_buf[sizeof(*caps) + sizeof(caps->auth_encr_pair) * 16];
        int len, retval, i, n;
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
 
@@ -2505,81 +3170,103 @@ static int rndis_wlan_get_caps(struct usbnet *usbdev)
                }
        }
 
+       /* get device 802.11 capabilities, number of PMKIDs */
+       caps = (struct ndis_80211_capability *)caps_buf;
+       len = sizeof(caps_buf);
+       retval = rndis_query_oid(usbdev, OID_802_11_CAPABILITY, caps, &len);
+       if (retval >= 0) {
+               netdev_dbg(usbdev->net, "OID_802_11_CAPABILITY -> len %d, "
+                               "ver %d, pmkids %d, auth-encr-pairs %d\n",
+                               le32_to_cpu(caps->length),
+                               le32_to_cpu(caps->version),
+                               le32_to_cpu(caps->num_pmkids),
+                               le32_to_cpu(caps->num_auth_encr_pair));
+               wiphy->max_num_pmkids = le32_to_cpu(caps->num_pmkids);
+       } else
+               wiphy->max_num_pmkids = 0;
+
        return retval;
 }
 
+static void rndis_do_cqm(struct usbnet *usbdev, s32 rssi)
+{
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       enum nl80211_cqm_rssi_threshold_event event;
+       int thold, hyst, last_event;
 
-#define STATS_UPDATE_JIFFIES (HZ)
-static void rndis_update_wireless_stats(struct work_struct *work)
+       if (priv->cqm_rssi_thold >= 0 || rssi >= 0)
+               return;
+       if (priv->infra_mode != NDIS_80211_INFRA_INFRA)
+               return;
+
+       last_event = priv->last_cqm_event_rssi;
+       thold = priv->cqm_rssi_thold;
+       hyst = priv->cqm_rssi_hyst;
+
+       if (rssi < thold && (last_event == 0 || rssi < last_event - hyst))
+               event = NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW;
+       else if (rssi > thold && (last_event == 0 || rssi > last_event + hyst))
+               event = NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH;
+       else
+               return;
+
+       priv->last_cqm_event_rssi = rssi;
+       cfg80211_cqm_rssi_notify(usbdev->net, event, GFP_KERNEL);
+}
+
+#define DEVICE_POLLER_JIFFIES (HZ)
+static void rndis_device_poller(struct work_struct *work)
 {
        struct rndis_wlan_private *priv =
-               container_of(work, struct rndis_wlan_private, stats_work.work);
+               container_of(work, struct rndis_wlan_private,
+                                                       dev_poller_work.work);
        struct usbnet *usbdev = priv->usbdev;
-       struct iw_statistics iwstats;
        __le32 rssi, tmp;
        int len, ret, j;
-       unsigned long flags;
-       int update_jiffies = STATS_UPDATE_JIFFIES;
+       int update_jiffies = DEVICE_POLLER_JIFFIES;
        void *buf;
 
-       spin_lock_irqsave(&priv->stats_lock, flags);
-       memcpy(&iwstats, &priv->privstats, sizeof(iwstats));
-       spin_unlock_irqrestore(&priv->stats_lock, flags);
-
-       /* only update stats when connected */
+       /* Only check/do workaround when connected. Calling is_associated()
+        * also polls device with rndis_command() and catches for media link
+        * indications.
+        */
        if (!is_associated(usbdev)) {
-               iwstats.qual.qual = 0;
-               iwstats.qual.level = 0;
-               iwstats.qual.updated = IW_QUAL_QUAL_UPDATED
-                               | IW_QUAL_LEVEL_UPDATED
-                               | IW_QUAL_NOISE_INVALID
-                               | IW_QUAL_QUAL_INVALID
-                               | IW_QUAL_LEVEL_INVALID;
+               /* Workaround bad scanning in BCM4320a devices with active
+                * background scanning when not associated.
+                */
+               if (priv->device_type == RNDIS_BCM4320A && priv->radio_on &&
+                   !priv->scan_request) {
+                       /* Get previous scan results */
+                       rndis_check_bssid_list(usbdev, NULL, NULL);
+
+                       /* Initiate new scan */
+                       rndis_start_bssid_list_scan(usbdev);
+               }
+
                goto end;
        }
 
        len = sizeof(rssi);
        ret = rndis_query_oid(usbdev, OID_802_11_RSSI, &rssi, &len);
-
-       devdbg(usbdev, "stats: OID_802_11_RSSI -> %d, rssi:%d", ret,
-                                                       le32_to_cpu(rssi));
        if (ret == 0) {
-               memset(&iwstats.qual, 0, sizeof(iwstats.qual));
-               iwstats.qual.qual  = level_to_qual(le32_to_cpu(rssi));
-               iwstats.qual.level = level_to_qual(le32_to_cpu(rssi));
-               iwstats.qual.updated = IW_QUAL_QUAL_UPDATED
-                               | IW_QUAL_LEVEL_UPDATED
-                               | IW_QUAL_NOISE_INVALID;
+               priv->last_qual = level_to_qual(le32_to_cpu(rssi));
+               rndis_do_cqm(usbdev, le32_to_cpu(rssi));
        }
 
-       memset(&iwstats.discard, 0, sizeof(iwstats.discard));
-
-       len = sizeof(tmp);
-       ret = rndis_query_oid(usbdev, OID_GEN_XMIT_ERROR, &tmp, &len);
-       if (ret == 0)
-               iwstats.discard.misc += le32_to_cpu(tmp);
-
-       len = sizeof(tmp);
-       ret = rndis_query_oid(usbdev, OID_GEN_RCV_ERROR, &tmp, &len);
-       if (ret == 0)
-               iwstats.discard.misc += le32_to_cpu(tmp);
-
-       len = sizeof(tmp);
-       ret = rndis_query_oid(usbdev, OID_GEN_RCV_NO_BUFFER, &tmp, &len);
-       if (ret == 0)
-               iwstats.discard.misc += le32_to_cpu(tmp);
+       netdev_dbg(usbdev->net, "dev-poller: OID_802_11_RSSI -> %d, rssi:%d, qual: %d\n",
+                  ret, le32_to_cpu(rssi), level_to_qual(le32_to_cpu(rssi)));
 
        /* Workaround transfer stalls on poor quality links.
         * TODO: find right way to fix these stalls (as stalls do not happen
         * with ndiswrapper/windows driver). */
-       if (iwstats.qual.qual <= 25) {
+       if (priv->param_workaround_interval > 0 && priv->last_qual <= 25) {
                /* Decrease stats worker interval to catch stalls.
                 * faster. Faster than 400-500ms causes packet loss,
                 * Slower doesn't catch stalls fast enough.
                 */
                j = msecs_to_jiffies(priv->param_workaround_interval);
-               if (j > STATS_UPDATE_JIFFIES)
-                       j = STATS_UPDATE_JIFFIES;
+               if (j > DEVICE_POLLER_JIFFIES)
+                       j = DEVICE_POLLER_JIFFIES;
                else if (j <= 0)
                        j = 1;
                update_jiffies = j;
@@ -2599,11 +3286,8 @@ static void rndis_update_wireless_stats(struct work_struct *work)
                rndis_query_oid(usbdev, OID_802_11_BSSID_LIST, buf, &len);
                kfree(buf);
        }
-end:
-       spin_lock_irqsave(&priv->stats_lock, flags);
-       memcpy(&priv->privstats, &iwstats, sizeof(iwstats));
-       spin_unlock_irqrestore(&priv->stats_lock, flags);
 
+end:
        if (update_jiffies >= HZ)
                update_jiffies = round_jiffies_relative(update_jiffies);
        else {
@@ -2612,28 +3296,18 @@ end:
                        update_jiffies = j;
        }
 
-       queue_delayed_work(priv->workqueue, &priv->stats_work, update_jiffies);
-}
-
-
-static int bcm4320a_early_init(struct usbnet *usbdev)
-{
-       /* bcm4320a doesn't handle configuration parameters well. Try
-        * set any and you get partially zeroed mac and broken device.
-        */
-
-       return 0;
+       queue_delayed_work(priv->workqueue, &priv->dev_poller_work,
+                                                               update_jiffies);
 }
 
-
-static int bcm4320b_early_init(struct usbnet *usbdev)
+/*
+ * driver/device initialization
+ */
+static void rndis_copy_module_params(struct usbnet *usbdev, int device_type)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
-       char buf[8];
 
-       /* Early initialization settings, setting these won't have effect
-        * if called after generic_rndis_bind().
-        */
+       priv->device_type = device_type;
 
        priv->param_country[0] = modparam_country[0];
        priv->param_country[1] = modparam_country[1];
@@ -2675,6 +3349,45 @@ static int bcm4320b_early_init(struct usbnet *usbdev)
                priv->param_workaround_interval = 500;
        else
                priv->param_workaround_interval = modparam_workaround_interval;
+}
+
+static int unknown_early_init(struct usbnet *usbdev)
+{
+       /* copy module parameters for unknown so that iwconfig reports txpower
+        * and workaround parameter is copied to private structure correctly.
+        */
+       rndis_copy_module_params(usbdev, RNDIS_UNKNOWN);
+
+       /* This is unknown device, so do not try set configuration parameters.
+        */
+
+       return 0;
+}
+
+static int bcm4320a_early_init(struct usbnet *usbdev)
+{
+       /* copy module parameters for bcm4320a so that iwconfig reports txpower
+        * and workaround parameter is copied to private structure correctly.
+        */
+       rndis_copy_module_params(usbdev, RNDIS_BCM4320A);
+
+       /* bcm4320a doesn't handle configuration parameters well. Try
+        * set any and you get partially zeroed mac and broken device.
+        */
+
+       return 0;
+}
+
+static int bcm4320b_early_init(struct usbnet *usbdev)
+{
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       char buf[8];
+
+       rndis_copy_module_params(usbdev, RNDIS_BCM4320B);
+
+       /* Early initialization settings, setting these won't have effect
+        * if called after generic_rndis_bind().
+        */
 
        rndis_set_config_parameter_str(usbdev, "Country", priv->param_country);
        rndis_set_config_parameter_str(usbdev, "FrameBursting",
@@ -2701,10 +3414,9 @@ static const struct net_device_ops rndis_wlan_netdev_ops = {
        .ndo_tx_timeout         = usbnet_tx_timeout,
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
-       .ndo_set_multicast_list = rndis_wlan_set_multicast_list,
+       .ndo_set_rx_mode        = rndis_wlan_set_multicast_list,
 };
 
-
 static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
 {
        struct wiphy *wiphy;
@@ -2729,16 +3441,14 @@ static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
         * Otherwise we'll be in big trouble in rndis_wlan_early_init().
         */
        usbdev->driver_priv = priv;
-       usbdev->net->wireless_handlers = &rndis_iw_handlers;
        priv->usbdev = usbdev;
 
        mutex_init(&priv->command_lock);
-       spin_lock_init(&priv->stats_lock);
 
        /* because rndis_command() sleeps we need to use workqueue */
        priv->workqueue = create_singlethread_workqueue("rndis_wlan");
        INIT_WORK(&priv->work, rndis_wlan_worker);
-       INIT_DELAYED_WORK(&priv->stats_work, rndis_update_wireless_stats);
+       INIT_DELAYED_WORK(&priv->dev_poller_work, rndis_device_poller);
        INIT_DELAYED_WORK(&priv->scan_work, rndis_get_scan_results);
 
        /* try bind rndis_host */
@@ -2770,14 +3480,6 @@ static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
        else
                usbdev->net->flags &= ~IFF_MULTICAST;
 
-       priv->iwstats.qual.qual = 0;
-       priv->iwstats.qual.level = 0;
-       priv->iwstats.qual.updated = IW_QUAL_QUAL_UPDATED
-                                       | IW_QUAL_LEVEL_UPDATED
-                                       | IW_QUAL_NOISE_INVALID
-                                       | IW_QUAL_QUAL_INVALID
-                                       | IW_QUAL_LEVEL_INVALID;
-
        /* fill-out wiphy structure and register w/ cfg80211 */
        memcpy(wiphy->perm_addr, usbdev->net->dev_addr, ETH_ALEN);
        wiphy->privid = rndis_wiphy_privid;
@@ -2785,8 +3487,8 @@ static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
                                        | BIT(NL80211_IFTYPE_ADHOC);
        wiphy->max_scan_ssids = 1;
 
-       /* TODO: fill-out band information based on priv->caps */
-       rndis_wlan_get_caps(usbdev);
+       /* TODO: fill-out band/encr information based on priv->caps */
+       rndis_wlan_get_caps(usbdev, wiphy);
 
        memcpy(priv->channels, rndis_channels, sizeof(rndis_channels));
        memcpy(priv->rates, rndis_rates, sizeof(rndis_rates));
@@ -2797,6 +3499,11 @@ static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
        wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band;
        wiphy->signal_type = CFG80211_SIGNAL_TYPE_UNSPEC;
 
+       memcpy(priv->cipher_suites, rndis_cipher_suites,
+                                               sizeof(rndis_cipher_suites));
+       wiphy->cipher_suites = priv->cipher_suites;
+       wiphy->n_cipher_suites = ARRAY_SIZE(rndis_cipher_suites);
+
        set_wiphy_dev(wiphy, &usbdev->udev->dev);
 
        if (wiphy_register(wiphy)) {
@@ -2806,19 +3513,21 @@ static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
 
        set_default_iw_params(usbdev);
 
+       priv->power_mode = -1;
+
        /* set default rts/frag */
        rndis_set_wiphy_params(wiphy,
                        WIPHY_PARAM_FRAG_THRESHOLD | WIPHY_PARAM_RTS_THRESHOLD);
 
-       /* turn radio on */
-       priv->radio_on = 1;
-       disassociate(usbdev, 1);
+       /* turn radio off on init */
+       priv->radio_on = false;
+       disassociate(usbdev, false);
        netif_carrier_off(usbdev->net);
 
        return 0;
 
 fail:
-       cancel_delayed_work_sync(&priv->stats_work);
+       cancel_delayed_work_sync(&priv->dev_poller_work);
        cancel_delayed_work_sync(&priv->scan_work);
        cancel_work_sync(&priv->work);
        flush_workqueue(priv->workqueue);
@@ -2828,64 +3537,58 @@ fail:
        return retval;
 }
 
-
 static void rndis_wlan_unbind(struct usbnet *usbdev, struct usb_interface *intf)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
 
        /* turn radio off */
-       disassociate(usbdev, 0);
+       disassociate(usbdev, false);
 
-       cancel_delayed_work_sync(&priv->stats_work);
+       cancel_delayed_work_sync(&priv->dev_poller_work);
        cancel_delayed_work_sync(&priv->scan_work);
        cancel_work_sync(&priv->work);
        flush_workqueue(priv->workqueue);
        destroy_workqueue(priv->workqueue);
 
-       if (priv && priv->wpa_ie_len)
-               kfree(priv->wpa_ie);
-
        rndis_unbind(usbdev, intf);
 
        wiphy_unregister(priv->wdev.wiphy);
        wiphy_free(priv->wdev.wiphy);
 }
 
-
 static int rndis_wlan_reset(struct usbnet *usbdev)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        int retval;
 
-       devdbg(usbdev, "rndis_wlan_reset");
+       netdev_dbg(usbdev->net, "%s()\n", __func__);
 
        retval = rndis_reset(usbdev);
        if (retval)
-               devwarn(usbdev, "rndis_reset() failed: %d", retval);
+               netdev_warn(usbdev->net, "rndis_reset failed: %d\n", retval);
 
        /* rndis_reset cleared multicast list, so restore here.
           (set_multicast_list() also turns on current packet filter) */
        set_multicast_list(usbdev);
 
-       queue_delayed_work(priv->workqueue, &priv->stats_work,
-               round_jiffies_relative(STATS_UPDATE_JIFFIES));
+       queue_delayed_work(priv->workqueue, &priv->dev_poller_work,
+               round_jiffies_relative(DEVICE_POLLER_JIFFIES));
 
        return deauthenticate(usbdev);
 }
 
-
 static int rndis_wlan_stop(struct usbnet *usbdev)
 {
        struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        int retval;
        __le32 filter;
 
-       devdbg(usbdev, "rndis_wlan_stop");
+       netdev_dbg(usbdev->net, "%s()\n", __func__);
 
-       retval = disassociate(usbdev, 0);
+       retval = disassociate(usbdev, false);
 
        priv->work_pending = 0;
-       cancel_delayed_work_sync(&priv->stats_work);
+       cancel_delayed_work_sync(&priv->dev_poller_work);
        cancel_delayed_work_sync(&priv->scan_work);
        cancel_work_sync(&priv->work);
        flush_workqueue(priv->workqueue);
@@ -2904,7 +3607,6 @@ static int rndis_wlan_stop(struct usbnet *usbdev)
        return retval;
 }
 
-
 static const struct driver_info        bcm4320b_info = {
        .description =  "Wireless RNDIS device, BCM4320b based",
        .flags =        FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT |
@@ -2946,7 +3648,7 @@ static const struct driver_info rndis_wlan_info = {
        .tx_fixup =     rndis_tx_fixup,
        .reset =        rndis_wlan_reset,
        .stop =         rndis_wlan_stop,
-       .early_init =   bcm4320a_early_init,
+       .early_init =   unknown_early_init,
        .indication =   rndis_wlan_indication,
 };
 
@@ -3076,17 +3778,7 @@ static struct usb_driver rndis_wlan_driver = {
        .resume =       usbnet_resume,
 };
 
-static int __init rndis_wlan_init(void)
-{
-       return usb_register(&rndis_wlan_driver);
-}
-module_init(rndis_wlan_init);
-
-static void __exit rndis_wlan_exit(void)
-{
-       usb_deregister(&rndis_wlan_driver);
-}
-module_exit(rndis_wlan_exit);
+module_usb_driver(rndis_wlan_driver);
 
 MODULE_AUTHOR("Bjorge Dijkstra");
 MODULE_AUTHOR("Jussi Kivilinna");