From 610bf88528f2b60fdb33912eaef1a470269f0917 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Fri, 28 Jan 2011 16:47:48 +0100 Subject: [PATCH] --- yaml --- r: 236938 b: refs/heads/master c: 8c9f514b38bb01f0af09f880fe8b3cd5342d2401 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-legacy.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 213e837678ba..d68b1f5c6b5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88e58fc5d940c3463c7070a2a7a8a0ce65af3fdc +refs/heads/master: 8c9f514b38bb01f0af09f880fe8b3cd5342d2401 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-legacy.c b/trunk/drivers/net/wireless/iwlwifi/iwl-legacy.c index 927fe37a43ab..e1ace3ce30b3 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-legacy.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-legacy.c @@ -85,10 +85,9 @@ int iwl_legacy_mac_config(struct ieee80211_hw *hw, u32 changed) IWL_DEBUG_MAC80211(priv, "enter to channel %d changed 0x%X\n", channel->hw_value, changed); - if (unlikely(!priv->cfg->mod_params->disable_hw_scan && - test_bit(STATUS_SCANNING, &priv->status))) { + if (unlikely(test_bit(STATUS_SCANNING, &priv->status))) { scan_active = 1; - IWL_DEBUG_MAC80211(priv, "leave - scanning\n"); + IWL_DEBUG_MAC80211(priv, "scan active\n"); } if (changed & (IEEE80211_CONF_CHANGE_SMPS |