diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/lib.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/lib.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/lib.c b/drivers/net/wireless/iwlwifi/dvm/lib.c index d169228f59e7..2191621d69c1 100644 --- a/drivers/net/wireless/iwlwifi/dvm/lib.c +++ b/drivers/net/wireless/iwlwifi/dvm/lib.c | |||
| @@ -81,7 +81,7 @@ int iwlagn_send_tx_power(struct iwl_priv *priv) | |||
| 81 | else | 81 | else |
| 82 | tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD; | 82 | tx_ant_cfg_cmd = REPLY_TX_POWER_DBM_CMD; |
| 83 | 83 | ||
| 84 | return iwl_dvm_send_cmd_pdu(priv, tx_ant_cfg_cmd, CMD_SYNC, | 84 | return iwl_dvm_send_cmd_pdu(priv, tx_ant_cfg_cmd, 0, |
| 85 | sizeof(tx_power_cmd), &tx_power_cmd); | 85 | sizeof(tx_power_cmd), &tx_power_cmd); |
| 86 | } | 86 | } |
| 87 | 87 | ||
| @@ -141,7 +141,6 @@ int iwlagn_txfifo_flush(struct iwl_priv *priv, u32 scd_q_msk) | |||
| 141 | struct iwl_host_cmd cmd = { | 141 | struct iwl_host_cmd cmd = { |
| 142 | .id = REPLY_TXFIFO_FLUSH, | 142 | .id = REPLY_TXFIFO_FLUSH, |
| 143 | .len = { sizeof(struct iwl_txfifo_flush_cmd), }, | 143 | .len = { sizeof(struct iwl_txfifo_flush_cmd), }, |
| 144 | .flags = CMD_SYNC, | ||
| 145 | .data = { &flush_cmd, }, | 144 | .data = { &flush_cmd, }, |
| 146 | }; | 145 | }; |
| 147 | 146 | ||
| @@ -333,12 +332,12 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv) | |||
| 333 | memcpy(&bt_cmd_v2.basic, &basic, | 332 | memcpy(&bt_cmd_v2.basic, &basic, |
| 334 | sizeof(basic)); | 333 | sizeof(basic)); |
| 335 | ret = iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG, | 334 | ret = iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG, |
| 336 | CMD_SYNC, sizeof(bt_cmd_v2), &bt_cmd_v2); | 335 | 0, sizeof(bt_cmd_v2), &bt_cmd_v2); |
| 337 | } else { | 336 | } else { |
| 338 | memcpy(&bt_cmd_v1.basic, &basic, | 337 | memcpy(&bt_cmd_v1.basic, &basic, |
| 339 | sizeof(basic)); | 338 | sizeof(basic)); |
| 340 | ret = iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG, | 339 | ret = iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG, |
| 341 | CMD_SYNC, sizeof(bt_cmd_v1), &bt_cmd_v1); | 340 | 0, sizeof(bt_cmd_v1), &bt_cmd_v1); |
| 342 | } | 341 | } |
| 343 | if (ret) | 342 | if (ret) |
| 344 | IWL_ERR(priv, "failed to send BT Coex Config\n"); | 343 | IWL_ERR(priv, "failed to send BT Coex Config\n"); |
| @@ -1044,7 +1043,6 @@ int iwlagn_send_patterns(struct iwl_priv *priv, | |||
| 1044 | struct iwl_host_cmd cmd = { | 1043 | struct iwl_host_cmd cmd = { |
| 1045 | .id = REPLY_WOWLAN_PATTERNS, | 1044 | .id = REPLY_WOWLAN_PATTERNS, |
| 1046 | .dataflags[0] = IWL_HCMD_DFL_NOCOPY, | 1045 | .dataflags[0] = IWL_HCMD_DFL_NOCOPY, |
| 1047 | .flags = CMD_SYNC, | ||
| 1048 | }; | 1046 | }; |
| 1049 | int i, err; | 1047 | int i, err; |
| 1050 | 1048 | ||
| @@ -1201,7 +1199,6 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan) | |||
| 1201 | if (key_data.use_rsc_tsc) { | 1199 | if (key_data.use_rsc_tsc) { |
| 1202 | struct iwl_host_cmd rsc_tsc_cmd = { | 1200 | struct iwl_host_cmd rsc_tsc_cmd = { |
| 1203 | .id = REPLY_WOWLAN_TSC_RSC_PARAMS, | 1201 | .id = REPLY_WOWLAN_TSC_RSC_PARAMS, |
| 1204 | .flags = CMD_SYNC, | ||
| 1205 | .data[0] = key_data.rsc_tsc, | 1202 | .data[0] = key_data.rsc_tsc, |
| 1206 | .dataflags[0] = IWL_HCMD_DFL_NOCOPY, | 1203 | .dataflags[0] = IWL_HCMD_DFL_NOCOPY, |
| 1207 | .len[0] = sizeof(*key_data.rsc_tsc), | 1204 | .len[0] = sizeof(*key_data.rsc_tsc), |
| @@ -1215,7 +1212,7 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan) | |||
| 1215 | if (key_data.use_tkip) { | 1212 | if (key_data.use_tkip) { |
| 1216 | ret = iwl_dvm_send_cmd_pdu(priv, | 1213 | ret = iwl_dvm_send_cmd_pdu(priv, |
| 1217 | REPLY_WOWLAN_TKIP_PARAMS, | 1214 | REPLY_WOWLAN_TKIP_PARAMS, |
| 1218 | CMD_SYNC, sizeof(tkip_cmd), | 1215 | 0, sizeof(tkip_cmd), |
| 1219 | &tkip_cmd); | 1216 | &tkip_cmd); |
| 1220 | if (ret) | 1217 | if (ret) |
| 1221 | goto out; | 1218 | goto out; |
| @@ -1231,20 +1228,20 @@ int iwlagn_suspend(struct iwl_priv *priv, struct cfg80211_wowlan *wowlan) | |||
| 1231 | 1228 | ||
| 1232 | ret = iwl_dvm_send_cmd_pdu(priv, | 1229 | ret = iwl_dvm_send_cmd_pdu(priv, |
| 1233 | REPLY_WOWLAN_KEK_KCK_MATERIAL, | 1230 | REPLY_WOWLAN_KEK_KCK_MATERIAL, |
| 1234 | CMD_SYNC, sizeof(kek_kck_cmd), | 1231 | 0, sizeof(kek_kck_cmd), |
| 1235 | &kek_kck_cmd); | 1232 | &kek_kck_cmd); |
| 1236 | if (ret) | 1233 | if (ret) |
| 1237 | goto out; | 1234 | goto out; |
| 1238 | } | 1235 | } |
| 1239 | } | 1236 | } |
| 1240 | 1237 | ||
| 1241 | ret = iwl_dvm_send_cmd_pdu(priv, REPLY_D3_CONFIG, CMD_SYNC, | 1238 | ret = iwl_dvm_send_cmd_pdu(priv, REPLY_D3_CONFIG, 0, |
| 1242 | sizeof(d3_cfg_cmd), &d3_cfg_cmd); | 1239 | sizeof(d3_cfg_cmd), &d3_cfg_cmd); |
| 1243 | if (ret) | 1240 | if (ret) |
| 1244 | goto out; | 1241 | goto out; |
| 1245 | 1242 | ||
| 1246 | ret = iwl_dvm_send_cmd_pdu(priv, REPLY_WOWLAN_WAKEUP_FILTER, | 1243 | ret = iwl_dvm_send_cmd_pdu(priv, REPLY_WOWLAN_WAKEUP_FILTER, |
| 1247 | CMD_SYNC, sizeof(wakeup_filter_cmd), | 1244 | 0, sizeof(wakeup_filter_cmd), |
| 1248 | &wakeup_filter_cmd); | 1245 | &wakeup_filter_cmd); |
| 1249 | if (ret) | 1246 | if (ret) |
| 1250 | goto out; | 1247 | goto out; |
