diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-04-28 11:51:27 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-29 15:36:14 -0400 |
| commit | 8eb0ac70a7a53cf851027d022616c01591ee4c33 (patch) | |
| tree | 95297391d8e6dec652775b1286977ef6d2d99fa9 /drivers/net/wireless | |
| parent | 3e41de85f8e3419257df62dd6fe6bdd95a1fdcab (diff) | |
| download | blackbird-op-linux-8eb0ac70a7a53cf851027d022616c01591ee4c33.tar.gz blackbird-op-linux-8eb0ac70a7a53cf851027d022616c01591ee4c33.zip | |
iwlegacy: remove unneeded disable_hw_scan check
We never set STATUS_SCANNING in softwre scanning mode, disable_hw_scan
check is unneeded. Correct debug message while at it.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c index 82201aca8e99..9676b3d5b91c 100644 --- a/drivers/net/wireless/iwlegacy/iwl-core.c +++ b/drivers/net/wireless/iwlegacy/iwl-core.c @@ -2114,10 +2114,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 | |
