b43: Handle B43_PHYTYPE_LP in RX path

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 <netrolller.3d@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/wa.c b/drivers/net/wireless/b43/wa.c
index 73e97fa4ddf791765e12e0fc31d764a9a535d539..97c79161c208925597b09ce4928af861efb3ec47 100644 (file)
--- 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 5280ebc8c6e9ca22ae03f8a90be7bed0c84944f5..be1c53ecdb01bcafa7fe9b5b295358bfd08c3806 100644 (file)
--- 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) {