提交 749ff4ef 编写于 作者: S Stanislaw Gruszka 提交者: John W. Linville

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: NStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: NWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 a25a66ac
...@@ -3983,7 +3983,11 @@ static void iwlagn_configure_filter(struct ieee80211_hw *hw, ...@@ -3983,7 +3983,11 @@ static void iwlagn_configure_filter(struct ieee80211_hw *hw,
for_each_context(priv, ctx) { for_each_context(priv, ctx) {
ctx->staging.filter_flags &= ~filter_nand; ctx->staging.filter_flags &= ~filter_nand;
ctx->staging.filter_flags |= filter_or; 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); mutex_unlock(&priv->mutex);
......
...@@ -3407,9 +3407,9 @@ static void iwl3945_configure_filter(struct ieee80211_hw *hw, ...@@ -3407,9 +3407,9 @@ static void iwl3945_configure_filter(struct ieee80211_hw *hw,
ctx->staging.filter_flags |= filter_or; ctx->staging.filter_flags |= filter_or;
/* /*
* Committing directly here breaks for some reason, * Not committing directly because hardware can perform a scan,
* but we'll eventually commit the filter flags * but even if hw is ready, committing here breaks for some reason,
* change anyway. * we'll eventually commit the filter flags change anyway.
*/ */
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册