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

Commit 7caa2316 authored by Daniel Halperin's avatar Daniel Halperin Committed by Wey-Yi Guy
Browse files

iwlwifi: fix frame injection for HT channels 



For some reason, sending QoS configuration causes transmission to stop
after a single frame on HT channels when not associated. Removing the
extra QoS configuration has no effect on station mode, and fixes
injection mode.

Signed-off-by: default avatarDaniel Halperin <dhalperi@cs.washington.edu>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 332704a5

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

+1 −6
Original line number Diff line number Diff line
@@ -335,7 +335,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 
	struct ieee80211_channel *channel = conf->channel;

	const struct iwl_channel_info *ch_info;

	int ret = 0;

	bool ht_changed[NUM_IWL_RXON_CTX] = {};



	IWL_DEBUG_MAC80211(priv, "changed %#x", changed);
@@ -383,10 +382,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 


		for_each_context(priv, ctx) {

			/* Configure HT40 channels */

			if (ctx->ht.enabled != conf_is_ht(conf)) {

			if (ctx->ht.enabled != conf_is_ht(conf))

				ctx->ht.enabled = conf_is_ht(conf);

				ht_changed[ctx->ctxid] = true;

			}



			if (ctx->ht.enabled) {

				if (conf_is_ht40_minus(conf)) {
@@ -455,8 +452,6 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) 
		if (!memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))

			continue;

		iwlagn_commit_rxon(priv, ctx);

		if (ht_changed[ctx->ctxid])

			iwlagn_update_qos(priv, ctx);

	}

 out:

	mutex_unlock(&priv->mutex);