iwlwifi: avoid commit rxon during scan in iwlagn_configure_filter

Almost anywhere in the code we avoid committing rxon while performing
scan, and make rxon commit when scan complete. However in some places
in the code we do not follow that rule. This patch fix that problem in
iwlagn_configure_filter().

Since we do not commit directly in iwl3945_configure_filter, we can
also do the same for agn, so I just remove iwlcore_commit_rxon()
function and add a comment. Also change comment for iwl3945.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by:  Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index d3435c430273..0ba8083ee4cd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3983,7 +3983,11 @@ static void iwlagn_configure_filter(struct ieee80211_hw *hw,
         for_each_context(priv, ctx) {
                 ctx->staging.filter_flags &= ~filter_nand;
                 ctx->staging.filter_flags |= filter_or;
-                iwlcore_commit_rxon(priv, ctx);
+
+                /*
+                 * Not committing directly because hardware can perform a scan,
+                 * but we'll eventually commit the filter flags change anyway.
+                 */
         }
 
         mutex_unlock(&priv->mutex);
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index a75429171c46..3b8bf8686276 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3407,9 +3407,9 @@ static void iwl3945_configure_filter(struct ieee80211_hw *hw,
         ctx->staging.filter_flags |= filter_or;
 
         /*
-         * Committing directly here breaks for some reason,
-         * but we'll eventually commit the filter flags
-         * change anyway.
+         * Not committing directly because hardware can perform a scan,
+         * but even if hw is ready, committing here breaks for some reason,
+         * we'll eventually commit the filter flags change anyway.
          */
 
         mutex_unlock(&priv->mutex);