From 18f032b150163b34482ba52929598442fa940270 Mon Sep 17 00:00:00 2001 From: Reinette Chatre Date: Tue, 4 Nov 2008 12:21:35 -0800 Subject: [PATCH] --- yaml --- r: 118555 b: refs/heads/master c: 14b5433606289dbc5b6fd70ced11462f80e95003 h: refs/heads/master i: 118553: cdd059550df2fdebe388dca7ef2ee5ab6d4a1766 118551: 221877cfee87eedb17aa8f58e9f8cfa46a870752 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e9f919999e3b..2af335fe1cb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2420ebc104d38567ee977a3c15dc675a9dd3b07c +refs/heads/master: 14b5433606289dbc5b6fd70ced11462f80e95003 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c index b9eac5551d82..81dfcb882857 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -6256,6 +6256,11 @@ static void iwl3945_bg_request_scan(struct work_struct *data) n_probes, (void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)]); + if (scan->channel_count == 0) { + IWL_DEBUG_SCAN("channel count %d\n", scan->channel_count); + goto done; + } + cmd.len += le16_to_cpu(scan->tx_cmd.len) + scan->channel_count * sizeof(struct iwl3945_scan_channel); cmd.data = scan;