From patchwork Fri Aug 14 22:52:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?G=C3=A1bor_Stefanik?= X-Patchwork-Id: 41564 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 n7EMq6si013089 for ; Fri, 14 Aug 2009 22:52:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756208AbZHNWwD (ORCPT ); Fri, 14 Aug 2009 18:52:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756149AbZHNWwD (ORCPT ); Fri, 14 Aug 2009 18:52:03 -0400 Received: from mail-bw0-f222.google.com ([209.85.218.222]:57665 "EHLO mail-bw0-f222.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755238AbZHNWwB (ORCPT ); Fri, 14 Aug 2009 18:52:01 -0400 Received: by bwz22 with SMTP id 22so1391213bwz.18 for ; Fri, 14 Aug 2009 15:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=ozFsTyWAJ/+SyI+c9iWfkwb5sw4Mm7zesShocHDBrSg=; b=Udoc/vCJHjKcqHQgaE1dDaaRplNJ5A1qiKsuid/bbhejP08bEKl2lt62YNeNf9cxvG e/QXbH0kTptXdsBtR/UkXIr3kZe99AFfufegI+5f3rI6huoR++BGAKUY/U/GhAgwCcxk jDj8NQ8fgS2VU4DRtZo1bPPYsKQZltFXWfSYY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=w9r4HG+N28HDfveAuBV/p5tNC/JFyPF9h1zBHhg/cOb1GZM1ILFNJy+uaKbODWf97u ohJEtENd0+4HrvfCoBuRc4FmyDfNAL0Z1RxIQz2D0p+IzkFVuT37KmjZgawiW/0XfPDO q10iACRwoFMyG7xTRaPUDClN569Xy7OXZBSgc= Received: by 10.103.121.19 with SMTP id y19mr555930mum.126.1250290322030; Fri, 14 Aug 2009 15:52:02 -0700 (PDT) Received: from ?192.168.1.5? (pool-02f2c.externet.hu [88.209.217.43]) by mx.google.com with ESMTPS id e9sm8687202muf.2.2009.08.14.15.52.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 14 Aug 2009 15:52:01 -0700 (PDT) Message-ID: <4A85EA92.80209@gmail.com> Date: Sat, 15 Aug 2009 00:52:02 +0200 From: =?UTF-8?B?R8OhYm9yIFN0ZWZhbmlr?= User-Agent: Thunderbird 2.0.0.22 (Windows/20090605) MIME-Version: 1.0 To: John Linville , Michael Buesch , Larry Finger CC: Mark Huijgen , Broadcom Wireless , linux-wireless Subject: [PATCH] b43: Handle B43_PHYTYPE_LP in RX path Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Don't drop all packets received from an LP-PHY with WARN_ON. Also update a comment with LP-specific information. Signed-off-by: Gábor Stefanik --- drivers/net/wireless/b43/wa.c | 2 +- drivers/net/wireless/b43/xmit.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/b43/wa.c b/drivers/net/wireless/b43/wa.c index 73e97fa..97c7916 100644 --- a/drivers/net/wireless/b43/wa.c +++ b/drivers/net/wireless/b43/wa.c @@ -628,7 +628,7 @@ void b43_wa_all(struct b43_wldev *dev) B43_WARN_ON(1); } b43_wa_boards_g(dev); - } else { /* No N PHY support so far */ + } else { /* No N PHY support so far, LP PHY is in phy_lp.c */ B43_WARN_ON(1); } diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 5280ebc..be1c53e 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c @@ -655,6 +655,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) status.freq = chanid + 2400; break; case B43_PHYTYPE_N: + case B43_PHYTYPE_LP: /* chanid is the SHM channel cookie. Which is the plain * channel number in b43. */ if (chanstat & B43_RX_CHAN_5GHZ) {