diff options
| author | Gábor Stefanik <netrolller.3d@gmail.com> | 2009-08-15 00:52:02 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-08-20 17:35:55 +0200 |
| commit | 826ee70664c658a022d999f7eb4d3cd9448895dd (patch) | |
| tree | 83f575b5630d4a4e76e8ef90a31902877ae2be87 | |
| parent | b43: LP-PHY: Fix another TX power control abuse (diff) | |
| download | linux-826ee70664c658a022d999f7eb4d3cd9448895dd.tar.xz linux-826ee70664c658a022d999f7eb4d3cd9448895dd.zip | |
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>
| -rw-r--r-- | drivers/net/wireless/b43/wa.c | 2 | ||||
| -rw-r--r-- | 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 73e97fa4ddf7..97c79161c208 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 5280ebc8c6e9..be1c53ecdb01 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) { |