From 05118fa9b47396dbb27151d95e2dff2c1c8e8859 Mon Sep 17 00:00:00 2001 From: Kyle McMartin Date: Fri, 22 Apr 2011 09:05:22 -0400 Subject: [PATCH] iwlwifi: fix scanning while channel changing --- ...et-tx-power-when-channel-is-changing.patch | 99 +++++++++++++++++++ kernel.spec | 10 +- 2 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch diff --git a/iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch b/iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch new file mode 100644 index 000000000..3583c6631 --- /dev/null +++ b/iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch @@ -0,0 +1,99 @@ +From dda82c37c366672fa74499f4b639d059a802d16e Mon Sep 17 00:00:00 2001 +From: Stanislaw Gruszka +Date: Fri, 28 Jan 2011 16:47:44 +0100 +Subject: [PATCH] iwlwifi: do not set tx power when channel is changing + +Mac80211 can request for tx power and channel change in one ->config +call. If that happens, *_send_tx_power functions will try to setup tx +power for old channel, what can be not correct because we already change +the band. I.e error "Failed to get channel info for channel 140 [0]", +can be printed frequently when operating in software scanning mode. + +Signed-off-by: Stanislaw Gruszka +Acked-by: Wey-Yi Guy +Signed-off-by: John W. Linville +--- + drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 5 ++--- + drivers/net/wireless/iwlwifi/iwl-core.c | 13 ++++++++++--- + 4 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c +index 39b6f16..4e7b58b 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-3945.c ++++ b/drivers/net/wireless/iwlwifi/iwl-3945.c +@@ -1823,7 +1823,7 @@ int iwl3945_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) + + /* If we issue a new RXON command which required a tune then we must + * send a new TXPOWER command or we won't be able to Tx any frames */ +- rc = priv->cfg->ops->lib->send_tx_power(priv); ++ rc = iwl_set_tx_power(priv, priv->tx_power_next, true); + if (rc) { + IWL_ERR(priv, "Error setting Tx power (%d).\n", rc); + return rc; +diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c +index 91a9f52..992caa0 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-4965.c ++++ b/drivers/net/wireless/iwlwifi/iwl-4965.c +@@ -1571,7 +1571,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *c + + /* If we issue a new RXON command which required a tune then we must + * send a new TXPOWER command or we won't be able to Tx any frames */ +- ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true); ++ ret = iwl_set_tx_power(priv, priv->tx_power_next, true); + if (ret) { + IWL_ERR(priv, "Error sending TX power (%d)\n", ret); + return ret; +diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +index 6d140bd..ee802fe 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c ++++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +@@ -288,10 +288,9 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) + * If we issue a new RXON command which required a tune then we must + * send a new TXPOWER command or we won't be able to Tx any frames. + * +- * FIXME: which RXON requires a tune? Can we optimise this out in +- * some cases? ++ * It's expected we set power here if channel is changing. + */ +- ret = iwl_set_tx_power(priv, priv->tx_power_user_lmt, true); ++ ret = iwl_set_tx_power(priv, priv->tx_power_next, true); + if (ret) { + IWL_ERR(priv, "Error sending TX power (%d)\n", ret); + return ret; +diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c +index efbde1f..91cac6f 100644 +--- a/drivers/net/wireless/iwlwifi/iwl-core.c ++++ b/drivers/net/wireless/iwlwifi/iwl-core.c +@@ -1161,6 +1161,8 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) + { + int ret; + s8 prev_tx_power; ++ bool defer; ++ struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; + + lockdep_assert_held(&priv->mutex); + +@@ -1188,10 +1190,15 @@ int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force) + if (!iwl_is_ready_rf(priv)) + return -EIO; + +- /* scan complete use tx_power_next, need to be updated */ ++ /* scan complete and commit_rxon use tx_power_next value, ++ * it always need to be updated for newest request */ + priv->tx_power_next = tx_power; +- if (test_bit(STATUS_SCANNING, &priv->status) && !force) { +- IWL_DEBUG_INFO(priv, "Deferring tx power set while scanning\n"); ++ ++ /* do not set tx power when scanning or channel changing */ ++ defer = test_bit(STATUS_SCANNING, &priv->status) || ++ memcmp(&ctx->active, &ctx->staging, sizeof(ctx->staging)); ++ if (defer && !force) { ++ IWL_DEBUG_INFO(priv, "Deferring tx power set\n"); + return 0; + } + +-- +1.7.4.4 + diff --git a/kernel.spec b/kernel.spec index e60fab806..7c1c3caab 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 17 +%global baserelease 18 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -727,6 +727,8 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch Patch12305: printk-do-not-mangle-valid-userspace-syslog-prefixes.patch Patch12306: scsi-sd-downgrade-caching-printk-from-error-to-notice.patch +Patch12307: iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch + %endif BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -1251,6 +1253,9 @@ ApplyPatch hda_intel-prealloc-4mb-dmabuffer.patch # Networking +# rhbz#688252 +ApplyPatch iwlwifi-do-not-set-tx-power-when-channel-is-changing.patch + # Misc fixes # The input layer spews crap no-one cares about. ApplyPatch linux-2.6-input-kill-stupid-messages.patch @@ -1956,6 +1961,9 @@ fi # and build. %changelog +* Fri Apr 22 2011 Kyle McMartin 2.6.38.3-18 +- iwlwifi: fix scanning when channel changing (#688252) + * Tue Apr 19 2011 Jarod Wilson - Add basic support for full 32-bit NEC IR scancodes - Add latest patches sent upstream for hid layer expansion and full