cfg80211/mac80211: allow per-station GTKs
[linux-2.6.git] / drivers / net / wireless / rndis_wlan.c
index 2b41489..71b5971 100644 (file)
@@ -2,7 +2,7 @@
  * Driver for RNDIS based wireless USB devices.
  *
  * Copyright (C) 2007 by Bjorge Dijkstra <bjd@jooz.net>
- * Copyright (C) 2008 by Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
+ * Copyright (C) 2008-2009 by Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #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 <linux/slab.h>
 #include <net/iw_handler.h>
-#include <net/ieee80211.h>
+#include <net/cfg80211.h>
 #include <linux/usb/usbnet.h>
 #include <linux/usb/rndis_host.h>
 
@@ -82,52 +84,52 @@ 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 */
-#define OID_GEN_LINK_SPEED                     ccpu2(0x00010107)
-#define OID_GEN_RNDIS_CONFIG_PARAMETER         ccpu2(0x0001021b)
-
-#define OID_GEN_XMIT_OK                                ccpu2(0x00020101)
-#define OID_GEN_RCV_OK                         ccpu2(0x00020102)
-#define OID_GEN_XMIT_ERROR                     ccpu2(0x00020103)
-#define OID_GEN_RCV_ERROR                      ccpu2(0x00020104)
-#define OID_GEN_RCV_NO_BUFFER                  ccpu2(0x00020105)
-
-#define OID_802_3_PERMANENT_ADDRESS            ccpu2(0x01010101)
-#define OID_802_3_CURRENT_ADDRESS              ccpu2(0x01010102)
-#define OID_802_3_MULTICAST_LIST               ccpu2(0x01010103)
-#define OID_802_3_MAXIMUM_LIST_SIZE            ccpu2(0x01010104)
-
-#define OID_802_11_BSSID                       ccpu2(0x0d010101)
-#define OID_802_11_SSID                                ccpu2(0x0d010102)
-#define OID_802_11_INFRASTRUCTURE_MODE         ccpu2(0x0d010108)
-#define OID_802_11_ADD_WEP                     ccpu2(0x0d010113)
-#define OID_802_11_REMOVE_WEP                  ccpu2(0x0d010114)
-#define OID_802_11_DISASSOCIATE                        ccpu2(0x0d010115)
-#define OID_802_11_AUTHENTICATION_MODE         ccpu2(0x0d010118)
-#define OID_802_11_PRIVACY_FILTER              ccpu2(0x0d010119)
-#define OID_802_11_BSSID_LIST_SCAN             ccpu2(0x0d01011a)
-#define OID_802_11_ENCRYPTION_STATUS           ccpu2(0x0d01011b)
-#define OID_802_11_ADD_KEY                     ccpu2(0x0d01011d)
-#define OID_802_11_REMOVE_KEY                  ccpu2(0x0d01011e)
-#define OID_802_11_ASSOCIATION_INFORMATION     ccpu2(0x0d01011f)
-#define OID_802_11_PMKID                       ccpu2(0x0d010123)
-#define OID_802_11_NETWORK_TYPES_SUPPORTED     ccpu2(0x0d010203)
-#define OID_802_11_NETWORK_TYPE_IN_USE         ccpu2(0x0d010204)
-#define OID_802_11_TX_POWER_LEVEL              ccpu2(0x0d010205)
-#define OID_802_11_RSSI                                ccpu2(0x0d010206)
-#define OID_802_11_RSSI_TRIGGER                        ccpu2(0x0d010207)
-#define OID_802_11_FRAGMENTATION_THRESHOLD     ccpu2(0x0d010209)
-#define OID_802_11_RTS_THRESHOLD               ccpu2(0x0d01020a)
-#define OID_802_11_SUPPORTED_RATES             ccpu2(0x0d01020e)
-#define OID_802_11_CONFIGURATION               ccpu2(0x0d010211)
-#define OID_802_11_BSSID_LIST                  ccpu2(0x0d010217)
+#define OID_GEN_LINK_SPEED                     cpu_to_le32(0x00010107)
+#define OID_GEN_RNDIS_CONFIG_PARAMETER         cpu_to_le32(0x0001021b)
+
+#define OID_GEN_XMIT_OK                                cpu_to_le32(0x00020101)
+#define OID_GEN_RCV_OK                         cpu_to_le32(0x00020102)
+#define OID_GEN_XMIT_ERROR                     cpu_to_le32(0x00020103)
+#define OID_GEN_RCV_ERROR                      cpu_to_le32(0x00020104)
+#define OID_GEN_RCV_NO_BUFFER                  cpu_to_le32(0x00020105)
+
+#define OID_802_3_CURRENT_ADDRESS              cpu_to_le32(0x01010102)
+#define OID_802_3_MULTICAST_LIST               cpu_to_le32(0x01010103)
+#define OID_802_3_MAXIMUM_LIST_SIZE            cpu_to_le32(0x01010104)
+
+#define OID_802_11_BSSID                       cpu_to_le32(0x0d010101)
+#define OID_802_11_SSID                                cpu_to_le32(0x0d010102)
+#define OID_802_11_INFRASTRUCTURE_MODE         cpu_to_le32(0x0d010108)
+#define OID_802_11_ADD_WEP                     cpu_to_le32(0x0d010113)
+#define OID_802_11_REMOVE_WEP                  cpu_to_le32(0x0d010114)
+#define OID_802_11_DISASSOCIATE                        cpu_to_le32(0x0d010115)
+#define OID_802_11_AUTHENTICATION_MODE         cpu_to_le32(0x0d010118)
+#define OID_802_11_PRIVACY_FILTER              cpu_to_le32(0x0d010119)
+#define OID_802_11_BSSID_LIST_SCAN             cpu_to_le32(0x0d01011a)
+#define OID_802_11_ENCRYPTION_STATUS           cpu_to_le32(0x0d01011b)
+#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)
+#define OID_802_11_TX_POWER_LEVEL              cpu_to_le32(0x0d010205)
+#define OID_802_11_RSSI                                cpu_to_le32(0x0d010206)
+#define OID_802_11_RSSI_TRIGGER                        cpu_to_le32(0x0d010207)
+#define OID_802_11_FRAGMENTATION_THRESHOLD     cpu_to_le32(0x0d010209)
+#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_BSSID_LIST                  cpu_to_le32(0x0d010217)
 
 
 /* Typical noise/maximum signal level values taken from ndiswrapper iw_ndis.h */
@@ -138,14 +140,20 @@ MODULE_PARM_DESC(workaround_interval,
 /* Assume that Broadcom 4320 (only chipset at time of writing known to be
  * based on wireless rndis) has default txpower of 13dBm.
  * This value is from Linksys WUSB54GSC User Guide, Appendix F: Specifications.
- *   13dBm == 19.9mW
+ *  100% : 20 mW ~ 13dBm
+ *   75% : 15 mW ~ 12dBm
+ *   50% : 10 mW ~ 10dBm
+ *   25% :  5 mW ~  7dBm
  */
-#define BCM4320_DEFAULT_TXPOWER 20
+#define BCM4320_DEFAULT_TXPOWER_DBM_100 13
+#define BCM4320_DEFAULT_TXPOWER_DBM_75  12
+#define BCM4320_DEFAULT_TXPOWER_DBM_50  10
+#define BCM4320_DEFAULT_TXPOWER_DBM_25  7
 
 
 /* codes for "status" field of completion messages */
-#define RNDIS_STATUS_ADAPTER_NOT_READY         ccpu2(0xc0010011)
-#define RNDIS_STATUS_ADAPTER_NOT_OPEN          ccpu2(0xc0010012)
+#define RNDIS_STATUS_ADAPTER_NOT_READY         cpu_to_le32(0xc0010011)
+#define RNDIS_STATUS_ADAPTER_NOT_OPEN          cpu_to_le32(0xc0010012)
 
 
 /* NDIS data structures. Taken from wpa_supplicant driver_ndis.c
@@ -156,56 +164,115 @@ MODULE_PARM_DESC(workaround_interval,
 #define NDIS_802_11_LENGTH_RATES_EX 16
 
 enum ndis_80211_net_type {
-       ndis_80211_type_freq_hop,
-       ndis_80211_type_direct_seq,
-       ndis_80211_type_ofdm_a,
-       ndis_80211_type_ofdm_g
+       NDIS_80211_TYPE_FREQ_HOP,
+       NDIS_80211_TYPE_DIRECT_SEQ,
+       NDIS_80211_TYPE_OFDM_A,
+       NDIS_80211_TYPE_OFDM_G
 };
 
 enum ndis_80211_net_infra {
-       ndis_80211_infra_adhoc,
-       ndis_80211_infra_infra,
-       ndis_80211_infra_auto_unknown
+       NDIS_80211_INFRA_ADHOC,
+       NDIS_80211_INFRA_INFRA,
+       NDIS_80211_INFRA_AUTO_UNKNOWN
 };
 
 enum ndis_80211_auth_mode {
-       ndis_80211_auth_open,
-       ndis_80211_auth_shared,
-       ndis_80211_auth_auto_switch,
-       ndis_80211_auth_wpa,
-       ndis_80211_auth_wpa_psk,
-       ndis_80211_auth_wpa_none,
-       ndis_80211_auth_wpa2,
-       ndis_80211_auth_wpa2_psk
+       NDIS_80211_AUTH_OPEN,
+       NDIS_80211_AUTH_SHARED,
+       NDIS_80211_AUTH_AUTO_SWITCH,
+       NDIS_80211_AUTH_WPA,
+       NDIS_80211_AUTH_WPA_PSK,
+       NDIS_80211_AUTH_WPA_NONE,
+       NDIS_80211_AUTH_WPA2,
+       NDIS_80211_AUTH_WPA2_PSK
 };
 
 enum ndis_80211_encr_status {
-       ndis_80211_encr_wep_enabled,
-       ndis_80211_encr_disabled,
-       ndis_80211_encr_wep_key_absent,
-       ndis_80211_encr_not_supported,
-       ndis_80211_encr_tkip_enabled,
-       ndis_80211_encr_tkip_key_absent,
-       ndis_80211_encr_ccmp_enabled,
-       ndis_80211_encr_ccmp_key_absent
+       NDIS_80211_ENCR_WEP_ENABLED,
+       NDIS_80211_ENCR_DISABLED,
+       NDIS_80211_ENCR_WEP_KEY_ABSENT,
+       NDIS_80211_ENCR_NOT_SUPPORTED,
+       NDIS_80211_ENCR_TKIP_ENABLED,
+       NDIS_80211_ENCR_TKIP_KEY_ABSENT,
+       NDIS_80211_ENCR_CCMP_ENABLED,
+       NDIS_80211_ENCR_CCMP_KEY_ABSENT
 };
 
 enum ndis_80211_priv_filter {
-       ndis_80211_priv_accept_all,
-       ndis_80211_priv_8021x_wep
+       NDIS_80211_PRIV_ACCEPT_ALL,
+       NDIS_80211_PRIV_8021X_WEP
 };
 
+enum ndis_80211_status_type {
+       NDIS_80211_STATUSTYPE_AUTHENTICATION,
+       NDIS_80211_STATUSTYPE_MEDIASTREAMMODE,
+       NDIS_80211_STATUSTYPE_PMKID_CANDIDATELIST,
+       NDIS_80211_STATUSTYPE_RADIOSTATE,
+};
+
+enum ndis_80211_media_stream_mode {
+       NDIS_80211_MEDIA_STREAM_OFF,
+       NDIS_80211_MEDIA_STREAM_ON
+};
+
+enum ndis_80211_radio_status {
+       NDIS_80211_RADIO_STATUS_ON,
+       NDIS_80211_RADIO_STATUS_HARDWARE_OFF,
+       NDIS_80211_RADIO_STATUS_SOFTWARE_OFF,
+};
+
+enum ndis_80211_addkey_bits {
+       NDIS_80211_ADDKEY_8021X_AUTH = cpu_to_le32(1 << 28),
+       NDIS_80211_ADDKEY_SET_INIT_RECV_SEQ = cpu_to_le32(1 << 29),
+       NDIS_80211_ADDKEY_PAIRWISE_KEY = cpu_to_le32(1 << 30),
+       NDIS_80211_ADDKEY_TRANSMIT_KEY = cpu_to_le32(1 << 31)
+};
+
+enum ndis_80211_addwep_bits {
+       NDIS_80211_ADDWEP_PERCLIENT_KEY = cpu_to_le32(1 << 30),
+       NDIS_80211_ADDWEP_TRANSMIT_KEY = cpu_to_le32(1 << 31)
+};
+
+struct ndis_80211_auth_request {
+       __le32 length;
+       u8 bssid[6];
+       u8 padding[2];
+       __le32 flags;
+} __packed;
+
+struct ndis_80211_pmkid_candidate {
+       u8 bssid[6];
+       u8 padding[2];
+       __le32 flags;
+} __packed;
+
+struct ndis_80211_pmkid_cand_list {
+       __le32 version;
+       __le32 num_candidates;
+       struct ndis_80211_pmkid_candidate candidate_list[0];
+} __packed;
+
+struct ndis_80211_status_indication {
+       __le32 status_type;
+       union {
+               __le32                                  media_stream_mode;
+               __le32                                  radio_status;
+               struct ndis_80211_auth_request          auth_request[0];
+               struct ndis_80211_pmkid_cand_list       cand_list;
+       } u;
+} __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;
@@ -213,7 +280,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;
@@ -228,25 +295,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;
@@ -256,13 +323,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];
-} __attribute__((packed));
+       u8 padding[2];
+} __packed;
 
 struct ndis_config_param {
        __le32 name_offs;
@@ -270,7 +338,7 @@ struct ndis_config_param {
        __le32 type;
        __le32 value_offs;
        __le32 value_length;
-} __attribute__((packed));
+} __packed;
 
 struct ndis_80211_assoc_info {
        __le32 length;
@@ -290,14 +358,31 @@ 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;
+
+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];
+};
 
-/* 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_pmkid {
+       __le32 length;
+       __le32 bssid_info_count;
+       struct ndis_80211_bssid_info bssid_info[0];
+};
 
 /*
  *  private data
@@ -308,32 +393,90 @@ enum wpa_key_mgmt { KEY_MGMT_802_1X, KEY_MGMT_PSK, KEY_MGMT_NONE,
 #define CAP_MODE_80211B                2
 #define CAP_MODE_80211G                4
 #define CAP_MODE_MASK          7
-#define CAP_SUPPORT_TXPOWER    8
 
 #define WORK_LINK_UP           (1<<0)
 #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_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))
 
-/* RNDIS device private data */
-struct rndis_wext_private {
-       char name[32];
+static const struct ieee80211_channel rndis_channels[] = {
+       { .center_freq = 2412 },
+       { .center_freq = 2417 },
+       { .center_freq = 2422 },
+       { .center_freq = 2427 },
+       { .center_freq = 2432 },
+       { .center_freq = 2437 },
+       { .center_freq = 2442 },
+       { .center_freq = 2447 },
+       { .center_freq = 2452 },
+       { .center_freq = 2457 },
+       { .center_freq = 2462 },
+       { .center_freq = 2467 },
+       { .center_freq = 2472 },
+       { .center_freq = 2484 },
+};
+
+static const struct ieee80211_rate rndis_rates[] = {
+       { .bitrate = 10 },
+       { .bitrate = 20, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+       { .bitrate = 55, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+       { .bitrate = 110, .flags = IEEE80211_RATE_SHORT_PREAMBLE },
+       { .bitrate = 60 },
+       { .bitrate = 90 },
+       { .bitrate = 120 },
+       { .bitrate = 180 },
+       { .bitrate = 240 },
+       { .bitrate = 360 },
+       { .bitrate = 480 },
+       { .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;
 
+       struct wireless_dev wdev;
+
+       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;
 
-       struct iw_statistics iwstats;
-       struct iw_statistics privstats;
-
-       int  nick_len;
-       char nick[32];
+       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)];
 
        int caps;
        int multicast_size;
@@ -349,50 +492,216 @@ struct rndis_wext_private {
        u32  param_workaround_interval;
 
        /* hardware state */
-       int radio_on;
+       bool radio_on;
        int infra_mode;
+       bool connected;
+       u8 bssid[ETH_ALEN];
        struct ndis_80211_ssid essid;
+       __le32 current_command_oid;
 
        /* encryption stuff */
        int  encr_tx_key_index;
-       char encr_keys[4][32];
-       int  encr_key_len[4];
+       struct rndis_wlan_encr_key encr_keys[4];
        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];
 };
 
+/*
+ * cfg80211 ops
+ */
+static int rndis_change_virtual_intf(struct wiphy *wiphy,
+                                       struct net_device *dev,
+                                       enum nl80211_iftype type, u32 *flags,
+                                       struct vif_params *params);
+
+static int rndis_scan(struct wiphy *wiphy, struct net_device *dev,
+                       struct cfg80211_scan_request *request);
+
+static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed);
+
+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 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);
+
+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 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,
+};
 
-static const int freq_chan[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
-                               2447, 2452, 2457, 2462, 2467, 2472, 2484 };
-
-static const int rates_80211g[8] = { 6, 9, 12, 18, 24, 36, 48, 54 };
+static void *rndis_wiphy_privid = &rndis_wiphy_privid;
 
-static const int bcm4320_power_output[4] = { 25, 50, 75, 100 };
 
-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) {
+       default:
+       case 3:
+               return BCM4320_DEFAULT_TXPOWER_DBM_100;
+       case 2:
+               return BCM4320_DEFAULT_TXPOWER_DBM_75;
+       case 1:
+               return BCM4320_DEFAULT_TXPOWER_DBM_50;
+       case 0:
+               return BCM4320_DEFAULT_TXPOWER_DBM_25;
+       }
+}
 
-static struct rndis_wext_private *get_rndis_wext_priv(struct usbnet *dev)
+static bool is_wpa_key(struct rndis_wlan_private *priv, int idx)
 {
-       return (struct rndis_wext_private *)dev->driver_priv;
+       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 u32 get_bcm4320_power(struct rndis_wext_private *priv)
+static int rndis_akm_suite_to_key_mgmt(u32 akm_suite)
 {
-       return BCM4320_DEFAULT_TXPOWER *
-               bcm4320_power_output[priv->param_power_output] / 100;
+       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)
+{
+       switch (oid) {
+#define OID_STR(oid) case oid: return(#oid)
+               /* from rndis_host.h */
+               OID_STR(OID_802_3_PERMANENT_ADDRESS);
+               OID_STR(OID_GEN_MAXIMUM_FRAME_SIZE);
+               OID_STR(OID_GEN_CURRENT_PACKET_FILTER);
+               OID_STR(OID_GEN_PHYSICAL_MEDIUM);
+
+               /* from rndis_wlan.c */
+               OID_STR(OID_GEN_LINK_SPEED);
+               OID_STR(OID_GEN_RNDIS_CONFIG_PARAMETER);
+
+               OID_STR(OID_GEN_XMIT_OK);
+               OID_STR(OID_GEN_RCV_OK);
+               OID_STR(OID_GEN_XMIT_ERROR);
+               OID_STR(OID_GEN_RCV_ERROR);
+               OID_STR(OID_GEN_RCV_NO_BUFFER);
+
+               OID_STR(OID_802_3_CURRENT_ADDRESS);
+               OID_STR(OID_802_3_MULTICAST_LIST);
+               OID_STR(OID_802_3_MAXIMUM_LIST_SIZE);
+
+               OID_STR(OID_802_11_BSSID);
+               OID_STR(OID_802_11_SSID);
+               OID_STR(OID_802_11_INFRASTRUCTURE_MODE);
+               OID_STR(OID_802_11_ADD_WEP);
+               OID_STR(OID_802_11_REMOVE_WEP);
+               OID_STR(OID_802_11_DISASSOCIATE);
+               OID_STR(OID_802_11_AUTHENTICATION_MODE);
+               OID_STR(OID_802_11_PRIVACY_FILTER);
+               OID_STR(OID_802_11_BSSID_LIST_SCAN);
+               OID_STR(OID_802_11_ENCRYPTION_STATUS);
+               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_PMKID);
+               OID_STR(OID_802_11_NETWORK_TYPES_SUPPORTED);
+               OID_STR(OID_802_11_NETWORK_TYPE_IN_USE);
+               OID_STR(OID_802_11_TX_POWER_LEVEL);
+               OID_STR(OID_802_11_RSSI);
+               OID_STR(OID_802_11_RSSI_TRIGGER);
+               OID_STR(OID_802_11_FRAGMENTATION_THRESHOLD);
+               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_BSSID_LIST);
+#undef OID_STR
+       }
+
+       return "?";
+}
+#else
+static const char *oid_to_string(__le32 oid)
+{
+       return "?";
+}
+#endif
 
 /* translate error code */
 static int rndis_error_status(__le32 rndis_status)
@@ -417,10 +726,9 @@ 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_wext_private *priv = get_rndis_wext_priv(dev);
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(dev);
        union {
                void                    *buf;
                struct rndis_msg_hdr    *header;
@@ -428,6 +736,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)
@@ -445,17 +754,55 @@ static int rndis_query_oid(struct usbnet *dev, __le32 oid, void *data, int *len)
 
        memset(u.get, 0, sizeof *u.get);
        u.get->msg_type = RNDIS_MSG_QUERY;
-       u.get->msg_len = ccpu2(sizeof *u.get);
+       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)
+               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);
+               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)
+                       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)
@@ -463,10 +810,9 @@ 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)
 {
-       struct rndis_wext_private *priv = get_rndis_wext_priv(dev);
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(dev);
        union {
                void                    *buf;
                struct rndis_msg_hdr    *header;
@@ -494,14 +840,27 @@ static int rndis_set_oid(struct usbnet *dev, __le32 oid, void *data, int len)
        u.set->msg_len = cpu_to_le32(sizeof(*u.set) + len);
        u.set->oid = oid;
        u.set->len = cpu_to_le32(len);
-       u.set->offset = ccpu2(sizeof(*u.set) - 8);
-       u.set->handle = ccpu2(0);
+       u.set->offset = cpu_to_le32(sizeof(*u.set) - 8);
+       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);
-       if (ret == 0)
+       priv->current_command_oid = 0;
+       if (ret < 0)
+               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)
+                       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);
 
        if (u.buf != priv->command_buffer)
@@ -509,6 +868,27 @@ 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);
+       struct rndis_reset *reset;
+       int ret;
+
+       mutex_lock(&priv->command_lock);
+
+       reset = (void *)priv->command_buffer;
+       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);
+
+       if (ret < 0)
+               return ret;
+       return 0;
+}
 
 /*
  * Specs say that we can only set config parameters only soon after device
@@ -547,11 +927,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);
@@ -574,20 +954,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 paramater failed, %d.", ret);
+               netdev_dbg(dev->net, "setting rndis config parameter failed, %d\n",
+                          ret);
 
        kfree(infobuf);
        return ret;
@@ -596,16 +977,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
  */
@@ -615,91 +989,52 @@ 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 <= ARRAY_SIZE(freq_chan))
-                       *dsconfig = freq_chan[freq->m - 1] * 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);
 
-static int get_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
+static int set_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
 {
-       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];
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       int ret;
 
-               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);
+       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;
        }
-#endif
+       if (ret == 0) {
+               memcpy(&priv->essid, ssid, sizeof(priv->essid));
+               priv->radio_on = true;
+               netdev_dbg(usbdev->net, "%s(): radio_on = true\n", __func__);
+       }
+
        return ret;
 }
 
-
-static int set_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
+static int set_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
 {
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
        int ret;
 
-       ret = rndis_set_oid(usbdev, OID_802_11_SSID, ssid, sizeof(*ssid));
-       if (ret == 0) {
-               memcpy(&priv->essid, ssid, sizeof(priv->essid));
-               priv->radio_on = 1;
-               devdbg(usbdev, "set_essid: radio_on = 1");
+       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)
+{
+       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])
 {
@@ -721,28 +1056,32 @@ 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_wext_private *priv = get_rndis_wext_priv(usbdev);
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
        struct ndis_80211_ssid ssid;
        int i, ret = 0;
 
        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);
@@ -752,6 +1091,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;
@@ -763,186 +1107,226 @@ 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_wext_private *priv = get_rndis_wext_priv(usbdev);
+       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)
-                       auth_mode = ndis_80211_auth_wpa2;
+       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)
-                       auth_mode = ndis_80211_auth_wpa;
-               else if (priv->wpa_keymgmt & IW_AUTH_KEY_MGMT_PSK)
-                       auth_mode = ndis_80211_auth_wpa_psk;
+                       auth_mode = NDIS_80211_AUTH_WPA2_PSK;
+       } else if (wpa_version & NL80211_WPA_VERSION_1) {
+               if (keymgmt & RNDIS_WLAN_KEY_MGMT_802_1X)
+                       auth_mode = NDIS_80211_AUTH_WPA;
+               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
-               auth_mode = ndis_80211_auth_open;
+                       auth_mode = NDIS_80211_AUTH_WPA_NONE;
+       } 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_wext_private *priv = get_rndis_wext_priv(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)
-               tmp = cpu_to_le32(ndis_80211_priv_8021x_wep);
+       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);
+               tmp = cpu_to_le32(NDIS_80211_PRIV_ACCEPT_ALL);
 
        return rndis_set_oid(usbdev, OID_802_11_PRIVACY_FILTER, &tmp,
                                                                sizeof(tmp));
 }
 
-
 static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise)
 {
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
        __le32 tmp;
        int encr_mode, ret;
 
-       devdbg(usbdev, "set_encr_mode: cipher_pair=0x%x cipher_group=0x%x",
-               pairwise,
-               groupwise);
-
-       if (pairwise & IW_AUTH_CIPHER_CCMP)
-               encr_mode = ndis_80211_encr_ccmp_enabled;
-       else if (pairwise & IW_AUTH_CIPHER_TKIP)
-               encr_mode = ndis_80211_encr_tkip_enabled;
-       else if (pairwise &
-                (IW_AUTH_CIPHER_WEP40 | IW_AUTH_CIPHER_WEP104))
-               encr_mode = ndis_80211_encr_wep_enabled;
-       else if (groupwise & IW_AUTH_CIPHER_CCMP)
-               encr_mode = ndis_80211_encr_ccmp_enabled;
-       else if (groupwise & IW_AUTH_CIPHER_TKIP)
-               encr_mode = ndis_80211_encr_tkip_enabled;
+       netdev_dbg(usbdev->net, "%s(): cipher_pair=0x%x cipher_group=0x%x\n",
+                  __func__, pairwise, groupwise);
+
+       if (pairwise & RNDIS_WLAN_ALG_CCMP)
+               encr_mode = NDIS_80211_ENCR_CCMP_ENABLED;
+       else if (pairwise & RNDIS_WLAN_ALG_TKIP)
+               encr_mode = NDIS_80211_ENCR_TKIP_ENABLED;
+       else if (pairwise & RNDIS_WLAN_ALG_WEP)
+               encr_mode = NDIS_80211_ENCR_WEP_ENABLED;
+       else if (groupwise & RNDIS_WLAN_ALG_CCMP)
+               encr_mode = NDIS_80211_ENCR_CCMP_ENABLED;
+       else if (groupwise & RNDIS_WLAN_ALG_TKIP)
+               encr_mode = NDIS_80211_ENCR_TKIP_ENABLED;
        else
-               encr_mode = ndis_80211_encr_disabled;
+               encr_mode = NDIS_80211_ENCR_DISABLED;
 
        tmp = cpu_to_le32(encr_mode);
        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_wext_private *priv = get_rndis_wext_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_wext_private *priv = get_rndis_wext_priv(usbdev);
+       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)
-                               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;
 
-static void set_default_iw_params(struct usbnet *usbdev)
+       netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
+
+       if (rts_threshold < 0 || rts_threshold > 2347)
+               rts_threshold = 2347;
+
+       tmp = cpu_to_le32(rts_threshold);
+       return rndis_set_oid(usbdev, OID_802_11_RTS_THRESHOLD, &tmp,
+                                                               sizeof(tmp));
+}
+
+static int set_frag_threshold(struct usbnet *usbdev, u32 frag_threshold)
 {
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       __le32 tmp;
 
-       priv->wpa_keymgmt = 0;
-       priv->wpa_version = 0;
+       netdev_dbg(usbdev->net, "%s(): %i\n", __func__, frag_threshold);
 
-       set_infra_mode(usbdev, ndis_80211_infra_infra);
-       set_auth_mode(usbdev, IW_AUTH_WPA_VERSION_DISABLED,
-                               IW_AUTH_ALG_OPEN_SYSTEM);
-       set_priv_filter(usbdev);
-       set_encr_mode(usbdev, IW_AUTH_CIPHER_NONE, IW_AUTH_CIPHER_NONE);
+       if (frag_threshold < 256 || frag_threshold > 2346)
+               frag_threshold = 2346;
+
+       tmp = cpu_to_le32(frag_threshold);
+       return rndis_set_oid(usbdev, OID_802_11_FRAGMENTATION_THRESHOLD, &tmp,
+                                                               sizeof(tmp));
 }
 
+static void set_default_iw_params(struct usbnet *usbdev)
+{
+       set_infra_mode(usbdev, NDIS_80211_INFRA_INFRA);
+       set_auth_mode(usbdev, 0, NL80211_AUTHTYPE_OPEN_SYSTEM,
+                                               RNDIS_WLAN_KEY_MGMT_NONE);
+       set_priv_filter(usbdev);
+       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;
+}
 
 /* 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,
+                                                               int index)
 {
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       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 ((key_len != 5 && key_len != 13) || index < 0 || index > 3)
                return -EINVAL;
 
+       if (key_len == 5)
+               cipher = WLAN_CIPHER_SUITE_WEP40;
+       else
+               cipher = WLAN_CIPHER_SUITE_WEP104;
+
        memset(&ndis_key, 0, sizeof(ndis_key));
 
        ndis_key.size = cpu_to_le32(sizeof(ndis_key));
@@ -951,53 +1335,186 @@ static int add_wep_key(struct usbnet *usbdev, char *key, int key_len, int index)
        memcpy(&ndis_key.material, key, key_len);
 
        if (index == priv->encr_tx_key_index) {
-               ndis_key.index |= cpu_to_le32(1 << 31);
-               ret = set_encr_mode(usbdev, IW_AUTH_CIPHER_WEP104,
-                                               IW_AUTH_CIPHER_NONE);
+               ndis_key.index |= NDIS_80211_ADDWEP_TRANSMIT_KEY;
+               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;
-       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 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) {
+               netdev_dbg(usbdev->net, "%s(): index out of range (%i)\n",
+                          __func__, index);
+               return -EINVAL;
+       }
+       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_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;
+       }
+
+       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));
+
+       ndis_key.size = cpu_to_le32(sizeof(ndis_key) -
+                               sizeof(ndis_key.material) + key_len);
+       ndis_key.length = cpu_to_le32(key_len);
+       ndis_key.index = cpu_to_le32(index) | flags;
+
+       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);
+               memcpy(ndis_key.material + 16, key + 24, 8);
+               memcpy(ndis_key.material + 24, key + 16, 8);
+       } else
+               memcpy(ndis_key.material, key, key_len);
+
+       if (flags & NDIS_80211_ADDKEY_SET_INIT_RECV_SEQ)
+               memcpy(ndis_key.rsc, rx_seq, seq_len);
+
+       if (flags & NDIS_80211_ADDKEY_PAIRWISE_KEY) {
+               /* pairwise key */
+               memcpy(ndis_key.bssid, addr, ETH_ALEN);
+       } else {
+               /* group key */
+               if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)
+                       memset(ndis_key.bssid, 0xff, ETH_ALEN);
+               else
+                       get_bssid(usbdev, ndis_key.bssid);
+       }
+
+       ret = rndis_set_oid(usbdev, OID_802_11_ADD_KEY, &ndis_key,
+                                       le32_to_cpu(ndis_key.size));
+       netdev_dbg(usbdev->net, "%s(): OID_802_11_ADD_KEY -> %08X\n",
+                  __func__, ret);
+       if (ret != 0)
+               return ret;
+
+       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;
 
        return 0;
 }
 
+static int restore_key(struct usbnet *usbdev, int 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, int 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, int index, const u8 *bssid)
 {
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       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 (priv->encr_keys[index].len == 0)
                return 0;
 
-       priv->encr_key_len[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);
+
+       clear_key(priv, index);
 
-       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) {
+       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)
-                               remove_key.index |= cpu_to_le32(1 << 30);
+                       if (!is_broadcast_ether_addr(bssid))
+                               remove_key.index |=
+                                       NDIS_80211_ADDKEY_PAIRWISE_KEY;
                        memcpy(remove_key.bssid, bssid,
                                        sizeof(remove_key.bssid));
                } else
@@ -1013,779 +1530,469 @@ 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_wext_private *priv = get_rndis_wext_priv(usbdev);
-       struct dev_mc_list *mclist;
-       __le32 filter;
-       int ret, i, size;
-       char *buf;
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       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);
-}
-
-
-/*
- * wireless extension handlers
- */
-
-static int rndis_iw_commit(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       /* dummy op */
-       return 0;
+       netdev_dbg(usbdev->net, "OID_GEN_CURRENT_PACKET_FILTER(%08x) -> %d\n",
+                  le32_to_cpu(filter), ret);
 }
 
-
-static int rndis_iw_get_range(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+#ifdef DEBUG
+static void debug_print_pmkids(struct usbnet *usbdev,
+                               struct ndis_80211_pmkid *pmkids,
+                               const char *func_str)
 {
-       struct iw_range *range = (struct iw_range *)extra;
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-       int len, ret, i, j, num, has_80211g_rates;
-       u8 rates[8];
-       __le32 tx_power;
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       int i, len, count, max_pmkids, entry_len;
 
-       devdbg(usbdev, "SIOCGIWRANGE");
+       max_pmkids = priv->wdev.wiphy->max_num_pmkids;
+       len = le32_to_cpu(pmkids->length);
+       count = le32_to_cpu(pmkids->bssid_info_count);
 
-       /* clear iw_range struct */
-       memset(range, 0, sizeof(*range));
-       wrqu->data.length = sizeof(*range);
+       entry_len = (count > 0) ? (len - sizeof(*pmkids)) / count : -1;
 
-       range->txpower_capa = IW_TXPOW_MWATT;
-       range->num_txpower = 1;
-       if (priv->caps & CAP_SUPPORT_TXPOWER) {
-               len = sizeof(tx_power);
-               ret = rndis_query_oid(usbdev, OID_802_11_TX_POWER_LEVEL,
-                                               &tx_power, &len);
-               if (ret == 0 && le32_to_cpu(tx_power) != 0xFF)
-                       range->txpower[0] = le32_to_cpu(tx_power);
-               else
-                       range->txpower[0] = get_bcm4320_power(priv);
-       } else
-               range->txpower[0] = get_bcm4320_power(priv);
+       netdev_dbg(usbdev->net, "%s(): %d PMKIDs (data len: %d, entry len: "
+                               "%d)\n", func_str, count, len, entry_len);
 
-       len = sizeof(rates);
-       ret = rndis_query_oid(usbdev, OID_802_11_SUPPORTED_RATES, &rates,
-                                                               &len);
-       has_80211g_rates = 0;
-       if (ret == 0) {
-               j = 0;
-               for (i = 0; i < len; i++) {
-                       if (rates[i] == 0)
-                               break;
-                       range->bitrate[j] = (rates[i] & 0x7f) * 500000;
-                       /* check for non 802.11b rates */
-                       if (range->bitrate[j] == 6000000 ||
-                               range->bitrate[j] == 9000000 ||
-                               (range->bitrate[j] >= 12000000 &&
-                               range->bitrate[j] != 22000000))
-                               has_80211g_rates = 1;
-                       j++;
-               }
-               range->num_bitrates = j;
-       } else
-               range->num_bitrates = 0;
-
-       /* fill in 802.11g rates */
-       if (has_80211g_rates) {
-               num = range->num_bitrates;
-               for (i = 0; i < ARRAY_SIZE(rates_80211g); i++) {
-                       for (j = 0; j < num; j++) {
-                               if (range->bitrate[j] ==
-                                       rates_80211g[i] * 1000000)
-                                       break;
-                       }
-                       if (j == num)
-                               range->bitrate[range->num_bitrates++] =
-                                       rates_80211g[i] * 1000000;
-                       if (range->num_bitrates == IW_MAX_BITRATES)
-                               break;
-               }
+       if (count > max_pmkids)
+               count = max_pmkids;
 
-               /* estimated max real througput in bps */
-               range->throughput = 54 * 1000 * 1000 / 2;
+       for (i = 0; i < count; i++) {
+               u32 *tmp = (u32 *)pmkids->bssid_info[i].pmkid;
 
-               /* ~35% more with afterburner */
-               if (priv->param_afterburner)
-                       range->throughput = range->throughput / 100 * 135;
-       } else {
-               /* estimated max real througput in bps */
-               range->throughput = 11 * 1000 * 1000 / 2;
+               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]));
        }
-
-       range->num_channels = ARRAY_SIZE(freq_chan);
-
-       for (i = 0; i < ARRAY_SIZE(freq_chan) && i < IW_MAX_FREQUENCIES; i++) {
-               range->freq[i].i = i + 1;
-               range->freq[i].m = freq_chan[i] * 100000;
-               range->freq[i].e = 1;
-       }
-       range->num_frequency = i;
-
-       range->min_rts = 0;
-       range->max_rts = 2347;
-       range->min_frag = 256;
-       range->max_frag = 2346;
-
-       range->max_qual.qual = 100;
-       range->max_qual.level = 154;
-       range->max_qual.updated = IW_QUAL_QUAL_UPDATED
-                               | IW_QUAL_LEVEL_UPDATED
-                               | IW_QUAL_NOISE_INVALID;
-
-       range->we_version_compiled = WIRELESS_EXT;
-       range->we_version_source = WIRELESS_EXT;
-
-       range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
-                       IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
-       return 0;
 }
-
-
-static int rndis_iw_get_name(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+#else
+static void debug_print_pmkids(struct usbnet *usbdev,
+                               struct ndis_80211_pmkid *pmkids,
+                               const char *func_str)
 {
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-
-       strcpy(wrqu->name, priv->name);
-       return 0;
+       return;
 }
+#endif
 
-
-static int rndis_iw_set_essid(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *essid)
+static struct ndis_80211_pmkid *get_device_pmkids(struct usbnet *usbdev)
 {
-       struct ndis_80211_ssid ssid;
-       int length = wrqu->essid.length;
-       struct usbnet *usbdev = dev->priv;
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       struct ndis_80211_pmkid *pmkids;
+       int len, ret, max_pmkids;
 
-       devdbg(usbdev, "SIOCSIWESSID: [flags:%d,len:%d] '%.32s'",
-               wrqu->essid.flags, wrqu->essid.length, essid);
+       max_pmkids = priv->wdev.wiphy->max_num_pmkids;
+       len = sizeof(*pmkids) + max_pmkids * sizeof(pmkids->bssid_info[0]);
 
-       if (length > NDIS_802_11_LENGTH_SSID)
-               length = NDIS_802_11_LENGTH_SSID;
+       pmkids = kzalloc(len, GFP_KERNEL);
+       if (!pmkids)
+               return ERR_PTR(-ENOMEM);
 
-       ssid.length = cpu_to_le32(length);
-       if (length > 0)
-               memcpy(ssid.essid, essid, length);
-       else
-               memset(ssid.essid, 0, NDIS_802_11_LENGTH_SSID);
+       pmkids->length = cpu_to_le32(len);
+       pmkids->bssid_info_count = cpu_to_le32(max_pmkids);
 
-       set_assoc_params(usbdev);
-
-       if (!wrqu->essid.flags || length == 0)
-               return disassociate(usbdev, 1);
-       else
-               return set_essid(usbdev, &ssid);
-}
+       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);
+       }
 
-static int rndis_iw_get_essid(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *essid)
-{
-       struct ndis_80211_ssid ssid;
-       struct usbnet *usbdev = dev->priv;
-       int ret;
+       if (le32_to_cpu(pmkids->bssid_info_count) > max_pmkids)
+               pmkids->bssid_info_count = cpu_to_le32(max_pmkids);
 
-       ret = get_essid(usbdev, &ssid);
+       debug_print_pmkids(usbdev, pmkids, __func__);
 
-       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;
-       } else {
-               memset(essid, 0, sizeof(NDIS_802_11_LENGTH_SSID));
-               wrqu->essid.flags = 0;
-               wrqu->essid.length = 0;
-       }
-       devdbg(usbdev, "SIOCGIWESSID: %s", essid);
-       return ret;
+       return pmkids;
 }
 
-
-static int rndis_iw_get_bssid(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int set_device_pmkids(struct usbnet *usbdev,
+                               struct ndis_80211_pmkid *pmkids)
 {
-       struct usbnet *usbdev = dev->priv;
-       unsigned char bssid[ETH_ALEN];
-       int ret;
-       DECLARE_MAC_BUF(mac);
+       int ret, len, num_pmkids;
 
-       ret = get_bssid(usbdev, bssid);
+       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);
 
-       if (ret == 0)
-               devdbg(usbdev, "SIOCGIWAP: %s", print_mac(mac, bssid));
-       else
-               devdbg(usbdev, "SIOCGIWAP: <not associated>");
+       debug_print_pmkids(usbdev, pmkids, __func__);
 
-       wrqu->ap_addr.sa_family = ARPHRD_ETHER;
-       memcpy(wrqu->ap_addr.sa_data, bssid, ETH_ALEN);
+       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 int rndis_iw_set_bssid(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static struct ndis_80211_pmkid *remove_pmkid(struct usbnet *usbdev,
+                                               struct ndis_80211_pmkid *pmkids,
+                                               struct cfg80211_pmksa *pmksa,
+                                               int max_pmkids)
 {
-       struct usbnet *usbdev = dev->priv;
-       u8 *bssid = (u8 *)wrqu->ap_addr.sa_data;
-       DECLARE_MAC_BUF(mac);
-       int ret;
-
-       devdbg(usbdev, "SIOCSIWAP: %s", print_mac(mac, bssid));
-
-       ret = rndis_set_oid(usbdev, OID_802_11_BSSID, bssid, 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);
+       int i, len, count, newlen, err;
 
-       return 0;
-}
+       len = le32_to_cpu(pmkids->length);
+       count = le32_to_cpu(pmkids->bssid_info_count);
 
+       if (count > max_pmkids)
+               count = max_pmkids;
 
-static int rndis_iw_set_auth(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct iw_param *p = &wrqu->param;
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-       int ret = -ENOTSUPP;
+       for (i = 0; i < count; i++)
+               if (!compare_ether_addr(pmkids->bssid_info[i].bssid,
+                                                       pmksa->bssid))
+                       break;
 
-       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;
-
-       case IW_AUTH_CIPHER_PAIRWISE:
-               devdbg(usbdev, "SIOCSIWAUTH: CIPHER_PAIRWISE, %08x", p->value);
-               priv->wpa_cipher_pair = p->value;
-               ret = 0;
-               break;
+       /* pmkid not found */
+       if (i == count) {
+               netdev_dbg(usbdev->net, "%s(): bssid not found (%pM)\n",
+                                       __func__, pmksa->bssid);
+               err = -ENOENT;
+               goto error;
+       }
 
-       case IW_AUTH_CIPHER_GROUP:
-               devdbg(usbdev, "SIOCSIWAUTH: CIPHER_GROUP, %08x", p->value);
-               priv->wpa_cipher_group = p->value;
-               ret = 0;
-               break;
+       for (; i + 1 < count; i++)
+               pmkids->bssid_info[i] = pmkids->bssid_info[i + 1];
 
-       case IW_AUTH_KEY_MGMT:
-               devdbg(usbdev, "SIOCSIWAUTH: KEY_MGMT, %08x", p->value);
-               priv->wpa_keymgmt = p->value;
-               ret = 0;
-               break;
+       count--;
+       newlen = sizeof(*pmkids) + count * sizeof(pmkids->bssid_info[0]);
 
-       case IW_AUTH_TKIP_COUNTERMEASURES:
-               devdbg(usbdev, "SIOCSIWAUTH: TKIP_COUNTERMEASURES, %08x",
-                                                               p->value);
-               ret = 0;
-               break;
+       pmkids->length = cpu_to_le32(newlen);
+       pmkids->bssid_info_count = cpu_to_le32(count);
 
-       case IW_AUTH_DROP_UNENCRYPTED:
-               devdbg(usbdev, "SIOCSIWAUTH: DROP_UNENCRYPTED, %08x", p->value);
-               ret = 0;
-               break;
+       return pmkids;
+error:
+       kfree(pmkids);
+       return ERR_PTR(err);
+}
 
-       case IW_AUTH_80211_AUTH_ALG:
-               devdbg(usbdev, "SIOCSIWAUTH: 80211_AUTH_ALG, %08x", p->value);
-               priv->wpa_authalg = p->value;
-               ret = 0;
-               break;
+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, len, count, newlen;
 
-       case IW_AUTH_WPA_ENABLED:
-               devdbg(usbdev, "SIOCSIWAUTH: WPA_ENABLED, %08x", p->value);
-               if (wrqu->param.value)
-                       deauthenticate(usbdev);
-               ret = 0;
-               break;
+       len = le32_to_cpu(pmkids->length);
+       count = le32_to_cpu(pmkids->bssid_info_count);
 
-       case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-               devdbg(usbdev, "SIOCSIWAUTH: RX_UNENCRYPTED_EAPOL, %08x",
-                                                               p->value);
-               ret = 0;
-               break;
+       if (count > max_pmkids)
+               count = max_pmkids;
 
-       case IW_AUTH_ROAMING_CONTROL:
-               devdbg(usbdev, "SIOCSIWAUTH: ROAMING_CONTROL, %08x", p->value);
-               ret = 0;
-               break;
+       /* update with new pmkid */
+       for (i = 0; i < count; i++) {
+               if (compare_ether_addr(pmkids->bssid_info[i].bssid,
+                                                       pmksa->bssid))
+                       continue;
 
-       case IW_AUTH_PRIVACY_INVOKED:
-               devdbg(usbdev, "SIOCSIWAUTH: invalid cmd %d",
-                               wrqu->param.flags & IW_AUTH_INDEX);
-               return -EOPNOTSUPP;
+               memcpy(pmkids->bssid_info[i].pmkid, pmksa->pmkid,
+                                                               WLAN_PMKID_LEN);
 
-       default:
-               devdbg(usbdev, "SIOCSIWAUTH: UNKNOWN  %08x, %08x",
-                       p->flags & IW_AUTH_INDEX, p->value);
+               return pmkids;
        }
-       return ret;
-}
 
+       /* out of space, return error */
+       if (i == max_pmkids) {
+               netdev_dbg(usbdev->net, "%s(): out of space\n", __func__);
+               err = -ENOSPC;
+               goto error;
+       }
 
-static int rndis_iw_get_auth(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct iw_param *p = &wrqu->param;
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       /* add new pmkid */
+       newlen = sizeof(*pmkids) + (count + 1) * sizeof(pmkids->bssid_info[0]);
 
-       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;
+       pmkids = krealloc(pmkids, newlen, GFP_KERNEL);
+       if (!pmkids) {
+               err = -ENOMEM;
+               goto error;
        }
-       return 0;
-}
 
+       pmkids->length = cpu_to_le32(newlen);
+       pmkids->bssid_info_count = cpu_to_le32(count + 1);
 
-static int rndis_iw_get_mode(struct net_device *dev,
-                               struct iw_request_info *info,
-                               union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       memcpy(pmkids->bssid_info[count].bssid, pmksa->bssid, ETH_ALEN);
+       memcpy(pmkids->bssid_info[count].pmkid, pmksa->pmkid, WLAN_PMKID_LEN);
 
-       switch (priv->infra_mode) {
-       case ndis_80211_infra_adhoc:
-               wrqu->mode = IW_MODE_ADHOC;
-               break;
-       case ndis_80211_infra_infra:
-               wrqu->mode = IW_MODE_INFRA;
-               break;
-       /*case ndis_80211_infra_auto_unknown:*/
-       default:
-               wrqu->mode = IW_MODE_AUTO;
-               break;
-       }
-       devdbg(usbdev, "SIOCGIWMODE: %08x", wrqu->mode);
-       return 0;
+       return pmkids;
+error:
+       kfree(pmkids);
+       return ERR_PTR(err);
 }
 
-
-static int rndis_iw_set_mode(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+/*
+ * cfg80211 ops
+ */
+static int rndis_change_virtual_intf(struct wiphy *wiphy,
+                                       struct net_device *dev,
+                                       enum nl80211_iftype type, u32 *flags,
+                                       struct vif_params *params)
 {
-       struct usbnet *usbdev = dev->priv;
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
        int mode;
 
-       devdbg(usbdev, "SIOCSIWMODE: %08x", wrqu->mode);
-
-       switch (wrqu->mode) {
-       case IW_MODE_ADHOC:
-               mode = ndis_80211_infra_adhoc;
+       switch (type) {
+       case NL80211_IFTYPE_ADHOC:
+               mode = NDIS_80211_INFRA_ADHOC;
                break;
-       case IW_MODE_INFRA:
-               mode = ndis_80211_infra_infra;
+       case NL80211_IFTYPE_STATION:
+               mode = NDIS_80211_INFRA_INFRA;
                break;
-       /*case IW_MODE_AUTO:*/
        default:
-               mode = ndis_80211_infra_auto_unknown;
-               break;
+               return -EINVAL;
        }
 
+       priv->wdev.iftype = type;
+
        return set_infra_mode(usbdev, mode);
 }
 
-
-static int rndis_iw_set_encode(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 {
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-       int ret, index, key_len;
-       u8 *key;
-
-       index = (wrqu->encoding.flags & IW_ENCODE_INDEX);
-
-       /* iwconfig gives index as 1 - N */
-       if (index > 0)
-               index--;
-       else
-               index = priv->encr_tx_key_index;
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       int err;
 
-       if (index < 0 || index >= 4) {
-               devwarn(usbdev, "encryption index out of range (%u)", index);
-               return -EINVAL;
+       if (changed & WIPHY_PARAM_FRAG_THRESHOLD) {
+               err = set_frag_threshold(usbdev, wiphy->frag_threshold);
+               if (err < 0)
+                       return err;
        }
 
-       /* remove key if disabled */
-       if (wrqu->data.flags & IW_ENCODE_DISABLED) {
-               if (remove_key(usbdev, index, NULL))
-                       return -EINVAL;
-               else
-                       return 0;
+       if (changed & WIPHY_PARAM_RTS_THRESHOLD) {
+               err = set_rts_threshold(usbdev, wiphy->rts_threshold);
+               if (err < 0)
+                       return err;
        }
 
-       /* 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;
-
-       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;
-       }
-
-       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);
-
        return 0;
 }
 
-
-static int rndis_iw_set_encode_ext(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_set_tx_power(struct wiphy *wiphy,
+                             enum nl80211_tx_power_setting type,
+                             int mbm)
 {
-       struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-       struct ndis_80211_key ndis_key;
-       int keyidx, ret;
-       u8 *addr;
-
-       keyidx = wrqu->encoding.flags & IW_ENCODE_INDEX;
-
-       /* iwconfig gives index as 1 - N */
-       if (keyidx)
-               keyidx--;
-       else
-               keyidx = priv->encr_tx_key_index;
-
-       if (keyidx < 0 || keyidx >= 4)
-               return -EINVAL;
-
-       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);
-       }
-
-       if ((wrqu->encoding.flags & IW_ENCODE_DISABLED) ||
-           ext->alg == IW_ENCODE_ALG_NONE || ext->key_len == 0)
-               return remove_key(usbdev, keyidx, NULL);
-
-       if (ext->key_len > sizeof(ndis_key.material))
-               return -1;
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-       memset(&ndis_key, 0, sizeof(ndis_key));
+       netdev_dbg(usbdev->net, "%s(): type:0x%x mbm:%i\n",
+                  __func__, type, mbm);
 
-       ndis_key.size = cpu_to_le32(sizeof(ndis_key) -
-                               sizeof(ndis_key.material) + ext->key_len);
-       ndis_key.length = cpu_to_le32(ext->key_len);
-       ndis_key.index = cpu_to_le32(keyidx);
+       if (mbm < 0 || (mbm % 100))
+               return -ENOTSUPP;
 
-       if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
-               memcpy(ndis_key.rsc, ext->rx_seq, 6);
-               ndis_key.index |= cpu_to_le32(1 << 29);
-       }
+       /* 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 == NL80211_TX_POWER_AUTOMATIC ||
+           MBM_TO_DBM(mbm) == get_bcm4320_power_dbm(priv)) {
+               if (!priv->radio_on)
+                       disassociate(usbdev, true); /* turn on radio */
 
-       addr = ext->addr.sa_data;
-       if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
-               /* group key */
-               if (priv->infra_mode == ndis_80211_infra_adhoc)
-                       memset(ndis_key.bssid, 0xff, ETH_ALEN);
-               else
-                       get_bssid(usbdev, ndis_key.bssid);
-       } else {
-               /* pairwise key */
-               ndis_key.index |= cpu_to_le32(1 << 30);
-               memcpy(ndis_key.bssid, addr, ETH_ALEN);
+               return 0;
        }
 
-       if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
-               ndis_key.index |= cpu_to_le32(1 << 31);
+       return -ENOTSUPP;
+}
 
-       if (ext->alg == IW_ENCODE_ALG_TKIP && ext->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, ext->key, 16);
-               memcpy(ndis_key.material + 16, ext->key + 24, 8);
-               memcpy(ndis_key.material + 24, ext->key + 16, 8);
-       } else
-               memcpy(ndis_key.material, ext->key, ext->key_len);
+static int rndis_get_tx_power(struct wiphy *wiphy, int *dbm)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-       ret = rndis_set_oid(usbdev, OID_802_11_ADD_KEY, &ndis_key,
-                                       le32_to_cpu(ndis_key.size));
-       devdbg(usbdev, "SIOCSIWENCODEEXT: OID_802_11_ADD_KEY -> %08X", ret);
-       if (ret != 0)
-               return ret;
+       *dbm = get_bcm4320_power_dbm(priv);
 
-       priv->encr_key_len[keyidx] = ext->key_len;
-       memcpy(&priv->encr_keys[keyidx], ndis_key.material, ext->key_len);
-       if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)
-               priv->encr_tx_key_index = keyidx;
+       netdev_dbg(usbdev->net, "%s(): dbm:%i\n", __func__, *dbm);
 
        return 0;
 }
 
-
-static int rndis_iw_set_scan(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+#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 = dev->priv;
-       union iwreq_data evt;
-       int ret = -EINVAL;
+       struct usbnet *usbdev = netdev_priv(dev);
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       int ret;
        __le32 tmp;
 
-       devdbg(usbdev, "SIOCSIWSCAN");
+       netdev_dbg(usbdev->net, "cfg80211.scan\n");
 
-       if (wrqu->data.flags == 0) {
-               tmp = ccpu2(1);
-               ret = rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
-                                                               sizeof(tmp));
-               evt.data.flags = 0;
-               evt.data.length = 0;
-               wireless_send_event(dev, SIOCGIWSCAN, &evt, NULL);
+       /* Get current bssid list from device before new scan, as new scan
+        * clears internal bssid list.
+        */
+       rndis_check_bssid_list(usbdev);
+
+       if (!request)
+               return -EINVAL;
+
+       if (priv->scan_request && priv->scan_request != request)
+               return -EBUSY;
+
+       priv->scan_request = request;
+
+       tmp = cpu_to_le32(1);
+       ret = rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
+                                                       sizeof(tmp));
+       if (ret == 0) {
+               /* Wait before retrieving scan results from device */
+               queue_delayed_work(priv->workqueue, &priv->scan_work,
+                       SCAN_DELAY_JIFFIES);
        }
+
        return ret;
 }
 
-
-static char *rndis_translate_scan(struct net_device *dev,
-                                 struct iw_request_info *info, char *cev,
-                                 char *end_buf,
-                                 struct ndis_80211_bssid_ex *bssid)
+static struct cfg80211_bss *rndis_bss_info_update(struct usbnet *usbdev,
+                                       struct ndis_80211_bssid_ex *bssid)
 {
-#ifdef DEBUG
-       struct usbnet *usbdev = dev->priv;
-#endif
-       struct ieee80211_info_element *ie;
-       char *current_val;
-       int bssid_len, ie_len, i;
-       u32 beacon, atim;
-       struct iw_event iwe;
-       unsigned char sbuf[32];
-       DECLARE_MAC_BUF(mac);
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       struct ieee80211_channel *channel;
+       s32 signal;
+       u64 timestamp;
+       u16 capability;
+       u16 beacon_interval;
+       struct ndis_80211_fixed_ies *fixed;
+       int ie_len, bssid_len;
+       u8 *ie;
 
-       bssid_len = le32_to_cpu(bssid->length);
-
-       devdbg(usbdev, "BSSID %s", print_mac(mac, bssid->mac));
-       iwe.cmd = SIOCGIWAP;
-       iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-       memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN);
-       cev = iwe_stream_add_event(info, cev, end_buf, &iwe, IW_EV_ADDR_LEN);
-
-       devdbg(usbdev, "SSID(%d) %s", le32_to_cpu(bssid->ssid.length),
-                                               bssid->ssid.essid);
-       iwe.cmd = SIOCGIWESSID;
-       iwe.u.essid.length = le32_to_cpu(bssid->ssid.length);
-       iwe.u.essid.flags = 1;
-       cev = iwe_stream_add_point(info, cev, end_buf, &iwe, bssid->ssid.essid);
-
-       devdbg(usbdev, "MODE %d", le32_to_cpu(bssid->net_infra));
-       iwe.cmd = SIOCGIWMODE;
-       switch (le32_to_cpu(bssid->net_infra)) {
-       case ndis_80211_infra_adhoc:
-               iwe.u.mode = IW_MODE_ADHOC;
-               break;
-       case ndis_80211_infra_infra:
-               iwe.u.mode = IW_MODE_INFRA;
-               break;
-       /*case ndis_80211_infra_auto_unknown:*/
-       default:
-               iwe.u.mode = IW_MODE_AUTO;
-               break;
-       }
-       cev = iwe_stream_add_event(info, cev, end_buf, &iwe, IW_EV_UINT_LEN);
-
-       devdbg(usbdev, "FREQ %d kHz", le32_to_cpu(bssid->config.ds_config));
-       iwe.cmd = SIOCGIWFREQ;
-       dsconfig_to_freq(le32_to_cpu(bssid->config.ds_config), &iwe.u.freq);
-       cev = iwe_stream_add_event(info, cev, end_buf, &iwe, IW_EV_FREQ_LEN);
-
-       devdbg(usbdev, "QUAL %d", le32_to_cpu(bssid->rssi));
-       iwe.cmd = IWEVQUAL;
-       iwe.u.qual.qual  = level_to_qual(le32_to_cpu(bssid->rssi));
-       iwe.u.qual.level = le32_to_cpu(bssid->rssi);
-       iwe.u.qual.updated = IW_QUAL_QUAL_UPDATED
-                       | IW_QUAL_LEVEL_UPDATED
-                       | IW_QUAL_NOISE_INVALID;
-       cev = iwe_stream_add_event(info, cev, end_buf, &iwe, IW_EV_QUAL_LEN);
-
-       devdbg(usbdev, "ENCODE %d", le32_to_cpu(bssid->privacy));
-       iwe.cmd = SIOCGIWENCODE;
-       iwe.u.data.length = 0;
-       if (le32_to_cpu(bssid->privacy) == ndis_80211_priv_accept_all)
-               iwe.u.data.flags = IW_ENCODE_DISABLED;
-       else
-               iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-
-       cev = iwe_stream_add_point(info, cev, end_buf, &iwe, NULL);
-
-       devdbg(usbdev, "RATES:");
-       current_val = cev + iwe_stream_lcp_len(info);
-       iwe.cmd = SIOCGIWRATE;
-       for (i = 0; i < sizeof(bssid->rates); i++) {
-               if (bssid->rates[i] & 0x7f) {
-                       iwe.u.bitrate.value =
-                               ((bssid->rates[i] & 0x7f) *
-                               500000);
-                       devdbg(usbdev, " %d", iwe.u.bitrate.value);
-                       current_val = iwe_stream_add_value(info, cev,
-                               current_val, end_buf, &iwe,
-                               IW_EV_PARAM_LEN);
-               }
-       }
+       netdev_dbg(usbdev->net, " found bssid: '%.32s' [%pM]\n",
+                  bssid->ssid.essid, bssid->mac);
 
-       if ((current_val - cev) > iwe_stream_lcp_len(info))
-               cev = current_val;
+       /* parse bssid structure */
+       bssid_len = le32_to_cpu(bssid->length);
 
-       beacon = le32_to_cpu(bssid->config.beacon_period);
-       devdbg(usbdev, "BCN_INT %d", beacon);
-       iwe.cmd = IWEVCUSTOM;
-       snprintf(sbuf, sizeof(sbuf), "bcn_int=%d", beacon);
-       iwe.u.data.length = strlen(sbuf);
-       cev = iwe_stream_add_point(info, cev, end_buf, &iwe, sbuf);
+       if (bssid_len < sizeof(struct ndis_80211_bssid_ex) +
+                       sizeof(struct ndis_80211_fixed_ies))
+               return NULL;
 
-       atim = le32_to_cpu(bssid->config.atim_window);
-       devdbg(usbdev, "ATIM %d", atim);
-       iwe.cmd = IWEVCUSTOM;
-       snprintf(sbuf, sizeof(sbuf), "atim=%u", atim);
-       iwe.u.data.length = strlen(sbuf);
-       cev = iwe_stream_add_point(info, cev, end_buf, &iwe, sbuf);
+       fixed = (struct ndis_80211_fixed_ies *)bssid->ies;
 
        ie = (void *)(bssid->ies + sizeof(struct ndis_80211_fixed_ies));
        ie_len = min(bssid_len - (int)sizeof(*bssid),
                                        (int)le32_to_cpu(bssid->ie_length));
        ie_len -= sizeof(struct ndis_80211_fixed_ies);
-       while (ie_len >= sizeof(*ie) && sizeof(*ie) + ie->len <= ie_len) {
-               if ((ie->id == MFIE_TYPE_GENERIC && ie->len >= 4 &&
-                               memcmp(ie->data, "\x00\x50\xf2\x01", 4) == 0) ||
-                               ie->id == MFIE_TYPE_RSN) {
-                       devdbg(usbdev, "IE: WPA%d",
-                                       (ie->id == MFIE_TYPE_RSN) ? 2 : 1);
-                       iwe.cmd = IWEVGENIE;
-                       iwe.u.data.length = min(ie->len + 2, MAX_WPA_IE_LEN);
-                       cev = iwe_stream_add_point(info, cev, end_buf, &iwe,
-                                                               (u8 *)ie);
-               }
+       if (ie_len < 0)
+               return NULL;
 
-               ie_len -= sizeof(*ie) + ie->len;
-               ie = (struct ieee80211_info_element *)&ie->data[ie->len];
-       }
+       /* extract data for cfg80211_inform_bss */
+       channel = ieee80211_get_channel(priv->wdev.wiphy,
+                       KHZ_TO_MHZ(le32_to_cpu(bssid->config.ds_config)));
+       if (!channel)
+               return NULL;
 
-       return cev;
-}
+       signal = level_to_qual(le32_to_cpu(bssid->rssi));
+       timestamp = le64_to_cpu(*(__le64 *)fixed->timestamp);
+       capability = le16_to_cpu(fixed->capabilities);
+       beacon_interval = le16_to_cpu(fixed->beacon_interval);
 
+       return cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid->mac,
+               timestamp, capability, beacon_interval, ie, ie_len, signal,
+               GFP_KERNEL);
+}
 
-static int rndis_iw_get_scan(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_check_bssid_list(struct usbnet *usbdev)
 {
-       struct usbnet *usbdev = dev->priv;
        void *buf = NULL;
-       char *cev = extra;
        struct ndis_80211_bssid_list_ex *bssid_list;
        struct ndis_80211_bssid_ex *bssid;
        int ret = -EINVAL, len, count, bssid_len;
+       bool resized = false;
 
-       devdbg(usbdev, "SIOCGIWSCAN");
+       netdev_dbg(usbdev->net, "check_bssid_list\n");
 
        len = CONTROL_BUFFER_SIZE;
+resize_buf:
        buf = kmalloc(len, GFP_KERNEL);
        if (!buf) {
                ret = -ENOMEM;
@@ -1793,502 +2000,640 @@ static int rndis_iw_get_scan(struct net_device *dev,
        }
 
        ret = rndis_query_oid(usbdev, OID_802_11_BSSID_LIST, buf, &len);
-
        if (ret != 0)
                goto out;
 
+       if (!resized && len > CONTROL_BUFFER_SIZE) {
+               resized = true;
+               kfree(buf);
+               goto resize_buf;
+       }
+
        bssid_list = buf;
        bssid = bssid_list->bssid;
        bssid_len = le32_to_cpu(bssid->length);
        count = le32_to_cpu(bssid_list->num_items);
-       devdbg(usbdev, "SIOCGIWSCAN: %d BSSIDs found", count);
+       netdev_dbg(usbdev->net, "check_bssid_list: %d BSSIDs found (buflen: %d)\n",
+                  count, len);
 
        while (count && ((void *)bssid + bssid_len) <= (buf + len)) {
-               cev = rndis_translate_scan(dev, info, cev,
-                                          extra + IW_SCAN_MAX_DATA, bssid);
+               rndis_bss_info_update(usbdev, bssid);
+
                bssid = (void *)bssid + bssid_len;
                bssid_len = le32_to_cpu(bssid->length);
                count--;
        }
 
 out:
-       wrqu->data.length = cev - extra;
-       wrqu->data.flags = 0;
        kfree(buf);
        return ret;
 }
 
-
-static int rndis_iw_set_genie(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static void rndis_get_scan_results(struct work_struct *work)
 {
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-       int ret = 0;
+       struct rndis_wlan_private *priv =
+               container_of(work, struct rndis_wlan_private, scan_work.work);
+       struct usbnet *usbdev = priv->usbdev;
+       int ret;
 
-#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;
-       }
+       netdev_dbg(usbdev->net, "get_scan_results\n");
 
-       /* 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;
-}
+       if (!priv->scan_request)
+               return;
 
+       ret = rndis_check_bssid_list(usbdev);
 
-static int rndis_iw_get_genie(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       cfg80211_scan_done(priv->scan_request, ret < 0);
 
-       devdbg(usbdev, "SIOCGIWGENIE");
+       priv->scan_request = NULL;
+}
 
-       if (priv->wpa_ie_len == 0 || priv->wpa_ie == NULL) {
-               wrqu->data.length = 0;
-               return 0;
+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;
        }
 
-       if (wrqu->data.length < priv->wpa_ie_len)
-               return -E2BIG;
+       for (i = 0; i < sme->crypto.n_akm_suites; i++)
+               keymgmt |=
+                       rndis_akm_suite_to_key_mgmt(sme->crypto.akm_suites[i]);
 
-       wrqu->data.length = priv->wpa_ie_len;
-       memcpy(extra, priv->wpa_ie, priv->wpa_ie_len);
-
-       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_rts(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = dev->priv;
-       __le32 tmp;
-       devdbg(usbdev, "SIOCSIWRTS");
+       if (is_associated(usbdev))
+               disassociate(usbdev, false);
 
-       tmp = cpu_to_le32(wrqu->rts.value);
-       return rndis_set_oid(usbdev, OID_802_11_RTS_THRESHOLD, &tmp,
-                                                               sizeof(tmp));
-}
+       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;
+       }
 
-static int rndis_iw_get_rts(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = dev->priv;
-       __le32 tmp;
-       int len, ret;
+       set_priv_filter(usbdev);
 
-       len = sizeof(tmp);
-       ret = rndis_query_oid(usbdev, OID_802_11_RTS_THRESHOLD, &tmp, &len);
-       if (ret == 0) {
-               wrqu->rts.value = le32_to_cpu(tmp);
-               wrqu->rts.flags = 1;
-               wrqu->rts.disabled = 0;
+       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, "SIOCGIWRTS: %d", wrqu->rts.value);
+       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;
+               }
+       }
 
-       return ret;
-}
+       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);
 
-static int rndis_iw_set_frag(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = dev->priv;
-       __le32 tmp;
+       length = sme->ssid_len;
+       if (length > NDIS_802_11_LENGTH_SSID)
+               length = NDIS_802_11_LENGTH_SSID;
 
-       devdbg(usbdev, "SIOCSIWFRAG");
+       memset(&ssid, 0, sizeof(ssid));
+       ssid.length = cpu_to_le32(length);
+       memcpy(ssid.essid, sme->ssid, length);
 
-       tmp = cpu_to_le32(wrqu->frag.value);
-       return rndis_set_oid(usbdev, OID_802_11_FRAGMENTATION_THRESHOLD, &tmp,
-                                                               sizeof(tmp));
-}
+       /* Pause and purge rx queue, so we don't pass packets before
+        * 'media connect'-indication.
+        */
+       usbnet_pause_rx(usbdev);
+       usbnet_purge_paused_rxq(usbdev);
 
+       ret = set_essid(usbdev, &ssid);
+       if (ret < 0)
+               netdev_dbg(usbdev->net, "connect: set_essid failed, %d\n", ret);
+       return ret;
 
-static int rndis_iw_get_frag(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = dev->priv;
-       __le32 tmp;
-       int len, ret;
+err_turn_radio_on:
+       disassociate(usbdev, true);
 
-       len = sizeof(tmp);
-       ret = rndis_query_oid(usbdev, OID_802_11_FRAGMENTATION_THRESHOLD, &tmp,
-                                                                       &len);
-       if (ret == 0) {
-               wrqu->frag.value = le32_to_cpu(tmp);
-               wrqu->frag.flags = 1;
-               wrqu->frag.disabled = 0;
-       }
-       devdbg(usbdev, "SIOCGIWFRAG: %d", wrqu->frag.value);
        return ret;
 }
 
-
-static int rndis_iw_set_nick(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_disconnect(struct wiphy *wiphy, struct net_device *dev,
+                                                               u16 reason_code)
 {
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-       devdbg(usbdev, "SIOCSIWNICK");
+       netdev_dbg(usbdev->net, "cfg80211.disconnect(%d)\n", reason_code);
 
-       priv->nick_len = wrqu->data.length;
-       if (priv->nick_len > 32)
-               priv->nick_len = 32;
+       priv->connected = false;
+       memset(priv->bssid, 0, ETH_ALEN);
 
-       memcpy(priv->nick, extra, priv->nick_len);
-       return 0;
+       return deauthenticate(usbdev);
 }
 
-
-static int rndis_iw_get_nick(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_join_ibss(struct wiphy *wiphy, struct net_device *dev,
+                                       struct cfg80211_ibss_params *params)
 {
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       struct ieee80211_channel *channel = params->channel;
+       struct ndis_80211_ssid ssid;
+       enum nl80211_auth_type auth_type;
+       int ret, alg, length, chan = -1;
 
-       wrqu->data.flags = 1;
-       wrqu->data.length = priv->nick_len;
-       memcpy(extra, priv->nick, priv->nick_len);
+       if (channel)
+               chan = ieee80211_frequency_to_channel(channel->center_freq);
 
-       devdbg(usbdev, "SIOCGIWNICK: '%s'", priv->nick);
+       /* 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 {
+               auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM;
+               alg = RNDIS_WLAN_ALG_NONE;
+       }
 
-       return 0;
-}
+       netdev_dbg(usbdev->net, "cfg80211.join_ibss('%.32s':[%pM]:%d:%d)\n",
+                  params->ssid, params->bssid, chan, params->privacy);
 
+       if (is_associated(usbdev))
+               disassociate(usbdev, false);
 
-static int rndis_iw_set_freq(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = dev->priv;
-       struct ndis_80211_conf config;
-       unsigned int dsconfig;
-       int len, ret;
+       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;
+       }
 
-       /* this OID is valid only when not associated */
-       if (is_associated(usbdev))
-               return 0;
+       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;
+       }
 
-       dsconfig = 0;
-       if (freq_to_dsconfig(&wrqu->freq, &dsconfig))
-               return -EINVAL;
+       set_priv_filter(usbdev);
 
-       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;
+       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;
        }
 
-       config.ds_config = cpu_to_le32(dsconfig);
+       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;
+               }
+       }
 
-       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 (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;
 
-static int rndis_iw_get_freq(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = dev->priv;
-       struct ndis_80211_conf config;
-       int len, ret;
+       memset(&ssid, 0, sizeof(ssid));
+       ssid.length = cpu_to_le32(length);
+       memcpy(ssid.essid, params->ssid, length);
 
-       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);
+       /* 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);
 
-       devdbg(usbdev, "SIOCGIWFREQ: %d", wrqu->freq.m);
        return ret;
 }
 
+static int rndis_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+
+       netdev_dbg(usbdev->net, "cfg80211.leave_ibss()\n");
+
+       priv->connected = false;
+       memset(priv->bssid, 0, ETH_ALEN);
+
+       return deauthenticate(usbdev);
+}
 
-static int rndis_iw_get_txpower(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static int rndis_set_channel(struct wiphy *wiphy, struct net_device *netdev,
+       struct ieee80211_channel *chan, enum nl80211_channel_type channel_type)
 {
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-       __le32 tx_power;
-       int ret = 0, len;
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-       if (priv->radio_on) {
-               if (priv->caps & CAP_SUPPORT_TXPOWER) {
-                       len = sizeof(tx_power);
-                       ret = rndis_query_oid(usbdev, OID_802_11_TX_POWER_LEVEL,
-                                                       &tx_power, &len);
-                       if (ret != 0)
-                               return ret;
-               } else
-                       /* fake incase not supported */
-                       tx_power = cpu_to_le32(get_bcm4320_power(priv));
+       return set_channel(usbdev,
+                       ieee80211_frequency_to_channel(chan->center_freq));
+}
 
-               wrqu->txpower.flags = IW_TXPOW_MWATT;
-               wrqu->txpower.value = le32_to_cpu(tx_power);
-               wrqu->txpower.disabled = 0;
-       } else {
-               wrqu->txpower.flags = IW_TXPOW_MWATT;
-               wrqu->txpower.value = 0;
-               wrqu->txpower.disabled = 1;
+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;
        }
+}
 
-       devdbg(usbdev, "SIOCGIWTXPOW: %d", wrqu->txpower.value);
+static int rndis_del_key(struct wiphy *wiphy, struct net_device *netdev,
+                        u8 key_index, bool pairwise, const u8 *mac_addr)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-       return ret;
-}
+       netdev_dbg(usbdev->net, "%s(%i, %pM)\n", __func__, key_index, mac_addr);
 
+       return remove_key(usbdev, key_index, mac_addr);
+}
 
-static int rndis_iw_set_txpower(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
-{
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-       __le32 tx_power = 0;
-       int ret = 0;
-
-       if (!wrqu->txpower.disabled) {
-               if (wrqu->txpower.flags == IW_TXPOW_MWATT)
-                       tx_power = cpu_to_le32(wrqu->txpower.value);
-               else { /* wrqu->txpower.flags == IW_TXPOW_DBM */
-                       if (wrqu->txpower.value > 20)
-                               tx_power = cpu_to_le32(128);
-                       else if (wrqu->txpower.value < -43)
-                               tx_power = cpu_to_le32(127);
-                       else {
-                               signed char tmp;
-                               tmp = wrqu->txpower.value;
-                               tmp = -12 - tmp;
-                               tmp <<= 2;
-                               tx_power = cpu_to_le32((unsigned char)tmp);
-                       }
-               }
-       }
+static int rndis_set_default_key(struct wiphy *wiphy, struct net_device *netdev,
+                                                               u8 key_index)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
+       struct rndis_wlan_encr_key key;
 
-       devdbg(usbdev, "SIOCSIWTXPOW: %d", le32_to_cpu(tx_power));
+       netdev_dbg(usbdev->net, "%s(%i)\n", __func__, key_index);
 
-       if (le32_to_cpu(tx_power) != 0) {
-               if (priv->caps & CAP_SUPPORT_TXPOWER) {
-                       /* turn radio on first */
-                       if (!priv->radio_on)
-                               disassociate(usbdev, 1);
+       priv->encr_tx_key_index = key_index;
 
-                       ret = rndis_set_oid(usbdev, OID_802_11_TX_POWER_LEVEL,
-                                               &tx_power, sizeof(tx_power));
-                       if (ret != 0)
-                               ret = -EOPNOTSUPP;
-                       return ret;
-               } else {
-                       /* txpower unsupported, just turn radio on */
-                       if (!priv->radio_on)
-                               return disassociate(usbdev, 1);
-                       return 0; /* all ready on */
-               }
-       }
+       key = priv->encr_keys[key_index];
 
-       /* tx_power == 0, turn off radio */
-       return disassociate(usbdev, 0);
+       return add_wep_key(usbdev, key.material, key.len, key_index);
 }
 
-
-static int rndis_iw_get_rate(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+static void rndis_fill_station_info(struct usbnet *usbdev,
+                                               struct station_info *sinfo)
 {
-       struct usbnet *usbdev = dev->priv;
-       __le32 tmp;
+       __le32 linkspeed, rssi;
        int ret, len;
 
-       len = sizeof(tmp);
-       ret = rndis_query_oid(usbdev, OID_GEN_LINK_SPEED, &tmp, &len);
+       memset(sinfo, 0, sizeof(*sinfo));
+
+       len = sizeof(linkspeed);
+       ret = rndis_query_oid(usbdev, OID_GEN_LINK_SPEED, &linkspeed, &len);
        if (ret == 0) {
-               wrqu->bitrate.value = le32_to_cpu(tmp) * 100;
-               wrqu->bitrate.disabled = 0;
-               wrqu->bitrate.flags = 1;
+               sinfo->txrate.legacy = le32_to_cpu(linkspeed) / 1000;
+               sinfo->filled |= STATION_INFO_TX_BITRATE;
+       }
+
+       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;
        }
-       return ret;
 }
 
+static int rndis_get_station(struct wiphy *wiphy, struct net_device *dev,
+                                       u8 *mac, struct station_info *sinfo)
+{
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-static int rndis_iw_set_mlme(struct net_device *dev,
-    struct iw_request_info *info, union iwreq_data *wrqu, char *extra)
+       if (compare_ether_addr(priv->bssid, mac))
+               return -ENOENT;
+
+       rndis_fill_station_info(usbdev, sinfo);
+
+       return 0;
+}
+
+static int rndis_dump_station(struct wiphy *wiphy, struct net_device *dev,
+                              int idx, u8 *mac, struct station_info *sinfo)
 {
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-       struct iw_mlme *mlme = (struct iw_mlme *)extra;
-       unsigned char bssid[ETH_ALEN];
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
+       struct usbnet *usbdev = priv->usbdev;
 
-       get_bssid(usbdev, bssid);
+       if (idx != 0)
+               return -ENOENT;
 
-       if (memcmp(bssid, mlme->addr.sa_data, ETH_ALEN))
-               return -EINVAL;
+       memcpy(mac, priv->bssid, ETH_ALEN);
 
-       switch (mlme->cmd) {
-       case IW_MLME_DEAUTH:
-               return deauthenticate(usbdev);
-       case IW_MLME_DISASSOC:
-               return disassociate(usbdev, priv->radio_on);
-       default:
-               return -EOPNOTSUPP;
-       }
+       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);
+       }
 
-static struct iw_statistics *rndis_get_wireless_stats(struct net_device *dev)
-{
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_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)      = rndis_iw_get_name,
-       IW_IOCTL(SIOCSIWFREQ)      = rndis_iw_set_freq,
-       IW_IOCTL(SIOCGIWFREQ)      = rndis_iw_get_freq,
-       IW_IOCTL(SIOCSIWMODE)      = rndis_iw_set_mode,
-       IW_IOCTL(SIOCGIWMODE)      = rndis_iw_get_mode,
-       IW_IOCTL(SIOCGIWRANGE)     = rndis_iw_get_range,
-       IW_IOCTL(SIOCSIWAP)        = rndis_iw_set_bssid,
-       IW_IOCTL(SIOCGIWAP)        = rndis_iw_get_bssid,
-       IW_IOCTL(SIOCSIWSCAN)      = rndis_iw_set_scan,
-       IW_IOCTL(SIOCGIWSCAN)      = rndis_iw_get_scan,
-       IW_IOCTL(SIOCSIWESSID)     = rndis_iw_set_essid,
-       IW_IOCTL(SIOCGIWESSID)     = rndis_iw_get_essid,
-       IW_IOCTL(SIOCSIWNICKN)     = rndis_iw_set_nick,
-       IW_IOCTL(SIOCGIWNICKN)     = rndis_iw_get_nick,
-       IW_IOCTL(SIOCGIWRATE)      = rndis_iw_get_rate,
-       IW_IOCTL(SIOCSIWRTS)       = rndis_iw_set_rts,
-       IW_IOCTL(SIOCGIWRTS)       = rndis_iw_get_rts,
-       IW_IOCTL(SIOCSIWFRAG)      = rndis_iw_set_frag,
-       IW_IOCTL(SIOCGIWFRAG)      = rndis_iw_get_frag,
-       IW_IOCTL(SIOCSIWTXPOW)     = rndis_iw_set_txpower,
-       IW_IOCTL(SIOCGIWTXPOW)     = rndis_iw_get_txpower,
-       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_wext_private_handler[] = {
-};
+       pmkids = update_pmkid(usbdev, pmkids, pmksa, wiphy->max_num_pmkids);
+       if (IS_ERR(pmkids)) {
+               /* not found, list full, etc */
+               return PTR_ERR(pmkids);
+       }
 
-static const struct iw_priv_args rndis_wext_private_args[] = {
-};
+       return set_device_pmkids(usbdev, pmkids);
+}
 
+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);
+       }
 
-static const struct iw_handler_def rndis_iw_handlers = {
-       .num_standard = ARRAY_SIZE(rndis_iw_handler),
-       .num_private  = ARRAY_SIZE(rndis_wext_private_handler),
-       .num_private_args = ARRAY_SIZE(rndis_wext_private_args),
-       .standard = (iw_handler *)rndis_iw_handler,
-       .private  = (iw_handler *)rndis_wext_private_handler,
-       .private_args = (struct iw_priv_args *)rndis_wext_private_args,
-       .get_wireless_stats = rndis_get_wireless_stats,
-};
+       pmkids = remove_pmkid(usbdev, pmkids, pmksa, wiphy->max_num_pmkids);
+       if (IS_ERR(pmkids)) {
+               /* not found, etc */
+               return PTR_ERR(pmkids);
+       }
 
+       return set_device_pmkids(usbdev, pmkids);
+}
 
-static void rndis_wext_worker(struct work_struct *work)
+static int rndis_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev)
 {
-       struct rndis_wext_private *priv =
-               container_of(work, struct rndis_wext_private, work);
+       struct rndis_wlan_private *priv = wiphy_priv(wiphy);
        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;
+       struct ndis_80211_pmkid pmkid;
+
+       netdev_dbg(usbdev->net, "%s()\n", __func__);
+
+       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));
+}
+
+/*
+ * 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];
+       int resp_ie_len, req_ie_len;
+       u8 *req_ie, *resp_ie;
        int ret, offset;
+       bool roamed = false;
 
-       if (test_and_clear_bit(WORK_LINK_UP, &priv->work_pending)) {
-               netif_carrier_on(usbdev->net);
+       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;
+       }
 
-               info = kzalloc(assoc_size, GFP_KERNEL);
-               if (!info)
-                       goto get_bssid;
+       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;
+               }
 
-               /* Get association info IEs from device and send them back to
-                * userspace. */
-               ret = get_association_info(usbdev, info, assoc_size);
+               /* Get association info IEs from device. */
+               ret = get_association_info(usbdev, info, CONTROL_BUFFER_SIZE);
                if (!ret) {
-                       evt.data.length = le32_to_cpu(info->req_ie_length);
-                       if (evt.data.length > 0) {
+                       req_ie_len = le32_to_cpu(info->req_ie_length);
+                       if (req_ie_len > 0) {
                                offset = le32_to_cpu(info->offset_req_ies);
-                               wireless_send_event(usbdev->net,
-                                       IWEVASSOCREQIE, &evt,
-                                       (char *)info + offset);
+
+                               if (offset > CONTROL_BUFFER_SIZE)
+                                       offset = CONTROL_BUFFER_SIZE;
+
+                               req_ie = (u8 *)info + offset;
+
+                               if (offset + req_ie_len > CONTROL_BUFFER_SIZE)
+                                       req_ie_len =
+                                               CONTROL_BUFFER_SIZE - offset;
                        }
 
-                       evt.data.length = le32_to_cpu(info->resp_ie_length);
-                       if (evt.data.length > 0) {
+                       resp_ie_len = le32_to_cpu(info->resp_ie_length);
+                       if (resp_ie_len > 0) {
                                offset = le32_to_cpu(info->offset_resp_ies);
-                               wireless_send_event(usbdev->net,
-                                       IWEVASSOCRESPIE, &evt,
-                                       (char *)info + offset);
+
+                               if (offset > CONTROL_BUFFER_SIZE)
+                                       offset = CONTROL_BUFFER_SIZE;
+
+                               resp_ie = (u8 *)info + offset;
+
+                               if (offset + resp_ie_len > CONTROL_BUFFER_SIZE)
+                                       resp_ie_len =
+                                               CONTROL_BUFFER_SIZE - offset;
                        }
                }
+       } else if (WARN_ON(priv->infra_mode != NDIS_80211_INFRA_ADHOC))
+               return;
+
+       ret = get_bssid(usbdev, bssid);
+       if (ret < 0)
+               memset(bssid, 0, sizeof(bssid));
+
+       netdev_dbg(usbdev->net, "link up work: [%pM]%s\n",
+                  bssid, roamed ? " roamed" : "");
+
+       /* Internal bss list in device always contains at least the currently
+        * connected bss and we can get it to cfg80211 with
+        * rndis_check_bssid_list().
+        * NOTE: This is true for Broadcom chip, but not mentioned in RNDIS
+        * spec.
+        */
+       rndis_check_bssid_list(usbdev);
+
+       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, 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);
 
-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);
-               }
-       }
+       priv->connected = true;
+       memcpy(priv->bssid, bssid, ETH_ALEN);
+
+       usbnet_resume_rx(usbdev);
+       netif_carrier_on(usbdev->net);
+}
+
+static void rndis_wlan_do_link_down_work(struct usbnet *usbdev)
+{
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+
+       if (priv->connected) {
+               priv->connected = false;
+               memset(priv->bssid, 0, ETH_ALEN);
 
-       if (test_and_clear_bit(WORK_LINK_DOWN, &priv->work_pending)) {
-               netif_carrier_off(usbdev->net);
+               deauthenticate(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);
+               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;
+
+       if (test_and_clear_bit(WORK_LINK_UP, &priv->work_pending))
+               rndis_wlan_do_link_up_work(usbdev);
+
+       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);
 }
 
-static void rndis_wext_set_multicast_list(struct net_device *dev)
+static void rndis_wlan_set_multicast_list(struct net_device *dev)
 {
-       struct usbnet *usbdev = dev->priv;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       struct usbnet *usbdev = netdev_priv(dev);
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
 
        if (test_bit(WORK_SET_MULTICAST_LIST, &priv->work_pending))
                return;
@@ -2297,32 +2642,239 @@ static void rndis_wext_set_multicast_list(struct net_device *dev)
        queue_work(priv->workqueue, &priv->work);
 }
 
-static void rndis_wext_link_change(struct usbnet *usbdev, int state)
+static void rndis_wlan_auth_indication(struct usbnet *usbdev,
+                               struct ndis_80211_status_indication *indication,
+                               int len)
 {
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       u8 *buf;
+       const char *type;
+       int flags, buflen, key_id;
+       bool pairwise_error, group_error;
+       struct ndis_80211_auth_request *auth_req;
+       enum nl80211_key_type key_type;
 
-       /* queue work to avoid recursive calls into rndis_command */
-       set_bit(state ? WORK_LINK_UP : WORK_LINK_DOWN, &priv->work_pending);
-       queue_work(priv->workqueue, &priv->work);
+       /* must have at least one array entry */
+       if (len < offsetof(struct ndis_80211_status_indication, u) +
+                               sizeof(struct ndis_80211_auth_request)) {
+               netdev_info(usbdev->net, "authentication indication: too short message (%i)\n",
+                           len);
+               return;
+       }
+
+       buf = (void *)&indication->u.auth_request[0];
+       buflen = len - offsetof(struct ndis_80211_status_indication, u);
+
+       while (buflen >= sizeof(*auth_req)) {
+               auth_req = (void *)buf;
+               type = "unknown";
+               flags = le32_to_cpu(auth_req->flags);
+               pairwise_error = false;
+               group_error = false;
+
+               if (flags & 0x1)
+                       type = "reauth request";
+               if (flags & 0x2)
+                       type = "key update request";
+               if (flags & 0x6) {
+                       pairwise_error = true;
+                       type = "pairwise_error";
+               }
+               if (flags & 0xe) {
+                       group_error = true;
+                       type = "group_error";
+               }
+
+               netdev_info(usbdev->net, "authentication indication: %s (0x%08x)\n",
+                           type, le32_to_cpu(auth_req->flags));
+
+               if (pairwise_error) {
+                       key_type = NL80211_KEYTYPE_PAIRWISE;
+                       key_id = -1;
+
+                       cfg80211_michael_mic_failure(usbdev->net,
+                                                       auth_req->bssid,
+                                                       key_type, key_id, NULL,
+                                                       GFP_KERNEL);
+               }
+
+               if (group_error) {
+                       key_type = NL80211_KEYTYPE_GROUP;
+                       key_id = -1;
+
+                       cfg80211_michael_mic_failure(usbdev->net,
+                                                       auth_req->bssid,
+                                                       key_type, key_id, NULL,
+                                                       GFP_KERNEL);
+               }
+
+               buflen -= le32_to_cpu(auth_req->length);
+               buf += le32_to_cpu(auth_req->length);
+       }
 }
 
+static void rndis_wlan_pmkid_cand_list_indication(struct usbnet *usbdev,
+                               struct ndis_80211_status_indication *indication,
+                               int len)
+{
+       struct ndis_80211_pmkid_cand_list *cand_list;
+       int list_len, expected_len, i;
+
+       if (len < offsetof(struct ndis_80211_status_indication, u) +
+                               sizeof(struct ndis_80211_pmkid_cand_list)) {
+               netdev_info(usbdev->net, "pmkid candidate list indication: too short message (%i)\n",
+                           len);
+               return;
+       }
+
+       list_len = le32_to_cpu(indication->u.cand_list.num_candidates) *
+                       sizeof(struct ndis_80211_pmkid_candidate);
+       expected_len = sizeof(struct ndis_80211_pmkid_cand_list) + list_len +
+                       offsetof(struct ndis_80211_status_indication, u);
+
+       if (len < expected_len) {
+               netdev_info(usbdev->net, "pmkid candidate list indication: list larger than buffer (%i < %i)\n",
+                           len, expected_len);
+               return;
+       }
 
-static int rndis_wext_get_caps(struct usbnet *usbdev)
+       cand_list = &indication->u.cand_list;
+
+       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 ndis_80211_pmkid_candidate *cand =
+                                               &cand_list->candidate_list[i];
+
+               netdev_dbg(usbdev->net, "cand[%i]: flags: 0x%08x, bssid: %pM\n",
+                          i, le32_to_cpu(cand->flags), cand->bssid);
+
+#if 0
+               struct iw_pmkid_cand pcand;
+               union iwreq_data wrqu;
+
+               memset(&pcand, 0, sizeof(pcand));
+               if (le32_to_cpu(cand->flags) & 0x01)
+                       pcand.flags |= IW_PMKID_CAND_PREAUTH;
+               pcand.index = i;
+               memcpy(pcand.bssid.sa_data, cand->bssid, ETH_ALEN);
+
+               memset(&wrqu, 0, sizeof(wrqu));
+               wrqu.data.length = sizeof(pcand);
+               wireless_send_event(usbdev->net, IWEVPMKIDCAND, &wrqu,
+                                                               (u8 *)&pcand);
+#endif
+       }
+}
+
+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;
+
+       offset = offsetof(struct rndis_indicate, status) +
+                       le32_to_cpu(msg->offset);
+       len = le32_to_cpu(msg->length);
+
+       if (len < 8) {
+               netdev_info(usbdev->net, "media specific indication, ignore too short message (%i < 8)\n",
+                           len);
+               return;
+       }
+
+       if (offset + len > buflen) {
+               netdev_info(usbdev->net, "media specific indication, too large to fit to buffer (%i > %i)\n",
+                           offset + len, buflen);
+               return;
+       }
+
+       indication = (void *)((u8 *)msg + offset);
+
+       switch (le32_to_cpu(indication->status_type)) {
+       case NDIS_80211_STATUSTYPE_RADIOSTATE:
+               netdev_info(usbdev->net, "radio state indication: %i\n",
+                           le32_to_cpu(indication->u.radio_status));
+               return;
+
+       case NDIS_80211_STATUSTYPE_MEDIASTREAMMODE:
+               netdev_info(usbdev->net, "media stream mode indication: %i\n",
+                           le32_to_cpu(indication->u.media_stream_mode));
+               return;
+
+       case NDIS_80211_STATUSTYPE_AUTHENTICATION:
+               rndis_wlan_auth_indication(usbdev, indication, len);
+               return;
+
+       case NDIS_80211_STATUSTYPE_PMKID_CANDIDATELIST:
+               rndis_wlan_pmkid_cand_list_indication(usbdev, indication, len);
+               return;
+
+       default:
+               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);
+       struct rndis_indicate *msg = ind;
+
+       switch (msg->status) {
+       case RNDIS_STATUS_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);
+               queue_work(priv->workqueue, &priv->work);
+               break;
+
+       case RNDIS_STATUS_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);
+               queue_work(priv->workqueue, &priv->work);
+               break;
+
+       case RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION:
+               rndis_wlan_media_specific_indication(usbdev, msg, buflen);
+               break;
+
+       default:
+               netdev_info(usbdev->net, "indication: 0x%08x\n",
+                           le32_to_cpu(msg->status));
+               break;
+       }
+}
+
+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;
-       __le32 tx_power;
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-
-       /* determine if supports setting txpower */
-       len = sizeof(tx_power);
-       retval = rndis_query_oid(usbdev, OID_802_11_TX_POWER_LEVEL, &tx_power,
-                                                                       &len);
-       if (retval == 0 && le32_to_cpu(tx_power) != 0xFF)
-               priv->caps |= CAP_SUPPORT_TXPOWER;
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
 
        /* determine supported modes */
        len = sizeof(networks_supported);
@@ -2334,101 +2886,76 @@ static int rndis_wext_get_caps(struct usbnet *usbdev)
                        n = 8;
                for (i = 0; i < n; i++) {
                        switch (le32_to_cpu(networks_supported.items[i])) {
-                       case ndis_80211_type_freq_hop:
-                       case ndis_80211_type_direct_seq:
+                       case NDIS_80211_TYPE_FREQ_HOP:
+                       case NDIS_80211_TYPE_DIRECT_SEQ:
                                priv->caps |= CAP_MODE_80211B;
                                break;
-                       case ndis_80211_type_ofdm_a:
+                       case NDIS_80211_TYPE_OFDM_A:
                                priv->caps |= CAP_MODE_80211A;
                                break;
-                       case ndis_80211_type_ofdm_g:
+                       case NDIS_80211_TYPE_OFDM_G:
                                priv->caps |= CAP_MODE_80211G;
                                break;
                        }
                }
-               if (priv->caps & CAP_MODE_80211A)
-                       strcat(priv->name, "a");
-               if (priv->caps & CAP_MODE_80211B)
-                       strcat(priv->name, "b");
-               if (priv->caps & CAP_MODE_80211G)
-                       strcat(priv->name, "g");
        }
 
+       /* 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;
 }
 
-
-#define STATS_UPDATE_JIFFIES (HZ)
-static void rndis_update_wireless_stats(struct work_struct *work)
+#define DEVICE_POLLER_JIFFIES (HZ)
+static void rndis_device_poller(struct work_struct *work)
 {
-       struct rndis_wext_private *priv =
-               container_of(work, struct rndis_wext_private, stats_work.work);
+       struct rndis_wlan_private *priv =
+               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 */
-       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;
+       /* 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))
                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 = le32_to_cpu(rssi);
-               iwstats.qual.updated = IW_QUAL_QUAL_UPDATED
-                               | IW_QUAL_LEVEL_UPDATED
-                               | IW_QUAL_NOISE_INVALID;
-       }
-
-       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);
+               priv->last_qual = level_to_qual(le32_to_cpu(rssi));
 
-       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;
@@ -2436,7 +2963,7 @@ static void rndis_update_wireless_stats(struct work_struct *work)
                /* Send scan OID. Use of both OIDs is required to get device
                 * working.
                 */
-               tmp = ccpu2(1);
+               tmp = cpu_to_le32(1);
                rndis_set_oid(usbdev, OID_802_11_BSSID_LIST_SCAN, &tmp,
                                                                sizeof(tmp));
 
@@ -2448,11 +2975,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 {
@@ -2461,18 +2985,16 @@ end:
                        update_jiffies = j;
        }
 
-       queue_delayed_work(priv->workqueue, &priv->stats_work, update_jiffies);
+       queue_delayed_work(priv->workqueue, &priv->dev_poller_work,
+                                                               update_jiffies);
 }
 
-
-static int bcm4320_early_init(struct usbnet *usbdev)
+/*
+ * driver/device initialization
+ */
+static void rndis_copy_module_params(struct usbnet *usbdev)
 {
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
-       char buf[8];
-
-       /* Early initialization settings, setting these won't have effect
-        * if called after generic_rndis_bind().
-        */
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
 
        priv->param_country[0] = modparam_country[0];
        priv->param_country[1] = modparam_country[1];
@@ -2514,6 +3036,32 @@ static int bcm4320_early_init(struct usbnet *usbdev)
                priv->param_workaround_interval = 500;
        else
                priv->param_workaround_interval = modparam_workaround_interval;
+}
+
+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);
+
+       /* 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);
+
+       /* 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",
@@ -2532,28 +3080,50 @@ static int bcm4320_early_init(struct usbnet *usbdev)
        return 0;
 }
 
+/* same as rndis_netdev_ops but with local multicast handler */
+static const struct net_device_ops rndis_wlan_netdev_ops = {
+       .ndo_open               = usbnet_open,
+       .ndo_stop               = usbnet_stop,
+       .ndo_start_xmit         = usbnet_start_xmit,
+       .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,
+};
 
-static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)
+static int rndis_wlan_bind(struct usbnet *usbdev, struct usb_interface *intf)
 {
-       struct rndis_wext_private *priv;
+       struct wiphy *wiphy;
+       struct rndis_wlan_private *priv;
        int retval, len;
        __le32 tmp;
 
-       /* allocate rndis private data */
-       priv = kzalloc(sizeof(struct rndis_wext_private), GFP_KERNEL);
-       if (!priv)
+       /* allocate wiphy and rndis private data
+        * NOTE: We only support a single virtual interface, so wiphy
+        * and wireless_dev are somewhat synonymous for this device.
+        */
+       wiphy = wiphy_new(&rndis_config_ops, sizeof(struct rndis_wlan_private));
+       if (!wiphy)
                return -ENOMEM;
 
+       priv = wiphy_priv(wiphy);
+       usbdev->net->ieee80211_ptr = &priv->wdev;
+       priv->wdev.wiphy = wiphy;
+       priv->wdev.iftype = NL80211_IFTYPE_STATION;
+
        /* These have to be initialized before calling generic_rndis_bind().
-        * Otherwise we'll be in big trouble in rndis_wext_early_init().
+        * Otherwise we'll be in big trouble in rndis_wlan_early_init().
         */
        usbdev->driver_priv = priv;
-       strcpy(priv->name, "IEEE802.11");
-       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->dev_poller_work, rndis_device_poller);
+       INIT_DELAYED_WORK(&priv->scan_work, rndis_get_scan_results);
 
        /* try bind rndis_host */
        retval = generic_rndis_bind(usbdev, intf, FLAG_RNDIS_PHYM_WIRELESS);
@@ -2565,9 +3135,10 @@ static int rndis_wext_bind(struct usbnet *usbdev, struct usb_interface *intf)
         * picks up rssi to closest station instead of to access point).
         *
         * rndis_host wants to avoid all OID as much as possible
-        * so do promisc/multicast handling in rndis_wext.
+        * so do promisc/multicast handling in rndis_wlan.
         */
-       usbdev->net->set_multicast_list = rndis_wext_set_multicast_list;
+       usbdev->net->netdev_ops = &rndis_wlan_netdev_ops;
+
        tmp = RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST;
        retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp,
                                                                sizeof(tmp));
@@ -2583,100 +3154,174 @@ static int rndis_wext_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;
+       wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION)
+                                       | BIT(NL80211_IFTYPE_ADHOC);
+       wiphy->max_scan_ssids = 1;
+
+       /* 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));
+       priv->band.channels = priv->channels;
+       priv->band.n_channels = ARRAY_SIZE(rndis_channels);
+       priv->band.bitrates = priv->rates;
+       priv->band.n_bitrates = ARRAY_SIZE(rndis_rates);
+       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)) {
+               retval = -ENODEV;
+               goto fail;
+       }
 
-       rndis_wext_get_caps(usbdev);
        set_default_iw_params(usbdev);
 
+       /* 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);
+       priv->radio_on = true;
+       disassociate(usbdev, true);
        netif_carrier_off(usbdev->net);
 
-       /* because rndis_command() sleeps we need to use workqueue */
-       priv->workqueue = create_singlethread_workqueue("rndis_wlan");
-       INIT_DELAYED_WORK(&priv->stats_work, rndis_update_wireless_stats);
-       queue_delayed_work(priv->workqueue, &priv->stats_work,
-               round_jiffies_relative(STATS_UPDATE_JIFFIES));
-       INIT_WORK(&priv->work, rndis_wext_worker);
-
        return 0;
 
 fail:
-       kfree(priv);
+       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);
+
+       wiphy_free(wiphy);
        return retval;
 }
 
-
-static void rndis_wext_unbind(struct usbnet *usbdev, struct usb_interface *intf)
+static void rndis_wlan_unbind(struct usbnet *usbdev, struct usb_interface *intf)
 {
-       struct rndis_wext_private *priv = get_rndis_wext_priv(usbdev);
+       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);
-       kfree(priv);
-
        rndis_unbind(usbdev, intf);
-}
 
+       wiphy_unregister(priv->wdev.wiphy);
+       wiphy_free(priv->wdev.wiphy);
+}
 
-static int rndis_wext_reset(struct usbnet *usbdev)
+static int rndis_wlan_reset(struct usbnet *usbdev)
 {
+       struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
+       int retval;
+
+       netdev_dbg(usbdev->net, "%s()\n", __func__);
+
+       retval = rndis_reset(usbdev);
+       if (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->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;
+
+       netdev_dbg(usbdev->net, "%s()\n", __func__);
+
+       retval = disassociate(usbdev, false);
+
+       priv->work_pending = 0;
+       cancel_delayed_work_sync(&priv->dev_poller_work);
+       cancel_delayed_work_sync(&priv->scan_work);
+       cancel_work_sync(&priv->work);
+       flush_workqueue(priv->workqueue);
+
+       if (priv->scan_request) {
+               cfg80211_scan_done(priv->scan_request, true);
+               priv->scan_request = NULL;
+       }
+
+       /* Set current packet filter zero to block receiving data packets from
+          device. */
+       filter = 0;
+       rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &filter,
+                                                               sizeof(filter));
+
+       return retval;
+}
 
 static const struct driver_info        bcm4320b_info = {
        .description =  "Wireless RNDIS device, BCM4320b based",
-       .flags =        FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT,
-       .bind =         rndis_wext_bind,
-       .unbind =       rndis_wext_unbind,
+       .flags =        FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT |
+                               FLAG_AVOID_UNLINK_URBS,
+       .bind =         rndis_wlan_bind,
+       .unbind =       rndis_wlan_unbind,
        .status =       rndis_status,
        .rx_fixup =     rndis_rx_fixup,
        .tx_fixup =     rndis_tx_fixup,
-       .reset =        rndis_wext_reset,
-       .early_init =   bcm4320_early_init,
-       .link_change =  rndis_wext_link_change,
+       .reset =        rndis_wlan_reset,
+       .stop =         rndis_wlan_stop,
+       .early_init =   bcm4320b_early_init,
+       .indication =   rndis_wlan_indication,
 };
 
 static const struct driver_info        bcm4320a_info = {
        .description =  "Wireless RNDIS device, BCM4320a based",
-       .flags =        FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT,
-       .bind =         rndis_wext_bind,
-       .unbind =       rndis_wext_unbind,
+       .flags =        FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT |
+                               FLAG_AVOID_UNLINK_URBS,
+       .bind =         rndis_wlan_bind,
+       .unbind =       rndis_wlan_unbind,
        .status =       rndis_status,
        .rx_fixup =     rndis_rx_fixup,
        .tx_fixup =     rndis_tx_fixup,
-       .reset =        rndis_wext_reset,
-       .early_init =   bcm4320_early_init,
-       .link_change =  rndis_wext_link_change,
+       .reset =        rndis_wlan_reset,
+       .stop =         rndis_wlan_stop,
+       .early_init =   bcm4320a_early_init,
+       .indication =   rndis_wlan_indication,
 };
 
-static const struct driver_info rndis_wext_info = {
+static const struct driver_info rndis_wlan_info = {
        .description =  "Wireless RNDIS device",
-       .flags =        FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT,
-       .bind =         rndis_wext_bind,
-       .unbind =       rndis_wext_unbind,
+       .flags =        FLAG_WLAN | FLAG_FRAMING_RN | FLAG_NO_SETINT |
+                               FLAG_AVOID_UNLINK_URBS,
+       .bind =         rndis_wlan_bind,
+       .unbind =       rndis_wlan_unbind,
        .status =       rndis_status,
        .rx_fixup =     rndis_rx_fixup,
        .tx_fixup =     rndis_tx_fixup,
-       .reset =        rndis_wext_reset,
-       .early_init =   bcm4320_early_init,
-       .link_change =  rndis_wext_link_change,
+       .reset =        rndis_wlan_reset,
+       .stop =         rndis_wlan_stop,
+       .early_init =   bcm4320a_early_init,
+       .indication =   rndis_wlan_indication,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -2786,11 +3431,11 @@ static const struct usb_device_id products [] = {
 {
        /* RNDIS is MSFT's un-official variant of CDC ACM */
        USB_INTERFACE_INFO(USB_CLASS_COMM, 2 /* ACM */, 0x0ff),
-       .driver_info = (unsigned long) &rndis_wext_info,
+       .driver_info = (unsigned long) &rndis_wlan_info,
 }, {
        /* "ActiveSync" is an undocumented variant of RNDIS, used in WM5 */
        USB_INTERFACE_INFO(USB_CLASS_MISC, 1, 1),
-       .driver_info = (unsigned long) &rndis_wext_info,
+       .driver_info = (unsigned long) &rndis_wlan_info,
 },
        { },            // END
 };