diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-12 04:36:41 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-13 06:52:19 -0400 |
commit | a10229271946731959b2269370d0492d88cfab23 (patch) | |
tree | 76bf534d72f70f03b373c8646039ebed3452652e /drivers/net/wireless/iwlwifi/mvm/sta.c | |
parent | 90c456fc795485cfcbede23a6598feeac7e6c284 (diff) |
iwlwifi: remove CMD_SYNC
CMD_SYNC is really 0 which is confusing:
if (cmd.flags & CMD_SYNC) is always false.
Fix this by simply removing its definition.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c index 3e11b9d802e7..1fb01ea2e704 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/iwlwifi/mvm/sta.c | |||
@@ -327,7 +327,7 @@ static int iwl_mvm_rm_sta_common(struct iwl_mvm *mvm, u8 sta_id) | |||
327 | return -EINVAL; | 327 | return -EINVAL; |
328 | } | 328 | } |
329 | 329 | ||
330 | ret = iwl_mvm_send_cmd_pdu(mvm, REMOVE_STA, CMD_SYNC, | 330 | ret = iwl_mvm_send_cmd_pdu(mvm, REMOVE_STA, 0, |
331 | sizeof(rm_sta_cmd), &rm_sta_cmd); | 331 | sizeof(rm_sta_cmd), &rm_sta_cmd); |
332 | if (ret) { | 332 | if (ret) { |
333 | IWL_ERR(mvm, "Failed to remove station. Id=%d\n", sta_id); | 333 | IWL_ERR(mvm, "Failed to remove station. Id=%d\n", sta_id); |
@@ -1053,12 +1053,12 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm, | |||
1053 | cmd.sta_id = sta_id; | 1053 | cmd.sta_id = sta_id; |
1054 | 1054 | ||
1055 | status = ADD_STA_SUCCESS; | 1055 | status = ADD_STA_SUCCESS; |
1056 | if (cmd_flags == CMD_SYNC) | 1056 | if (cmd_flags & CMD_ASYNC) |
1057 | ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA_KEY, sizeof(cmd), | ||
1058 | &cmd, &status); | ||
1059 | else | ||
1060 | ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA_KEY, CMD_ASYNC, | 1057 | ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA_KEY, CMD_ASYNC, |
1061 | sizeof(cmd), &cmd); | 1058 | sizeof(cmd), &cmd); |
1059 | else | ||
1060 | ret = iwl_mvm_send_cmd_pdu_status(mvm, ADD_STA_KEY, sizeof(cmd), | ||
1061 | &cmd, &status); | ||
1062 | 1062 | ||
1063 | switch (status) { | 1063 | switch (status) { |
1064 | case ADD_STA_SUCCESS: | 1064 | case ADD_STA_SUCCESS: |
@@ -1111,7 +1111,7 @@ static int iwl_mvm_send_sta_igtk(struct iwl_mvm *mvm, | |||
1111 | remove_key ? "removing" : "installing", | 1111 | remove_key ? "removing" : "installing", |
1112 | igtk_cmd.sta_id); | 1112 | igtk_cmd.sta_id); |
1113 | 1113 | ||
1114 | return iwl_mvm_send_cmd_pdu(mvm, MGMT_MCAST_KEY, CMD_SYNC, | 1114 | return iwl_mvm_send_cmd_pdu(mvm, MGMT_MCAST_KEY, 0, |
1115 | sizeof(igtk_cmd), &igtk_cmd); | 1115 | sizeof(igtk_cmd), &igtk_cmd); |
1116 | } | 1116 | } |
1117 | 1117 | ||
@@ -1198,15 +1198,15 @@ int iwl_mvm_set_sta_key(struct iwl_mvm *mvm, | |||
1198 | ieee80211_get_key_rx_seq(keyconf, 0, &seq); | 1198 | ieee80211_get_key_rx_seq(keyconf, 0, &seq); |
1199 | ieee80211_get_tkip_rx_p1k(keyconf, addr, seq.tkip.iv32, p1k); | 1199 | ieee80211_get_tkip_rx_p1k(keyconf, addr, seq.tkip.iv32, p1k); |
1200 | ret = iwl_mvm_send_sta_key(mvm, mvm_sta, keyconf, sta_id, | 1200 | ret = iwl_mvm_send_sta_key(mvm, mvm_sta, keyconf, sta_id, |
1201 | seq.tkip.iv32, p1k, CMD_SYNC); | 1201 | seq.tkip.iv32, p1k, 0); |
1202 | break; | 1202 | break; |
1203 | case WLAN_CIPHER_SUITE_CCMP: | 1203 | case WLAN_CIPHER_SUITE_CCMP: |
1204 | ret = iwl_mvm_send_sta_key(mvm, mvm_sta, keyconf, sta_id, | 1204 | ret = iwl_mvm_send_sta_key(mvm, mvm_sta, keyconf, sta_id, |
1205 | 0, NULL, CMD_SYNC); | 1205 | 0, NULL, 0); |
1206 | break; | 1206 | break; |
1207 | default: | 1207 | default: |
1208 | ret = iwl_mvm_send_sta_key(mvm, mvm_sta, keyconf, | 1208 | ret = iwl_mvm_send_sta_key(mvm, mvm_sta, keyconf, |
1209 | sta_id, 0, NULL, CMD_SYNC); | 1209 | sta_id, 0, NULL, 0); |
1210 | } | 1210 | } |
1211 | 1211 | ||
1212 | if (ret) | 1212 | if (ret) |