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: Daniel Halperin <dhalperi@cs.washington.edu>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

authored by Daniel Halperin and committed by Wey-Yi Guy 7caa2316 332704a5

+1 -6
+1 -6
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
··· 335 335 struct ieee80211_channel *channel = conf->channel; 336 336 const struct iwl_channel_info *ch_info; 337 337 int ret = 0; 338 - bool ht_changed[NUM_IWL_RXON_CTX] = {}; 339 338 340 339 IWL_DEBUG_MAC80211(priv, "changed %#x", changed); 341 340 ··· 382 383 383 384 for_each_context(priv, ctx) { 384 385 /* Configure HT40 channels */ 385 - if (ctx->ht.enabled != conf_is_ht(conf)) { 386 + if (ctx->ht.enabled != conf_is_ht(conf)) 386 387 ctx->ht.enabled = conf_is_ht(conf); 387 - ht_changed[ctx->ctxid] = true; 388 - } 389 388 390 389 if (ctx->ht.enabled) { 391 390 if (conf_is_ht40_minus(conf)) { ··· 452 455 if (!memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging))) 453 456 continue; 454 457 iwlagn_commit_rxon(priv, ctx); 455 - if (ht_changed[ctx->ctxid]) 456 - iwlagn_update_qos(priv, ctx); 457 458 } 458 459 out: 459 460 mutex_unlock(&priv->mutex);