From patchwork Tue Jun 1 12:25:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 103510 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o51CQM7H006501 for ; Tue, 1 Jun 2010 12:26:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756200Ab0FAMZx (ORCPT ); Tue, 1 Jun 2010 08:25:53 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:38278 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755580Ab0FAMZr (ORCPT ); Tue, 1 Jun 2010 08:25:47 -0400 Received: by fxm8 with SMTP id 8so871109fxm.19 for ; Tue, 01 Jun 2010 05:25:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=lj4DKZdRDpMdfYYl4SgbuZeXzkCWmTGPy3ETKU0tjjQ=; b=fwO0NXzV6VUPL5HglaeCELt3LykWtVzu14wvCfWUjKLEbXtSYRjocEZ4+VmY0i62oO h372eeKMquG75TQOWWmtZqzHwlQkopA+veTgpo4VRef3Znzc4DZGFzu9/onRc1nKPhtA 2DfAzxYy4vshLGaLo8nELNFhMlVzLgPrLp0wE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=VgqiZ327SyuwzFWVcy+4uFn5QrDDKRQBzaTs9hf8QId8T1Hv3O2PFOXobx8dv1fAL5 bVuGW8VOjMTFDcLs/0p0RelOB/5n0xUadwPy1rLyNwHYzYnIgKK/nnFOjz6EY8QJiRc8 JfGpEjlQ/tJqodHiuVajoaQOa72iVAweNH8qI= Received: by 10.87.63.31 with SMTP id q31mr11223155fgk.18.1275395145596; Tue, 01 Jun 2010 05:25:45 -0700 (PDT) Received: from [192.168.2.101] ([77.127.199.160]) by mx.google.com with ESMTPS id 12sm8107916fgg.24.2010.06.01.05.25.44 (version=SSLv3 cipher=RC4-MD5); Tue, 01 Jun 2010 05:25:44 -0700 (PDT) Subject: IWL3945 problems in 2.6.35-rc1 From: Maxim Levitsky To: linux-wireless Cc: iwlwifi maling list Date: Tue, 01 Jun 2010 15:25:42 +0300 Message-ID: <1275395142.14385.6.camel@maxim-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 01 Jun 2010 12:26:22 +0000 (UTC) diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 3e5bffb..1aef988 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c @@ -1861,6 +1861,11 @@ static int iwl3945_get_channels_for_scan(struct iwl_priv *priv, if (!sband) return 0; + if(!priv->scan_request) { + WARN_ON(1); + return 0; + } + active_dwell = iwl_get_active_dwell_time(priv, band, n_probes); passive_dwell = iwl_get_passive_dwell_time(priv, band, vif);