From 42458d0076f766fbacb17de18cea1dd8c8f73690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Stefanik?= <netrolller.3d@gmail.com>
Date: Sat, 15 Aug 2009 00:52:02 +0200
Subject: [PATCH] --- yaml --- r: 159728 b: refs/heads/master c:
 826ee70664c658a022d999f7eb4d3cd9448895dd h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/wireless/b43/wa.c   | 2 +-
 trunk/drivers/net/wireless/b43/xmit.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 48d8ac7315be..c20cd8800c07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1245684c631844d52079fb3fa1fcb57cc1213e5c
+refs/heads/master: 826ee70664c658a022d999f7eb4d3cd9448895dd
diff --git a/trunk/drivers/net/wireless/b43/wa.c b/trunk/drivers/net/wireless/b43/wa.c
index 73e97fa4ddf7..97c79161c208 100644
--- a/trunk/drivers/net/wireless/b43/wa.c
+++ b/trunk/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/trunk/drivers/net/wireless/b43/xmit.c b/trunk/drivers/net/wireless/b43/xmit.c
index 5280ebc8c6e9..be1c53ecdb01 100644
--- a/trunk/drivers/net/wireless/b43/xmit.c
+++ b/trunk/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) {