1 files changed, 27 insertions, 12 deletions

diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 40e025da6bc..b9cd9ed48c4 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -260,6 +260,23 @@ static int mwifiex_cmd_tx_power_cfg(struct host_cmd_ds_command *cmd,
 }
 
 /*
+ * This function prepares command to get RF Tx power.
+ */
+static int mwifiex_cmd_rf_tx_power(struct mwifiex_private *priv,
+                                   struct host_cmd_ds_command *cmd,
+                                   u16 cmd_action, void *data_buf)
+{
+        struct host_cmd_ds_rf_tx_pwr *txp = &cmd->params.txp;
+
+        cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_rf_tx_pwr)
+                                + S_DS_GEN);
+        cmd->command = cpu_to_le16(HostCmd_CMD_RF_TX_PWR);
+        txp->action = cpu_to_le16(cmd_action);
+
+        return 0;
+}
+
+/*
  * This function prepares command to set Host Sleep configuration.
  *
  * Preparation includes -
@@ -793,8 +810,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_mac_reg_access *mac_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*mac_reg) + S_DS_GEN);
-                mac_reg = (struct host_cmd_ds_mac_reg_access *) &cmd->
-                                                                params.mac_reg;
+                mac_reg = &cmd->params.mac_reg;
                 mac_reg->action = cpu_to_le16(cmd_action);
                 mac_reg->offset =
                         cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -806,8 +822,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_bbp_reg_access *bbp_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*bbp_reg) + S_DS_GEN);
-                bbp_reg = (struct host_cmd_ds_bbp_reg_access *)
-                                                        &cmd->params.bbp_reg;
+                bbp_reg = &cmd->params.bbp_reg;
                 bbp_reg->action = cpu_to_le16(cmd_action);
                 bbp_reg->offset =
                         cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -819,8 +834,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_rf_reg_access *rf_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*rf_reg) + S_DS_GEN);
-                rf_reg = (struct host_cmd_ds_rf_reg_access *)
-                                                        &cmd->params.rf_reg;
+                rf_reg = &cmd->params.rf_reg;
                 rf_reg->action = cpu_to_le16(cmd_action);
                 rf_reg->offset = cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
                 rf_reg->value = (u8) le32_to_cpu(reg_rw->value);
@@ -831,8 +845,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_pmic_reg_access *pmic_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*pmic_reg) + S_DS_GEN);
-                pmic_reg = (struct host_cmd_ds_pmic_reg_access *) &cmd->
-                                params.pmic_reg;
+                pmic_reg = &cmd->params.pmic_reg;
                 pmic_reg->action = cpu_to_le16(cmd_action);
                 pmic_reg->offset =
                                 cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -844,8 +857,7 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
                 struct host_cmd_ds_rf_reg_access *cau_reg;
 
                 cmd->size = cpu_to_le16(sizeof(*cau_reg) + S_DS_GEN);
-                cau_reg = (struct host_cmd_ds_rf_reg_access *)
-                                                        &cmd->params.rf_reg;
+                cau_reg = &cmd->params.rf_reg;
                 cau_reg->action = cpu_to_le16(cmd_action);
                 cau_reg->offset =
                                 cpu_to_le16((u16) le32_to_cpu(reg_rw->offset));
@@ -856,7 +868,6 @@ static int mwifiex_cmd_reg_access(struct host_cmd_ds_command *cmd,
         {
                 struct mwifiex_ds_read_eeprom *rd_eeprom = data_buf;
                 struct host_cmd_ds_802_11_eeprom_access *cmd_eeprom =
-                        (struct host_cmd_ds_802_11_eeprom_access *)
                         &cmd->params.eeprom;
 
                 cmd->size = cpu_to_le16(sizeof(*cmd_eeprom) + S_DS_GEN);
@@ -1055,6 +1066,10 @@ int mwifiex_sta_prepare_cmd(struct mwifiex_private *priv, uint16_t cmd_no,
                 ret = mwifiex_cmd_tx_power_cfg(cmd_ptr, cmd_action,
                                                data_buf);
                 break;
+        case HostCmd_CMD_RF_TX_PWR:
+                ret = mwifiex_cmd_rf_tx_power(priv, cmd_ptr, cmd_action,
+                                              data_buf);
+                break;
         case HostCmd_CMD_802_11_PS_MODE_ENH:
                 ret = mwifiex_cmd_enh_power_mode(priv, cmd_ptr, cmd_action,
                                                  (uint16_t)cmd_oid, data_buf);
@@ -1283,7 +1298,7 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
         priv->data_rate = 0;
 
         /* get tx power */
-        ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_TXPWR_CFG,
+        ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_RF_TX_PWR,
                                      HostCmd_ACT_GEN_GET, 0, NULL);
         if (ret)
                 return -1;