diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-03 16:54:13 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-03 21:16:36 +0200 |
commit | 15b3f3b006b42a678523cad989bfd60b76bf4403 (patch) | |
tree | 826995269c2db9df30393689b8138f1c3dfb80bc /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |
parent | iwlagn: save the latest smps mode (diff) | |
download | linux-15b3f3b006b42a678523cad989bfd60b76bf4403.tar.xz linux-15b3f3b006b42a678523cad989bfd60b76bf4403.zip |
iwlagn: set smps mode after assoc for 1000 device
For some timing reason, 1000 device having problem to kick-in to aggregation
without sending rxon assoc command. This is a W/A until find the real reason
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rxon.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index afb2f202afb9..5f562d91c2e7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -291,6 +291,12 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv, IWL_ERR(priv, "Error sending TX power (%d)\n", ret); return ret; } + + if ((ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION) && + priv->cfg->ht_params->smps_mode) + ieee80211_request_smps(ctx->vif, + priv->cfg->ht_params->smps_mode); + return 0; } @@ -395,6 +401,10 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) * do it now if after settings changed. */ iwl_set_tx_power(priv, priv->tx_power_next, false); + + /* make sure we are in the right PS state */ + iwl_power_update_mode(priv, true); + return 0; } |