diff options
author | Gábor Stefanik <netrolller.3d@gmail.com> | 2009-08-14 18:52:02 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-20 11:35:55 -0400 |
commit | 826ee70664c658a022d999f7eb4d3cd9448895dd (patch) | |
tree | 83f575b5630d4a4e76e8ef90a31902877ae2be87 /drivers/net/wireless/b43 | |
parent | 1245684c631844d52079fb3fa1fcb57cc1213e5c (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/b43')
-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) | |||
628 | B43_WARN_ON(1); | 628 | B43_WARN_ON(1); |
629 | } | 629 | } |
630 | b43_wa_boards_g(dev); | 630 | b43_wa_boards_g(dev); |
631 | } else { /* No N PHY support so far */ | 631 | } else { /* No N PHY support so far, LP PHY is in phy_lp.c */ |
632 | B43_WARN_ON(1); | 632 | B43_WARN_ON(1); |
633 | } | 633 | } |
634 | 634 | ||
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) | |||
655 | status.freq = chanid + 2400; | 655 | status.freq = chanid + 2400; |
656 | break; | 656 | break; |
657 | case B43_PHYTYPE_N: | 657 | case B43_PHYTYPE_N: |
658 | case B43_PHYTYPE_LP: | ||
658 | /* chanid is the SHM channel cookie. Which is the plain | 659 | /* chanid is the SHM channel cookie. Which is the plain |
659 | * channel number in b43. */ | 660 | * channel number in b43. */ |
660 | if (chanstat & B43_RX_CHAN_5GHZ) { | 661 | if (chanstat & B43_RX_CHAN_5GHZ) { |