Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[linux-3.10.git] / drivers / net / wireless / mwifiex / sta_cmdresp.c
index 97715df..0b09004 100644 (file)
@@ -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;