aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/sta_cmd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/mwifiex/sta_cmd.c')
-rw-r--r--drivers/net/wireless/mwifiex/sta_cmd.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_cmd.c b/drivers/net/wireless/mwifiex/sta_cmd.c
index 19de6524d42..dec496369b9 100644
--- a/drivers/net/wireless/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/mwifiex/sta_cmd.c
@@ -1135,65 +1135,66 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
1135 1135
1136 if (first_sta) { 1136 if (first_sta) {
1137 1137
1138 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_FUNC_INIT, 1138 ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_FUNC_INIT,
1139 HostCmd_ACT_GEN_SET, 0, NULL, NULL); 1139 HostCmd_ACT_GEN_SET, 0, NULL);
1140 if (ret) 1140 if (ret)
1141 return -1; 1141 return -1;
1142 /* Read MAC address from HW */ 1142 /* Read MAC address from HW */
1143 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_GET_HW_SPEC, 1143 ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_GET_HW_SPEC,
1144 HostCmd_ACT_GEN_GET, 0, NULL, NULL); 1144 HostCmd_ACT_GEN_GET, 0, NULL);
1145 if (ret) 1145 if (ret)
1146 return -1; 1146 return -1;
1147 1147
1148 /* Reconfigure tx buf size */ 1148 /* Reconfigure tx buf size */
1149 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_RECONFIGURE_TX_BUFF, 1149 ret = mwifiex_send_cmd_async(priv,
1150 HostCmd_ACT_GEN_SET, 0, NULL, 1150 HostCmd_CMD_RECONFIGURE_TX_BUFF,
1151 &priv->adapter->tx_buf_size); 1151 HostCmd_ACT_GEN_SET, 0,
1152 &priv->adapter->tx_buf_size);
1152 if (ret) 1153 if (ret)
1153 return -1; 1154 return -1;
1154 1155
1155 /* Enable IEEE PS by default */ 1156 /* Enable IEEE PS by default */
1156 priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP; 1157 priv->adapter->ps_mode = MWIFIEX_802_11_POWER_MODE_PSP;
1157 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_PS_MODE_ENH, 1158 ret = mwifiex_send_cmd_async(priv,
1158 EN_AUTO_PS, BITMAP_STA_PS, NULL, 1159 HostCmd_CMD_802_11_PS_MODE_ENH,
1159 NULL); 1160 EN_AUTO_PS, BITMAP_STA_PS, NULL);
1160 if (ret) 1161 if (ret)
1161 return -1; 1162 return -1;
1162 } 1163 }
1163 1164
1164 /* get tx rate */ 1165 /* get tx rate */
1165 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_TX_RATE_CFG, 1166 ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_TX_RATE_CFG,
1166 HostCmd_ACT_GEN_GET, 0, NULL, NULL); 1167 HostCmd_ACT_GEN_GET, 0, NULL);
1167 if (ret) 1168 if (ret)
1168 return -1; 1169 return -1;
1169 priv->data_rate = 0; 1170 priv->data_rate = 0;
1170 1171
1171 /* get tx power */ 1172 /* get tx power */
1172 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_TXPWR_CFG, 1173 ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_TXPWR_CFG,
1173 HostCmd_ACT_GEN_GET, 0, NULL, NULL); 1174 HostCmd_ACT_GEN_GET, 0, NULL);
1174 if (ret) 1175 if (ret)
1175 return -1; 1176 return -1;
1176 1177
1177 /* set ibss coalescing_status */ 1178 /* set ibss coalescing_status */
1178 ret = mwifiex_prepare_cmd(priv, 1179 ret = mwifiex_send_cmd_async(priv,
1179 HostCmd_CMD_802_11_IBSS_COALESCING_STATUS, 1180 HostCmd_CMD_802_11_IBSS_COALESCING_STATUS,
1180 HostCmd_ACT_GEN_SET, 0, NULL, &enable); 1181 HostCmd_ACT_GEN_SET, 0, &enable);
1181 if (ret) 1182 if (ret)
1182 return -1; 1183 return -1;
1183 1184
1184 memset(&amsdu_aggr_ctrl, 0, sizeof(amsdu_aggr_ctrl)); 1185 memset(&amsdu_aggr_ctrl, 0, sizeof(amsdu_aggr_ctrl));
1185 amsdu_aggr_ctrl.enable = true; 1186 amsdu_aggr_ctrl.enable = true;
1186 /* Send request to firmware */ 1187 /* Send request to firmware */
1187 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_AMSDU_AGGR_CTRL, 1188 ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_AMSDU_AGGR_CTRL,
1188 HostCmd_ACT_GEN_SET, 0, NULL, 1189 HostCmd_ACT_GEN_SET, 0,
1189 (void *) &amsdu_aggr_ctrl); 1190 (void *) &amsdu_aggr_ctrl);
1190 if (ret) 1191 if (ret)
1191 return -1; 1192 return -1;
1192 /* MAC Control must be the last command in init_fw */ 1193 /* MAC Control must be the last command in init_fw */
1193 /* set MAC Control */ 1194 /* set MAC Control */
1194 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_MAC_CONTROL, 1195 ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_MAC_CONTROL,
1195 HostCmd_ACT_GEN_SET, 0, NULL, 1196 HostCmd_ACT_GEN_SET, 0,
1196 &priv->curr_pkt_filter); 1197 &priv->curr_pkt_filter);
1197 if (ret) 1198 if (ret)
1198 return -1; 1199 return -1;
1199 1200
@@ -1201,19 +1202,18 @@ int mwifiex_sta_init_cmd(struct mwifiex_private *priv, u8 first_sta)
1201 /* Enable auto deep sleep */ 1202 /* Enable auto deep sleep */
1202 auto_ds.auto_ds = DEEP_SLEEP_ON; 1203 auto_ds.auto_ds = DEEP_SLEEP_ON;
1203 auto_ds.idle_time = DEEP_SLEEP_IDLE_TIME; 1204 auto_ds.idle_time = DEEP_SLEEP_IDLE_TIME;
1204 ret = mwifiex_prepare_cmd(priv, 1205 ret = mwifiex_send_cmd_async(priv,
1205 HostCmd_CMD_802_11_PS_MODE_ENH, 1206 HostCmd_CMD_802_11_PS_MODE_ENH,
1206 EN_AUTO_PS, BITMAP_AUTO_DS, NULL, 1207 EN_AUTO_PS, BITMAP_AUTO_DS,
1207 &auto_ds); 1208 &auto_ds);
1208 if (ret) 1209 if (ret)
1209 return -1; 1210 return -1;
1210 } 1211 }
1211 1212
1212 /* Send cmd to FW to enable/disable 11D function */ 1213 /* Send cmd to FW to enable/disable 11D function */
1213 state_11d = ENABLE_11D; 1214 state_11d = ENABLE_11D;
1214 ret = mwifiex_prepare_cmd(priv, HostCmd_CMD_802_11_SNMP_MIB, 1215 ret = mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11_SNMP_MIB,
1215 HostCmd_ACT_GEN_SET, DOT11D_I, 1216 HostCmd_ACT_GEN_SET, DOT11D_I, &state_11d);
1216 NULL, &state_11d);
1217 if (ret) 1217 if (ret)
1218 dev_err(priv->adapter->dev, "11D: failed to enable 11D\n"); 1218 dev_err(priv->adapter->dev, "11D: failed to enable 11D\n");
1219 1219