11 files changed, 175 insertions, 588 deletions

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index c7a177c62625..fe42137384da 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -48,10 +48,9 @@ static const struct ieee80211_iface_combination mwifiex_iface_comb_ap_sta = {
  *      Others                 -> IEEE80211_HT_PARAM_CHA_SEC_NONE
  */
 static u8
-mwifiex_cfg80211_channel_type_to_sec_chan_offset(enum nl80211_channel_type
-                                                 channel_type)
+mwifiex_chan_type_to_sec_chan_offset(enum nl80211_channel_type chan_type)
 {
-        switch (channel_type) {
+        switch (chan_type) {
         case NL80211_CHAN_NO_HT:
         case NL80211_CHAN_HT20:
                 return IEEE80211_HT_PARAM_CHA_SEC_NONE;
@@ -339,79 +338,6 @@ static int mwifiex_reg_notifier(struct wiphy *wiphy,
 }
 
 /*
- * This function sets the RF channel.
- *
- * This function creates multiple IOCTL requests, populates them accordingly
- * and issues them to set the band/channel and frequency.
- */
-static int
-mwifiex_set_rf_channel(struct mwifiex_private *priv,
-                       struct ieee80211_channel *chan,
-                       enum nl80211_channel_type channel_type)
-{
-        struct mwifiex_chan_freq_power cfp;
-        u32 config_bands = 0;
-        struct wiphy *wiphy = priv->wdev->wiphy;
-        struct mwifiex_adapter *adapter = priv->adapter;
-
-        if (chan) {
-                /* Set appropriate bands */
-                if (chan->band == IEEE80211_BAND_2GHZ) {
-                        if (channel_type == NL80211_CHAN_NO_HT)
-                                if (priv->adapter->config_bands == BAND_B ||
-                                    priv->adapter->config_bands == BAND_G)
-                                        config_bands =
-                                                priv->adapter->config_bands;
-                                else
-                                        config_bands = BAND_B | BAND_G;
-                        else
-                                config_bands = BAND_B | BAND_G | BAND_GN;
-                } else {
-                        if (channel_type == NL80211_CHAN_NO_HT)
-                                config_bands = BAND_A;
-                        else
-                                config_bands = BAND_AN | BAND_A;
-                }
-
-                if (!((config_bands | adapter->fw_bands) &
-                                                ~adapter->fw_bands)) {
-                        adapter->config_bands = config_bands;
-                        if (priv->bss_mode == NL80211_IFTYPE_ADHOC) {
-                                adapter->adhoc_start_band = config_bands;
-                                if ((config_bands & BAND_GN) ||
-                                    (config_bands & BAND_AN))
-                                        adapter->adhoc_11n_enabled = true;
-                                else
-                                        adapter->adhoc_11n_enabled = false;
-                        }
-                }
-                adapter->sec_chan_offset =
-                        mwifiex_cfg80211_channel_type_to_sec_chan_offset
-                        (channel_type);
-                adapter->channel_type = channel_type;
-
-                mwifiex_send_domain_info_cmd_fw(wiphy);
-        }
-
-        wiphy_dbg(wiphy, "info: setting band %d, chan offset %d, mode %d\n",
-                  config_bands, adapter->sec_chan_offset, priv->bss_mode);
-        if (!chan)
-                return 0;
-
-        memset(&cfp, 0, sizeof(cfp));
-        cfp.freq = chan->center_freq;
-        cfp.channel = ieee80211_frequency_to_channel(chan->center_freq);
-
-        if (priv->bss_type == MWIFIEX_BSS_TYPE_STA) {
-                if (mwifiex_bss_set_channel(priv, &cfp))
-                        return -EFAULT;
-                return mwifiex_drv_change_adhoc_chan(priv, cfp.channel);
-        }
-
-        return 0;
-}
-
-/*
  * This function sets the fragmentation threshold.
  *
  * The fragmentation threshold value must lie between MWIFIEX_FRAG_MIN_VALUE
@@ -626,7 +552,7 @@ static int
 mwifiex_dump_station_info(struct mwifiex_private *priv,
                           struct station_info *sinfo)
 {
-        struct mwifiex_rate_cfg rate;
+        u32 rate;
 
         sinfo->filled = STATION_INFO_RX_BYTES | STATION_INFO_TX_BYTES |
                         STATION_INFO_RX_PACKETS | STATION_INFO_TX_PACKETS |
@@ -652,9 +578,9 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
 
         /*
          * Bit 0 in tx_htinfo indicates that current Tx rate is 11n rate. Valid
-         * MCS index values for us are 0 to 7.
+         * MCS index values for us are 0 to 15.
          */
-        if ((priv->tx_htinfo & BIT(0)) && (priv->tx_rate < 8)) {
+        if ((priv->tx_htinfo & BIT(0)) && (priv->tx_rate < 16)) {
                 sinfo->txrate.mcs = priv->tx_rate;
                 sinfo->txrate.flags |= RATE_INFO_FLAGS_MCS;
                 /* 40MHz rate */
@@ -672,7 +598,7 @@ mwifiex_dump_station_info(struct mwifiex_private *priv,
         sinfo->tx_packets = priv->stats.tx_packets;
         sinfo->signal = priv->bcn_rssi_avg;
         /* bit rate is in 500 kb/s units. Convert it to 100kb/s units */
-        sinfo->txrate.legacy = rate.rate * 5;
+        sinfo->txrate.legacy = rate * 5;
 
         if (priv->bss_mode == NL80211_IFTYPE_STATION) {
                 sinfo->filled |= STATION_INFO_BSS_PARAM;
@@ -827,8 +753,8 @@ static const u32 mwifiex_cipher_suites[] = {
 /*
  * CFG802.11 operation handler for setting bit rates.
  *
- * Function selects legacy bang B/G/BG from corresponding bitrates selection.
- * Currently only 2.4GHz band is supported.
+ * Function configures data rates to firmware using bitrate mask
+ * provided by cfg80211.
  */
 static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
                                 struct net_device *dev,
@@ -836,43 +762,36 @@ static int mwifiex_cfg80211_set_bitrate_mask(struct wiphy *wiphy,
                                 const struct cfg80211_bitrate_mask *mask)
 {
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
-        int index = 0, mode = 0, i;
-        struct mwifiex_adapter *adapter = priv->adapter;
+        u16 bitmap_rates[MAX_BITMAP_RATES_SIZE];
+        enum ieee80211_band band;
 
-        /* Currently only 2.4GHz is supported */
-        for (i = 0; i < mwifiex_band_2ghz.n_bitrates; i++) {
-                /*
-                 * Rates below 6 Mbps in the table are CCK rates; 802.11b
-                 * and from 6 they are OFDM; 802.11G
-                 */
-                if (mwifiex_rates[i].bitrate == 60) {
-                        index = 1 << i;
-                        break;
-                }
+        if (!priv->media_connected) {
+                dev_err(priv->adapter->dev,
+                        "Can not set Tx data rate in disconnected state\n");
+                return -EINVAL;
         }
 
-        if (mask->control[IEEE80211_BAND_2GHZ].legacy < index) {
-                mode = BAND_B;
-        } else {
-                mode = BAND_G;
-                if (mask->control[IEEE80211_BAND_2GHZ].legacy % index)
-                        mode |=  BAND_B;
-        }
+        band = mwifiex_band_to_radio_type(priv->curr_bss_params.band);
 
-        if (!((mode | adapter->fw_bands) & ~adapter->fw_bands)) {
-                adapter->config_bands = mode;
-                if (priv->bss_mode == NL80211_IFTYPE_ADHOC) {
-                        adapter->adhoc_start_band = mode;
-                        adapter->adhoc_11n_enabled = false;
-                }
-        }
-        adapter->sec_chan_offset = IEEE80211_HT_PARAM_CHA_SEC_NONE;
-        adapter->channel_type = NL80211_CHAN_NO_HT;
+        memset(bitmap_rates, 0, sizeof(bitmap_rates));
 
-        wiphy_debug(wiphy, "info: device configured in 802.11%s%s mode\n",
-                    (mode & BAND_B) ? "b" : "", (mode & BAND_G) ? "g" : "");
+        /* Fill HR/DSSS rates. */
+        if (band == IEEE80211_BAND_2GHZ)
+                bitmap_rates[0] = mask->control[band].legacy & 0x000f;
 
-        return 0;
+        /* Fill OFDM rates */
+        if (band == IEEE80211_BAND_2GHZ)
+                bitmap_rates[1] = (mask->control[band].legacy & 0x0ff0) >> 4;
+        else
+                bitmap_rates[1] = mask->control[band].legacy;
+
+        /* Fill MCS rates */
+        bitmap_rates[2] = mask->control[band].mcs[0];
+        if (priv->adapter->hw_dev_mcs_support == HT_STREAM_2X2)
+                bitmap_rates[2] |= mask->control[band].mcs[1] << 8;
+
+        return mwifiex_send_cmd_sync(priv, HostCmd_CMD_TX_RATE_CFG,
+                                     HostCmd_ACT_GEN_SET, 0, bitmap_rates);
 }
 
 /*
@@ -1007,6 +926,7 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
 {
         struct mwifiex_uap_bss_param *bss_cfg;
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        u8 config_bands = 0;
 
         if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP)
                 return -1;
@@ -1047,13 +967,25 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
             (u8)ieee80211_frequency_to_channel(params->channel->center_freq);
         bss_cfg->band_cfg = BAND_CONFIG_MANUAL;
 
-        if (mwifiex_set_rf_channel(priv, params->channel,
-                                   params->channel_type)) {
-                kfree(bss_cfg);
-                wiphy_err(wiphy, "Failed to set band config information!\n");
-                return -1;
+        /* Set appropriate bands */
+        if (params->channel->band == IEEE80211_BAND_2GHZ) {
+                if (params->channel_type == NL80211_CHAN_NO_HT)
+                        config_bands = BAND_B | BAND_G;
+                else
+                        config_bands = BAND_B | BAND_G | BAND_GN;
+        } else {
+                if (params->channel_type == NL80211_CHAN_NO_HT)
+                        config_bands = BAND_A;
+                else
+                        config_bands = BAND_AN | BAND_A;
         }
 
+        if (!((config_bands | priv->adapter->fw_bands) &
+              ~priv->adapter->fw_bands))
+                priv->adapter->config_bands = config_bands;
+
+        mwifiex_send_domain_info_cmd_fw(wiphy);
+
         if (mwifiex_set_secure_params(priv, bss_cfg, params)) {
                 kfree(bss_cfg);
                 wiphy_err(wiphy, "Failed to parse secuirty parameters!\n");
@@ -1187,7 +1119,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
         struct cfg80211_ssid req_ssid;
         int ret, auth_type = 0;
         struct cfg80211_bss *bss = NULL;
-        u8 is_scanning_required = 0;
+        u8 is_scanning_required = 0, config_bands = 0;
 
         memset(&req_ssid, 0, sizeof(struct cfg80211_ssid));
 
@@ -1206,9 +1138,19 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid,
         /* disconnect before try to associate */
         mwifiex_deauthenticate(priv, NULL);
 
-        if (channel)
-                ret = mwifiex_set_rf_channel(priv, channel,
-                                                priv->adapter->channel_type);
+        if (channel) {
+                if (mode == NL80211_IFTYPE_STATION) {
+                        if (channel->band == IEEE80211_BAND_2GHZ)
+                                config_bands = BAND_B | BAND_G | BAND_GN;
+                        else
+                                config_bands = BAND_A | BAND_AN;
+
+                        if (!((config_bands | priv->adapter->fw_bands) &
+                              ~priv->adapter->fw_bands))
+                                priv->adapter->config_bands = config_bands;
+                }
+                mwifiex_send_domain_info_cmd_fw(priv->wdev->wiphy);
+        }
 
         /* As this is new association, clear locally stored
          * keys and security related flags */
@@ -1373,6 +1315,76 @@ done:
 }
 
 /*
+ * This function sets following parameters for ibss network.
+ *  -  channel
+ *  -  start band
+ *  -  11n flag
+ *  -  secondary channel offset
+ */
+static int mwifiex_set_ibss_params(struct mwifiex_private *priv,
+                                   struct cfg80211_ibss_params *params)
+{
+        struct wiphy *wiphy = priv->wdev->wiphy;
+        struct mwifiex_adapter *adapter = priv->adapter;
+        int index = 0, i;
+        u8 config_bands = 0;
+
+        if (params->channel->band == IEEE80211_BAND_2GHZ) {
+                if (!params->basic_rates) {
+                        config_bands = BAND_B | BAND_G;
+                } else {
+                        for (i = 0; i < mwifiex_band_2ghz.n_bitrates; i++) {
+                                /*
+                                 * Rates below 6 Mbps in the table are CCK
+                                 * rates; 802.11b and from 6 they are OFDM;
+                                 * 802.11G
+                                 */
+                                if (mwifiex_rates[i].bitrate == 60) {
+                                        index = 1 << i;
+                                        break;
+                                }
+                        }
+
+                        if (params->basic_rates < index) {
+                                config_bands = BAND_B;
+                        } else {
+                                config_bands = BAND_G;
+                                if (params->basic_rates % index)
+                                        config_bands |= BAND_B;
+                        }
+                }
+
+                if (params->channel_type != NL80211_CHAN_NO_HT)
+                        config_bands |= BAND_GN;
+        } else {
+                if (params->channel_type == NL80211_CHAN_NO_HT)
+                        config_bands = BAND_A;
+                else
+                        config_bands = BAND_AN | BAND_A;
+        }
+
+        if (!((config_bands | adapter->fw_bands) & ~adapter->fw_bands)) {
+                adapter->config_bands = config_bands;
+                adapter->adhoc_start_band = config_bands;
+
+                if ((config_bands & BAND_GN) || (config_bands & BAND_AN))
+                        adapter->adhoc_11n_enabled = true;
+                else
+                        adapter->adhoc_11n_enabled = false;
+        }
+
+        adapter->sec_chan_offset =
+                mwifiex_chan_type_to_sec_chan_offset(params->channel_type);
+        priv->adhoc_channel =
+                ieee80211_frequency_to_channel(params->channel->center_freq);
+
+        wiphy_dbg(wiphy, "info: set ibss band %d, chan %d, chan offset %d\n",
+                  config_bands, priv->adhoc_channel, adapter->sec_chan_offset);
+
+        return 0;
+}
+
+/*
  * CFG802.11 operation handler to join an IBSS.
  *
  * This function does not work in any mode other than Ad-Hoc, or if
@@ -1394,6 +1406,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
         wiphy_dbg(wiphy, "info: trying to join to %s and bssid %pM\n",
                   (char *) params->ssid, params->bssid);
 
+        mwifiex_set_ibss_params(priv, params);
+
         ret = mwifiex_cfg80211_assoc(priv, params->ssid_len, params->ssid,
                                      params->bssid, priv->bss_mode,
                                      params->channel, NULL, params->privacy);
@@ -1440,9 +1454,10 @@ mwifiex_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev)
  * it also informs the results.
  */
 static int
-mwifiex_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev,
+mwifiex_cfg80211_scan(struct wiphy *wiphy,
                       struct cfg80211_scan_request *request)
 {
+        struct net_device *dev = request->wdev->netdev;
         struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
         int i;
         struct ieee80211_channel *chan;
@@ -1576,11 +1591,11 @@ mwifiex_setup_ht_caps(struct ieee80211_sta_ht_cap *ht_info,
 /*
  *  create a new virtual interface with the given name
  */
-struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
-                                            char *name,
-                                            enum nl80211_iftype type,
-                                            u32 *flags,
-                                            struct vif_params *params)
+struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
+                                              char *name,
+                                              enum nl80211_iftype type,
+                                              u32 *flags,
+                                              struct vif_params *params)
 {
         struct mwifiex_adapter *adapter = mwifiex_cfg80211_get_adapter(wiphy);
         struct mwifiex_private *priv;
@@ -1701,16 +1716,16 @@ struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
 #ifdef CONFIG_DEBUG_FS
         mwifiex_dev_debugfs_init(priv);
 #endif
-        return dev;
+        return wdev;
 }
 EXPORT_SYMBOL_GPL(mwifiex_add_virtual_intf);
 
 /*
  * del_virtual_intf: remove the virtual interface determined by dev
  */
-int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)
+int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 {
-        struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);
+        struct mwifiex_private *priv = mwifiex_netdev_get_priv(wdev->netdev);
 
 #ifdef CONFIG_DEBUG_FS
         mwifiex_dev_debugfs_remove(priv);
@@ -1722,11 +1737,11 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev)
         if (netif_carrier_ok(priv->netdev))
                 netif_carrier_off(priv->netdev);
 
-        if (dev->reg_state == NETREG_REGISTERED)
-                unregister_netdevice(dev);
+        if (wdev->netdev->reg_state == NETREG_REGISTERED)
+                unregister_netdevice(wdev->netdev);
 
-        if (dev->reg_state == NETREG_UNREGISTERED)
-                free_netdev(dev);
+        if (wdev->netdev->reg_state == NETREG_UNREGISTERED)
+                free_netdev(wdev->netdev);
 
         /* Clear the priv in adapter */
         priv->netdev = NULL;
@@ -1818,6 +1833,8 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
         wiphy->available_antennas_tx = BIT(adapter->number_of_antenna) - 1;
         wiphy->available_antennas_rx = BIT(adapter->number_of_antenna) - 1;
 
+        wiphy->features = NL80211_FEATURE_HT_IBSS;
+
         /* Reserve space for mwifiex specific private data for BSS */
         wiphy->bss_priv_size = sizeof(struct mwifiex_bss_priv);
 
diff --git a/drivers/net/wireless/mwifiex/cfp.c b/drivers/net/wireless/mwifiex/cfp.c
index 560871b0e236..f69300f93f42 100644
--- a/drivers/net/wireless/mwifiex/cfp.c
+++ b/drivers/net/wireless/mwifiex/cfp.c
@@ -167,23 +167,6 @@ u32 mwifiex_index_to_data_rate(struct mwifiex_private *priv, u8 index,
 }
 
 /*
- * This function maps a data rate value into corresponding index in supported
- * rates table.
- */
-u8 mwifiex_data_rate_to_index(u32 rate)
-{
-        u16 *ptr;
-
-        if (rate) {
-                ptr = memchr(mwifiex_data_rates, rate,
-                                sizeof(mwifiex_data_rates));
-                if (ptr)
-                        return (u8) (ptr - mwifiex_data_rates);
-        }
-        return 0;
-}
-
-/*
  * This function returns the current active data rates.
  *
  * The result may vary depending upon connection status.
@@ -277,20 +260,6 @@ mwifiex_is_rate_auto(struct mwifiex_private *priv)
 }
 
 /*
- * This function converts rate bitmap into rate index.
- */
-int mwifiex_get_rate_index(u16 *rate_bitmap, int size)
-{
-        int i;
-
-        for (i = 0; i < size * 8; i++)
-                if (rate_bitmap[i / 16] & (1 << (i % 16)))
-                        return i;
-
-        return 0;
-}
-
-/*
  * This function gets the supported data rates.
  *
  * The function works in both Ad-Hoc and infra mode by printing the
diff --git a/drivers/net/wireless/mwifiex/decl.h b/drivers/net/wireless/mwifiex/decl.h
index f918f66e5e27..070ef25f5186 100644
--- a/drivers/net/wireless/mwifiex/decl.h
+++ b/drivers/net/wireless/mwifiex/decl.h
@@ -41,16 +41,7 @@
 #define MWIFIEX_AMPDU_DEF_RXWINSIZE        16
 #define MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT  0xffff
 
-#define MWIFIEX_RATE_INDEX_HRDSSS0 0
-#define MWIFIEX_RATE_INDEX_HRDSSS3 3
-#define MWIFIEX_RATE_INDEX_OFDM0   4
-#define MWIFIEX_RATE_INDEX_OFDM7   11
-#define MWIFIEX_RATE_INDEX_MCS0    12
-
-#define MWIFIEX_RATE_BITMAP_OFDM0  16
-#define MWIFIEX_RATE_BITMAP_OFDM7  23
 #define MWIFIEX_RATE_BITMAP_MCS0   32
-#define MWIFIEX_RATE_BITMAP_MCS127 159
 
 #define MWIFIEX_RX_DATA_BUF_SIZE     (4 * 1024)
 #define MWIFIEX_RX_CMD_BUF_SIZE      (2 * 1024)
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h
index 14e985d01dee..e831b440a24a 100644
--- a/drivers/net/wireless/mwifiex/fw.h
+++ b/drivers/net/wireless/mwifiex/fw.h
@@ -225,7 +225,6 @@ enum MWIFIEX_802_11_PRIVACY_FILTER {
 #define HostCmd_CMD_BBP_REG_ACCESS                    0x001a
 #define HostCmd_CMD_RF_REG_ACCESS                     0x001b
 #define HostCmd_CMD_PMIC_REG_ACCESS                   0x00ad
-#define HostCmd_CMD_802_11_RF_CHANNEL                 0x001d
 #define HostCmd_CMD_RF_TX_PWR                         0x001e
 #define HostCmd_CMD_RF_ANTENNA                        0x0020
 #define HostCmd_CMD_802_11_DEAUTHENTICATE             0x0024
@@ -1292,14 +1291,6 @@ struct host_cmd_tlv_channel_band {
         u8 channel;
 } __packed;
 
-struct host_cmd_ds_802_11_rf_channel {
-        __le16 action;
-        __le16 current_channel;
-        __le16 rf_type;
-        __le16 reserved;
-        u8 reserved_1[32];
-} __packed;
-
 struct host_cmd_ds_version_ext {
         u8 version_str_sel;
         char version_str[128];
@@ -1384,7 +1375,6 @@ struct host_cmd_ds_command {
                 struct host_cmd_ds_802_11_rssi_info rssi_info;
                 struct host_cmd_ds_802_11_rssi_info_rsp rssi_info_rsp;
                 struct host_cmd_ds_802_11_snmp_mib smib;
-                struct host_cmd_ds_802_11_rf_channel rf_channel;
                 struct host_cmd_ds_tx_rate_query tx_rate;
                 struct host_cmd_ds_tx_rate_cfg tx_rate_cfg;
                 struct host_cmd_ds_txpwr_cfg txp_cfg;
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index b543a4d82ff3..21fdc6c02775 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -344,7 +344,6 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
         adapter->adhoc_awake_period = 0;
         memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));
         adapter->arp_filter_size = 0;
-        adapter->channel_type = NL80211_CHAN_HT20;
         adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;
 }
 
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h
index e121294cc1ac..50191539bb32 100644
--- a/drivers/net/wireless/mwifiex/ioctl.h
+++ b/drivers/net/wireless/mwifiex/ioctl.h
@@ -225,12 +225,6 @@ struct mwifiex_ds_encrypt_key {
         u8 wapi_rxpn[WAPI_RXPN_LEN];
 };
 
-struct mwifiex_rate_cfg {
-        u32 action;
-        u32 is_rate_auto;
-        u32 rate;
-};
-
 struct mwifiex_power_cfg {
         u32 is_power_auto;
         u32 power_level;
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index f0219efc8953..46803621d015 100644
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -377,7 +377,7 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
         goto done;
 
 err_add_intf:
-        mwifiex_del_virtual_intf(adapter->wiphy, priv->netdev);
+        mwifiex_del_virtual_intf(adapter->wiphy, priv->wdev);
         rtnl_unlock();
 err_init_fw:
         pr_debug("info: %s: unregister device\n", __func__);
@@ -844,7 +844,7 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem)
 
                 rtnl_lock();
                 if (priv->wdev && priv->netdev)
-                        mwifiex_del_virtual_intf(adapter->wiphy, priv->netdev);
+                        mwifiex_del_virtual_intf(adapter->wiphy, priv->wdev);
                 rtnl_unlock();
         }
 
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
index 9e636535cbf6..e7c2a82fd610 100644
--- a/drivers/net/wireless/mwifiex/main.h
+++ b/drivers/net/wireless/mwifiex/main.h
@@ -678,7 +678,6 @@ struct mwifiex_adapter {
         u8 hw_dev_mcs_support;
         u8 adhoc_11n_enabled;
         u8 sec_chan_offset;
-        enum nl80211_channel_type channel_type;
         struct mwifiex_dbg dbg;
         u8 arp_filter[ARP_FILTER_MAX_BUF_SIZE];
         u32 arp_filter_size;
@@ -824,9 +823,7 @@ int mwifiex_cmd_append_vsie_tlv(struct mwifiex_private *priv, u16 vsie_mask,
 u32 mwifiex_get_active_data_rates(struct mwifiex_private *priv,
                                     u8 *rates);
 u32 mwifiex_get_supported_rates(struct mwifiex_private *priv, u8 *rates);
-u8 mwifiex_data_rate_to_index(u32 rate);
 u8 mwifiex_is_rate_auto(struct mwifiex_private *priv);
-int mwifiex_get_rate_index(u16 *rateBitmap, int size);
 extern u16 region_code_index[MWIFIEX_MAX_REGION_CODE];
 void mwifiex_save_curr_bcn(struct mwifiex_private *priv);
 void mwifiex_free_curr_bcn(struct mwifiex_private *priv);
@@ -945,16 +942,13 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
 int mwifiex_cancel_hs(struct mwifiex_private *priv, int cmd_type);
 int mwifiex_enable_hs(struct mwifiex_adapter *adapter);
 int mwifiex_disable_auto_ds(struct mwifiex_private *priv);
-int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,
-                              struct mwifiex_rate_cfg *rate);
+int mwifiex_drv_get_data_rate(struct mwifiex_private *priv, u32 *rate);
 int mwifiex_request_scan(struct mwifiex_private *priv,
                          struct cfg80211_ssid *req_ssid);
 int mwifiex_scan_networks(struct mwifiex_private *priv,
                           const struct mwifiex_user_scan_cfg *user_scan_in);
 int mwifiex_set_radio(struct mwifiex_private *priv, u8 option);
 
-int mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, u16 channel);
-
 int mwifiex_set_encode(struct mwifiex_private *priv, const u8 *key,
                        int key_len, u8 key_index, const u8 *mac_addr,
                        int disable);
@@ -993,8 +987,6 @@ int mwifiex_set_tx_power(struct mwifiex_private *priv,
 
 int mwifiex_main_process(struct mwifiex_adapter *);
 
-int mwifiex_bss_set_channel(struct mwifiex_private *,
-                            struct mwifiex_chan_freq_power *cfp);
 int mwifiex_get_bss_info(struct mwifiex_private *,
                          struct mwifiex_bss_info *);
 int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
@@ -1005,10 +997,12 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter,
 int mwifiex_check_network_compatibility(struct mwifiex_private *priv,
                                         struct mwifiex_bssdescriptor *bss_desc);
 
-struct net_device *mwifiex_add_virtual_intf(struct wiphy *wiphy,
-                                        char *name, enum nl80211_iftype type,
-                                        u32 *flags, struct vif_params *params);
-int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev);
+struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy,
+                                              char *name,
+                                              enum nl80211_iftype type,
+                                              u32 *flags,
+                                              struct vif_params *params);
+int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev);
 
 void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config);
 
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 225d4c776177..df3a33c530cf 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -745,40 +745,6 @@ static int mwifiex_cmd_802_11d_domain_info(struct mwifiex_private *priv,
 }
 
 /*
- * This function prepares command to set/get RF channel.
- *
- * Preparation includes -
- *      - Setting command ID, action and proper size
- *      - Setting RF type and current RF channel (for SET only)
- *      - Ensuring correct endian-ness
- */
-static int mwifiex_cmd_802_11_rf_channel(struct mwifiex_private *priv,
-                                         struct host_cmd_ds_command *cmd,
-                                         u16 cmd_action, u16 *channel)
-{
-        struct host_cmd_ds_802_11_rf_channel *rf_chan =
-                &cmd->params.rf_channel;
-        uint16_t rf_type = le16_to_cpu(rf_chan->rf_type);
-
-        cmd->command = cpu_to_le16(HostCmd_CMD_802_11_RF_CHANNEL);
-        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_802_11_rf_channel)
-                                + S_DS_GEN);
-
-        if (cmd_action == HostCmd_ACT_GEN_SET) {
-                if ((priv->adapter->adhoc_start_band & BAND_A) ||
-                    (priv->adapter->adhoc_start_band & BAND_AN))
-                        rf_chan->rf_type =
-                                cpu_to_le16(HostCmd_SCAN_RADIO_TYPE_A);
-
-                rf_type = le16_to_cpu(rf_chan->rf_type);
-                SET_SECONDARYCHAN(rf_type, priv->adapter->sec_chan_offset);
-                rf_chan->current_channel = cpu_to_le16(*channel);
-        }
-        rf_chan->action = cpu_to_le16(cmd_action);
-        return 0;
-}
-
-/*
  * This function prepares command to set/get IBSS coalescing status.
  *
  * Preparation includes -
@@ -1169,10 +1135,6 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
                                     S_DS_GEN);
                 ret = 0;
                 break;
-        case HostCmd_CMD_802_11_RF_CHANNEL:
-                ret = mwifiex_cmd_802_11_rf_channel(priv, cmd_ptr, cmd_action,
-                                                    data_buf);
-                break;
         case HostCmd_CMD_FUNC_INIT:
                 if (priv->adapter->hw_status == MWIFIEX_HW_STATUS_RESET)
                         priv->adapter->hw_status = MWIFIEX_HW_STATUS_READY;
diff --git a/drivers/net/wireless/mwifiex/sta_cmdresp.c b/drivers/net/wireless/mwifiex/sta_cmdresp.c
index 97715dfbdf58..0b09004ebb25 100644
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@ -267,12 +267,10 @@ static int mwifiex_ret_get_log(struct mwifiex_private *priv,
  *
  * Based on the new rate bitmaps, the function re-evaluates if
  * auto data rate has been activated. If not, it sends another
- * query to the firmware to get the current Tx data rate and updates
- * the driver value.
+ * query to the firmware to get the current Tx data rate.
  */
 static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
-                                   struct host_cmd_ds_command *resp,
-                                   struct mwifiex_rate_cfg *ds_rate)
+                                   struct host_cmd_ds_command *resp)
 {
         struct host_cmd_ds_tx_rate_cfg *rate_cfg = &resp->params.tx_rate_cfg;
         struct mwifiex_rate_scope *rate_scope;
@@ -280,7 +278,6 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
         u16 tlv, tlv_buf_len;
         u8 *tlv_buf;
         u32 i;
-        int ret = 0;
 
         tlv_buf = ((u8 *)rate_cfg) +
                         sizeof(struct host_cmd_ds_tx_rate_cfg);
@@ -318,33 +315,11 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
         if (priv->is_data_rate_auto)
                 priv->data_rate = 0;
         else
-                ret = mwifiex_send_cmd_async(priv,
-                                          HostCmd_CMD_802_11_TX_RATE_QUERY,
-                                          HostCmd_ACT_GEN_GET, 0, NULL);
-
-        if (!ds_rate)
-                return ret;
-
-        if (le16_to_cpu(rate_cfg->action) == HostCmd_ACT_GEN_GET) {
-                if (priv->is_data_rate_auto) {
-                        ds_rate->is_rate_auto = 1;
-                return ret;
-        }
-        ds_rate->rate = mwifiex_get_rate_index(priv->bitmap_rates,
-                                               sizeof(priv->bitmap_rates));
-
-        if (ds_rate->rate >= MWIFIEX_RATE_BITMAP_OFDM0 &&
-            ds_rate->rate <= MWIFIEX_RATE_BITMAP_OFDM7)
-                ds_rate->rate -= (MWIFIEX_RATE_BITMAP_OFDM0 -
-                                  MWIFIEX_RATE_INDEX_OFDM0);
-
-        if (ds_rate->rate >= MWIFIEX_RATE_BITMAP_MCS0 &&
-            ds_rate->rate <= MWIFIEX_RATE_BITMAP_MCS127)
-                ds_rate->rate -= (MWIFIEX_RATE_BITMAP_MCS0 -
-                                  MWIFIEX_RATE_INDEX_MCS0);
-        }
+                return mwifiex_send_cmd_async(priv,
+                                              HostCmd_CMD_802_11_TX_RATE_QUERY,
+                                              HostCmd_ACT_GEN_GET, 0, NULL);
 
-        return ret;
+        return 0;
 }
 
 /*
@@ -656,34 +631,6 @@ static int mwifiex_ret_802_11d_domain_info(struct mwifiex_private *priv,
 }
 
 /*
- * This function handles the command response of get RF channel.
- *
- * Handling includes changing the header fields into CPU format
- * and saving the new channel in driver.
- */
-static int mwifiex_ret_802_11_rf_channel(struct mwifiex_private *priv,
-                                         struct host_cmd_ds_command *resp,
-                                         u16 *data_buf)
-{
-        struct host_cmd_ds_802_11_rf_channel *rf_channel =
-                &resp->params.rf_channel;
-        u16 new_channel = le16_to_cpu(rf_channel->current_channel);
-
-        if (priv->curr_bss_params.bss_descriptor.channel != new_channel) {
-                dev_dbg(priv->adapter->dev, "cmd: Channel Switch: %d to %d\n",
-                        priv->curr_bss_params.bss_descriptor.channel,
-                        new_channel);
-                /* Update the channel again */
-                priv->curr_bss_params.bss_descriptor.channel = new_channel;
-        }
-
-        if (data_buf)
-                *data_buf = new_channel;
-
-        return 0;
-}
-
-/*
  * This function handles the command response of get extended version.
  *
  * Handling includes forming the extended version string and sending it
@@ -878,7 +825,7 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
                 ret = mwifiex_ret_mac_multicast_adr(priv, resp);
                 break;
         case HostCmd_CMD_TX_RATE_CFG:
-                ret = mwifiex_ret_tx_rate_cfg(priv, resp, data_buf);
+                ret = mwifiex_ret_tx_rate_cfg(priv, resp);
                 break;
         case HostCmd_CMD_802_11_SCAN:
                 ret = mwifiex_ret_802_11_scan(priv, resp);
@@ -929,9 +876,6 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no,
         case HostCmd_CMD_802_11_TX_RATE_QUERY:
                 ret = mwifiex_ret_802_11_tx_rate_query(priv, resp);
                 break;
-        case HostCmd_CMD_802_11_RF_CHANNEL:
-                ret = mwifiex_ret_802_11_rf_channel(priv, resp, data_buf);
-                break;
         case HostCmd_CMD_VERSION_EXT:
                 ret = mwifiex_ret_ver_ext(priv, resp, data_buf);
                 break;
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c
index f2fd2423214f..fb2136089a22 100644
--- a/drivers/net/wireless/mwifiex/sta_ioctl.c
+++ b/drivers/net/wireless/mwifiex/sta_ioctl.c
@@ -497,297 +497,24 @@ int mwifiex_disable_auto_ds(struct mwifiex_private *priv)
 EXPORT_SYMBOL_GPL(mwifiex_disable_auto_ds);
 
 /*
- * IOCTL request handler to set/get active channel.
- *
- * This function performs validity checking on channel/frequency
- * compatibility and returns failure if not valid.
- */
-int mwifiex_bss_set_channel(struct mwifiex_private *priv,
-                            struct mwifiex_chan_freq_power *chan)
-{
-        struct mwifiex_adapter *adapter = priv->adapter;
-        struct mwifiex_chan_freq_power *cfp = NULL;
-
-        if (!chan)
-                return -1;
-
-        if (!chan->channel && !chan->freq)
-                return -1;
-        if (adapter->adhoc_start_band & BAND_AN)
-                adapter->adhoc_start_band = BAND_G | BAND_B | BAND_GN;
-        else if (adapter->adhoc_start_band & BAND_A)
-                adapter->adhoc_start_band = BAND_G | BAND_B;
-        if (chan->channel) {
-                if (chan->channel <= MAX_CHANNEL_BAND_BG)
-                        cfp = mwifiex_get_cfp(priv, 0, (u16) chan->channel, 0);
-                if (!cfp) {
-                        cfp = mwifiex_get_cfp(priv, BAND_A,
-                                              (u16) chan->channel, 0);
-                        if (cfp) {
-                                if (adapter->adhoc_11n_enabled)
-                                        adapter->adhoc_start_band = BAND_A
-                                                                    | BAND_AN;
-                                else
-                                        adapter->adhoc_start_band = BAND_A;
-                        }
-                }
-        } else {
-                if (chan->freq <= MAX_FREQUENCY_BAND_BG)
-                        cfp = mwifiex_get_cfp(priv, 0, 0, chan->freq);
-                if (!cfp) {
-                        cfp = mwifiex_get_cfp(priv, BAND_A, 0, chan->freq);
-                        if (cfp) {
-                                if (adapter->adhoc_11n_enabled)
-                                        adapter->adhoc_start_band = BAND_A
-                                                                    | BAND_AN;
-                                else
-                                        adapter->adhoc_start_band = BAND_A;
-                        }
-                }
-        }
-        if (!cfp || !cfp->channel) {
-                dev_err(adapter->dev, "invalid channel/freq\n");
-                return -1;
-        }
-        priv->adhoc_channel = (u8) cfp->channel;
-        chan->channel = cfp->channel;
-        chan->freq = cfp->freq;
-
-        return 0;
-}
-
-/*
- * IOCTL request handler to set/get Ad-Hoc channel.
- *
- * This function prepares the correct firmware command and
- * issues it to set or get the ad-hoc channel.
- */
-static int mwifiex_bss_ioctl_ibss_channel(struct mwifiex_private *priv,
-                                          u16 action, u16 *channel)
-{
-        if (action == HostCmd_ACT_GEN_GET) {
-                if (!priv->media_connected) {
-                        *channel = priv->adhoc_channel;
-                        return 0;
-                }
-        } else {
-                priv->adhoc_channel = (u8) *channel;
-        }
-
-        return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_RF_CHANNEL,
-                                     action, 0, channel);
-}
-
-/*
- * IOCTL request handler to change Ad-Hoc channel.
- *
- * This function allocates the IOCTL request buffer, fills it
- * with requisite parameters and calls the IOCTL handler.
- *
- * The function follows the following steps to perform the change -
- *      - Get current IBSS information
- *      - Get current channel
- *      - If no change is required, return
- *      - If not connected, change channel and return
- *      - If connected,
- *          - Disconnect
- *          - Change channel
- *          - Perform specific SSID scan with same SSID
- *          - Start/Join the IBSS
- */
-int
-mwifiex_drv_change_adhoc_chan(struct mwifiex_private *priv, u16 channel)
-{
-        int ret;
-        struct mwifiex_bss_info bss_info;
-        struct mwifiex_ssid_bssid ssid_bssid;
-        u16 curr_chan = 0;
-        struct cfg80211_bss *bss = NULL;
-        struct ieee80211_channel *chan;
-        enum ieee80211_band band;
-
-        memset(&bss_info, 0, sizeof(bss_info));
-
-        /* Get BSS information */
-        if (mwifiex_get_bss_info(priv, &bss_info))
-                return -1;
-
-        /* Get current channel */
-        ret = mwifiex_bss_ioctl_ibss_channel(priv, HostCmd_ACT_GEN_GET,
-                                             &curr_chan);
-
-        if (curr_chan == channel) {
-                ret = 0;
-                goto done;
-        }
-        dev_dbg(priv->adapter->dev, "cmd: updating channel from %d to %d\n",
-                curr_chan, channel);
-
-        if (!bss_info.media_connected) {
-                ret = 0;
-                goto done;
-        }
-
-        /* Do disonnect */
-        memset(&ssid_bssid, 0, ETH_ALEN);
-        ret = mwifiex_deauthenticate(priv, ssid_bssid.bssid);
-
-        ret = mwifiex_bss_ioctl_ibss_channel(priv, HostCmd_ACT_GEN_SET,
-                                             &channel);
-
-        /* Do specific SSID scanning */
-        if (mwifiex_request_scan(priv, &bss_info.ssid)) {
-                ret = -1;
-                goto done;
-        }
-
-        band = mwifiex_band_to_radio_type(priv->curr_bss_params.band);
-        chan = __ieee80211_get_channel(priv->wdev->wiphy,
-                                       ieee80211_channel_to_frequency(channel,
-                                                                      band));
-
-        /* Find the BSS we want using available scan results */
-        bss = cfg80211_get_bss(priv->wdev->wiphy, chan, bss_info.bssid,
-                               bss_info.ssid.ssid, bss_info.ssid.ssid_len,
-                               WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
-        if (!bss)
-                wiphy_warn(priv->wdev->wiphy, "assoc: bss %pM not in scan results\n",
-                           bss_info.bssid);
-
-        ret = mwifiex_bss_start(priv, bss, &bss_info.ssid);
-done:
-        return ret;
-}
-
-/*
- * IOCTL request handler to get rate.
- *
- * This function prepares the correct firmware command and
- * issues it to get the current rate if it is connected,
- * otherwise, the function returns the lowest supported rate
- * for the band.
- */
-static int mwifiex_rate_ioctl_get_rate_value(struct mwifiex_private *priv,
-                                             struct mwifiex_rate_cfg *rate_cfg)
-{
-        rate_cfg->is_rate_auto = priv->is_data_rate_auto;
-        return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_TX_RATE_QUERY,
-                                     HostCmd_ACT_GEN_GET, 0, NULL);
-}
-
-/*
- * IOCTL request handler to set rate.
- *
- * This function prepares the correct firmware command and
- * issues it to set the current rate.
- *
- * The function also performs validation checking on the supplied value.
- */
-static int mwifiex_rate_ioctl_set_rate_value(struct mwifiex_private *priv,
-                                             struct mwifiex_rate_cfg *rate_cfg)
-{
-        u8 rates[MWIFIEX_SUPPORTED_RATES];
-        u8 *rate;
-        int rate_index, ret;
-        u16 bitmap_rates[MAX_BITMAP_RATES_SIZE];
-        u32 i;
-        struct mwifiex_adapter *adapter = priv->adapter;
-
-        if (rate_cfg->is_rate_auto) {
-                memset(bitmap_rates, 0, sizeof(bitmap_rates));
-                /* Support all HR/DSSS rates */
-                bitmap_rates[0] = 0x000F;
-                /* Support all OFDM rates */
-                bitmap_rates[1] = 0x00FF;
-                /* Support all HT-MCSs rate */
-                for (i = 0; i < ARRAY_SIZE(priv->bitmap_rates) - 3; i++)
-                        bitmap_rates[i + 2] = 0xFFFF;
-                bitmap_rates[9] = 0x3FFF;
-        } else {
-                memset(rates, 0, sizeof(rates));
-                mwifiex_get_active_data_rates(priv, rates);
-                rate = rates;
-                for (i = 0; (rate[i] && i < MWIFIEX_SUPPORTED_RATES); i++) {
-                        dev_dbg(adapter->dev, "info: rate=%#x wanted=%#x\n",
-                                rate[i], rate_cfg->rate);
-                        if ((rate[i] & 0x7f) == (rate_cfg->rate & 0x7f))
-                                break;
-                }
-                if ((i == MWIFIEX_SUPPORTED_RATES) || !rate[i]) {
-                        dev_err(adapter->dev, "fixed data rate %#x is out "
-                               "of range\n", rate_cfg->rate);
-                        return -1;
-                }
-                memset(bitmap_rates, 0, sizeof(bitmap_rates));
-
-                rate_index = mwifiex_data_rate_to_index(rate_cfg->rate);
-
-                /* Only allow b/g rates to be set */
-                if (rate_index >= MWIFIEX_RATE_INDEX_HRDSSS0 &&
-                    rate_index <= MWIFIEX_RATE_INDEX_HRDSSS3) {
-                        bitmap_rates[0] = 1 << rate_index;
-                } else {
-                        rate_index -= 1; /* There is a 0x00 in the table */
-                        if (rate_index >= MWIFIEX_RATE_INDEX_OFDM0 &&
-                            rate_index <= MWIFIEX_RATE_INDEX_OFDM7)
-                                bitmap_rates[1] = 1 << (rate_index -
-                                                   MWIFIEX_RATE_INDEX_OFDM0);
-                }
-        }
-
-        ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_TX_RATE_CFG,
-                                    HostCmd_ACT_GEN_SET, 0, bitmap_rates);
-
-        return ret;
-}
-
-/*
- * IOCTL request handler to set/get rate.
- *
- * This function can be used to set/get either the rate value or the
- * rate index.
- */
-static int mwifiex_rate_ioctl_cfg(struct mwifiex_private *priv,
-                                  struct mwifiex_rate_cfg *rate_cfg)
-{
-        int status;
-
-        if (!rate_cfg)
-                return -1;
-
-        if (rate_cfg->action == HostCmd_ACT_GEN_GET)
-                status = mwifiex_rate_ioctl_get_rate_value(priv, rate_cfg);
-        else
-                status = mwifiex_rate_ioctl_set_rate_value(priv, rate_cfg);
-
-        return status;
-}
-
-/*
  * Sends IOCTL request to get the data rate.
  *
  * This function allocates the IOCTL request buffer, fills it
  * with requisite parameters and calls the IOCTL handler.
  */
-int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,
-                              struct mwifiex_rate_cfg *rate)
+int mwifiex_drv_get_data_rate(struct mwifiex_private *priv, u32 *rate)
 {
         int ret;
 
-        memset(rate, 0, sizeof(struct mwifiex_rate_cfg));
-        rate->action = HostCmd_ACT_GEN_GET;
-        ret = mwifiex_rate_ioctl_cfg(priv, rate);
+        ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_TX_RATE_QUERY,
+                                    HostCmd_ACT_GEN_GET, 0, NULL);
 
         if (!ret) {
-                if (rate->is_rate_auto)
-                        rate->rate = mwifiex_index_to_data_rate(priv,
-                                                                priv->tx_rate,
-                                                                priv->tx_htinfo
-                                                                );
+                if (priv->is_data_rate_auto)
+                        *rate = mwifiex_index_to_data_rate(priv, priv->tx_rate,
+                                                           priv->tx_htinfo);
                 else
-                        rate->rate = priv->data_rate;
-        } else {
-                ret = -1;
+                        *rate = priv->data_rate;
         }
 
         return ret;