Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15b3f3b0 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

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: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 88e9ba76

drivers/net/wireless/iwlwifi/iwl-1000.c

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ static struct iwl_base_params iwl1000_base_params = { 
static struct iwl_ht_params iwl1000_ht_params = {

	.ht_greenfield_support = true,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.smps_mode = IEEE80211_SMPS_STATIC,

};



#define IWL_DEVICE_1000						\

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

+10 −0
Original line number Diff line number Diff line
@@ -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;

	}

drivers/net/wireless/iwlwifi/iwl-core.h

+3 −2
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ struct iwl_bt_params { 
struct iwl_ht_params {

	const bool ht_greenfield_support; /* if used set to true */

	bool use_rts_for_aggregation;

	enum ieee80211_smps_mode smps_mode;

};



/**