diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-06-09 05:59:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-29 12:47:30 -0400 |
commit | 06a80c46e85d004a18a51529937049c533e492cd (patch) | |
tree | 75708e65dab63782b561fae6fac870cf5d25291b | |
parent | 21e0f1b26a6ef640c02f09c4390057ee726de389 (diff) |
iwlwifi: mvm: properly tell the fw that a STA is awake
commit 5af01772ee1d6e96849adf728ff837bd71b119c0 upstream.
The firmware API wasn't being used correctly, fix that.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c index 736b50bc962c..35c8ed5e58a4 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/iwlwifi/mvm/sta.c | |||
@@ -1296,17 +1296,11 @@ void iwl_mvm_sta_modify_ps_wake(struct iwl_mvm *mvm, | |||
1296 | struct iwl_mvm_add_sta_cmd cmd = { | 1296 | struct iwl_mvm_add_sta_cmd cmd = { |
1297 | .add_modify = STA_MODE_MODIFY, | 1297 | .add_modify = STA_MODE_MODIFY, |
1298 | .sta_id = mvmsta->sta_id, | 1298 | .sta_id = mvmsta->sta_id, |
1299 | .modify_mask = STA_MODIFY_SLEEPING_STA_TX_COUNT, | 1299 | .station_flags_msk = cpu_to_le32(STA_FLG_PS), |
1300 | .sleep_state_flags = cpu_to_le16(STA_SLEEP_STATE_AWAKE), | ||
1301 | .mac_id_n_color = cpu_to_le32(mvmsta->mac_id_n_color), | 1300 | .mac_id_n_color = cpu_to_le32(mvmsta->mac_id_n_color), |
1302 | }; | 1301 | }; |
1303 | int ret; | 1302 | int ret; |
1304 | 1303 | ||
1305 | /* | ||
1306 | * Same modify mask for sleep_tx_count and sleep_state_flags but this | ||
1307 | * should be fine since if we set the STA as "awake", then | ||
1308 | * sleep_tx_count is not relevant. | ||
1309 | */ | ||
1310 | ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA, CMD_ASYNC, sizeof(cmd), &cmd); | 1304 | ret = iwl_mvm_send_cmd_pdu(mvm, ADD_STA, CMD_ASYNC, sizeof(cmd), &cmd); |
1311 | if (ret) | 1305 | if (ret) |
1312 | IWL_ERR(mvm, "Failed to send ADD_STA command (%d)\n", ret); | 1306 | IWL_ERR(mvm, "Failed to send ADD_STA command (%d)\n", ret); |