iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iwlagn: set smps mode after assoc for 1000 device

Browse Source 
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>
This commit is contained in:
Wey-Yi Guy 2011-06-03 07:54:13 -07:00 committed by John W. Linville
parent 88e9ba76bf
commit 15b3f3b006
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/iwlwifi/iwl-1000.c
View File

@ -222,6 +222,7 @@ static struct iwl_base_params iwl1000_base_params = {
static struct iwl_ht_params iwl1000_ht_params = { static struct iwl_ht_params iwl1000_ht_params = {
.ht_greenfield_support = true, .ht_greenfield_support = true,
.use_rts_for_aggregation = true, /* use rts/cts protection */ .use_rts_for_aggregation = true, /* use rts/cts protection */
.smps_mode = IEEE80211_SMPS_STATIC,
}; };
#define IWL_DEVICE_1000 \ #define IWL_DEVICE_1000 \

10
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
View File

@ -291,6 +291,12 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,
IWL_ERR(priv, "Error sending TX power (%d)\n", ret); IWL_ERR(priv, "Error sending TX power (%d)\n", ret);
return 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; 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. * do it now if after settings changed.
*/ */
iwl_set_tx_power(priv, priv->tx_power_next, false); 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; return 0;
} }

5
drivers/net/wireless/iwlwifi/iwl-core.h
View File

@ -224,7 +224,7 @@ struct iwl_base_params {
* @ampdu_factor: Maximum A-MPDU length factor * @ampdu_factor: Maximum A-MPDU length factor
* @ampdu_density: Minimum A-MPDU spacing * @ampdu_density: Minimum A-MPDU spacing
* @bt_sco_disable: uCode should not response to BT in SCO/ESCO mode * @bt_sco_disable: uCode should not response to BT in SCO/ESCO mode
*/ */
struct iwl_bt_params { struct iwl_bt_params {
bool advanced_bt_coexist; bool advanced_bt_coexist;
u8 bt_init_traffic_load; u8 bt_init_traffic_load;
@ -237,10 +237,11 @@ struct iwl_bt_params {
}; };
/* /*
* @use_rts_for_aggregation: use rts/cts protection for HT traffic * @use_rts_for_aggregation: use rts/cts protection for HT traffic
*/ */
struct iwl_ht_params { struct iwl_ht_params {
const bool ht_greenfield_support; /* if used set to true */ const bool ht_greenfield_support; /* if used set to true */
bool use_rts_for_aggregation; bool use_rts_for_aggregation;
enum ieee80211_smps_mode smps_mode;
}; };
/** /**