From e11ec296e477460a021824fa61b823710d13c18a Mon Sep 17 00:00:00 2001 From: Ron Rindjunsky Date: Wed, 3 Sep 2008 11:18:43 +0800 Subject: [PATCH] --- yaml --- r: 109449 b: refs/heads/master c: 0ffe014a8c548f88694815ae7b25d6e86550917e h: refs/heads/master i: 109447: 96d71e3ebcdcc4ba953a4f42dbf4f4636ebae173 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a6e4b85eddf6..05a8b2ce8d32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b94d8eea44df985ea22b1f51e402b4bbfdd6d793 +refs/heads/master: 0ffe014a8c548f88694815ae7b25d6e86550917e diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c index 9bb6adb28b73..6c8ac3a87d54 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -421,7 +421,7 @@ static int iwl_get_channels_for_scan(struct iwl_priv *priv, else scan_ch->type = SCAN_CHANNEL_TYPE_ACTIVE; - if ((scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) && n_probes) + if (n_probes) scan_ch->type |= IWL_SCAN_PROBE_MASK(n_probes); scan_ch->active_dwell = cpu_to_le16(active_dwell);