From patchwork Fri Oct 9 14:39:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zidlicky X-Patchwork-Id: 52793 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n99Is5uE018596 for ; Fri, 9 Oct 2009 18:54:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752130AbZJISxU (ORCPT ); Fri, 9 Oct 2009 14:53:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752877AbZJISxU (ORCPT ); Fri, 9 Oct 2009 14:53:20 -0400 Received: from mail-fx0-f227.google.com ([209.85.220.227]:49852 "EHLO mail-fx0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750962AbZJISxT (ORCPT ); Fri, 9 Oct 2009 14:53:19 -0400 Received: by fxm27 with SMTP id 27so6669252fxm.17 for ; Fri, 09 Oct 2009 11:52:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:sender:received:date:from:to :cc:subject:message-id:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=Px6MDsxdrvff26b7hUJMFQAsCkRhVr/Z7mYKPgttzTY=; b=U1XiL85998T4i+7tqJ0zQ0DtYjRYQ6NH7VOwlyyjVzEwwY0UxzIKfiB3rvIBgv8gDu jPAkU+TxttjX6rVb0ayqmN1mLY4vQHIX6VXlro3SW8FWSgssf/NfJV0z1myqH06FQAKu LVkikCnSWHX7lbTlkIqyReNaGxjwp+c92S4jM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=BFB2FWQd0mWb6F/hPDYsAZcgOsUvfTe66DnAq2fqVBwLrsVjMIeBRk8sHEMMUUatVJ dO07nzLerZ8XV2T6fGcghcyXWI1kOLdXIRr0xO/k5wQ7x9hmJ7Dm3B5AYjXQMWDkNJ0k ojeY9GA1p25UAKk8vkYyjxYnn9ddOP/zMZmDw= Received: by 10.204.156.24 with SMTP id u24mr2449542bkw.172.1255114362291; Fri, 09 Oct 2009 11:52:42 -0700 (PDT) Received: from localhost.localdomain (nrbg-d9b9732e.pool.mediaWays.net [217.185.115.46]) by mx.google.com with ESMTPS id 9sm2261766fks.34.2009.10.09.11.52.31 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 09 Oct 2009 11:52:41 -0700 (PDT) Received: from rz by localhost.localdomain with local (Exim 4.69) (envelope-from ) id 1MwGcs-00022g-Vy; Fri, 09 Oct 2009 16:39:22 +0200 Date: Fri, 9 Oct 2009 16:39:22 +0200 From: Richard Zidlicky To: Bob Copeland Cc: linux-wireless@vger.kernel.org Subject: 2.6.31.[12] ath5k regression Message-ID: <20091009143922.GA7848@linux-m68k.org> References: <20090621134954.GA31505@linux-m68k.org> <20090621180447.GA29469@hash.localnet> <20090623174616.GA3914@linux-m68k.org> <20090623202541.GA3635@hash.localnet> <20090625083636.GA6323@linux-m68k.org> <20090705123105.GE2132@hash.localnet> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090705123105.GE2132@hash.localnet> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 029c1bc..ba6d225 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -2676,7 +2676,7 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan) sc->curchan = chan; sc->curband = &sc->sbands[chan->band]; } - ret = ath5k_hw_reset(ah, sc->opmode, sc->curchan, true); + ret = ath5k_hw_reset(ah, sc->opmode, sc->curchan, chan != NULL); if (ret) { ATH5K_ERR(sc, "can't reset hardware (%d)\n", ret); goto err;