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

Commit 52d980c0 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: fix RXON issues 



The RXON rework resulted in a massive loss of
throughput because we weren't programming the
device completely correctly -- the BSSID has
to be programmed into the device before the
AP station is uploaded. To fix this, simply
always send the unassoc RXON, i.e. even when
it was already unassoc so that the BSSID and
some other parameters are updated properly.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2e1fea43

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

+21 −29
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
{

	/* cast away the const for active_rxon in this function */

	struct iwl_rxon_cmd *active = (void *)&ctx->active;

	bool old_assoc = !!(ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK);

	bool new_assoc = !!(ctx->staging.filter_flags & RXON_FILTER_ASSOC_MSK);

	int ret;
@@ -172,25 +171,19 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
		       ctx->staging.bssid_addr);



	/*

	 * If we are currently associated and the new config is also

	 * going to be associated, OR if the new config is simply not

	 * associated, clear associated.

	 * Always clear associated first, but with the correct config.

	 * This is required as for example station addition for the

	 * AP station must be done after the BSSID is set to correctly

	 * set up filters in the device.

	 */

	if ((old_assoc && new_assoc) || !new_assoc) {

		struct iwl_rxon_cmd *send = active;



		if (!new_assoc)

			send = &ctx->staging;



	if (ctx->ctxid == IWL_RXON_CTX_BSS)

			ret = iwlagn_disable_bss(priv, ctx, send);

		ret = iwlagn_disable_bss(priv, ctx, &ctx->staging);

	else

			ret = iwlagn_disable_pan(priv, ctx, send);

		ret = iwlagn_disable_pan(priv, ctx, &ctx->staging);

	if (ret)

		return ret;



		if (send != active)

			memcpy(active, send, sizeof(*active));

	memcpy(active, &ctx->staging, sizeof(*active));



	/*

	 * Un-assoc RXON clears the station table and WEP
@@ -203,7 +196,6 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
		IWL_ERR(priv, "Failed to restore WEP keys (%d)\n", ret);

		return ret;

	}

	}



	/* RXON timing must be before associated RXON */

	ret = iwl_send_rxon_timing(priv, ctx);