summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2010-08-22 19:47:32 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2010-08-25 18:33:20 (GMT)
commit049fbfeeb5c7edb260848a89af4895e3dabfa77e (patch)
treef9ae377182f99cf7a77820559560f1cbe8d03363
parent5effdf18aa10c3683094140cf893c399d581d39f (diff)
downloadlinux-fsl-qoriq-049fbfeeb5c7edb260848a89af4895e3dabfa77e.tar.xz
b43: N-PHY: add missing phyrxchain setting and fix warning in RX core function
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/b43/phy_n.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index a0a6554..5f0ce35 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -3092,6 +3092,8 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
struct b43_phy_n *nphy = phy->n;
u16 buf[16];
+ nphy->phyrxchain = mask;
+
if (0 /* FIXME clk */)
return;
@@ -3103,7 +3105,7 @@ static void b43_nphy_set_rx_core_state(struct b43_wldev *dev, u8 mask)
b43_phy_maskset(dev, B43_NPHY_RFSEQCA, ~B43_NPHY_RFSEQCA_RXEN,
(mask & 0x3) << B43_NPHY_RFSEQCA_RXEN_SHIFT);
- if (mask & 0x3 != 0x3) {
+ if ((mask & 0x3) != 0x3) {
b43_phy_write(dev, B43_NPHY_HPANT_SWTHRES, 1);
if (dev->phy.rev >= 3) {
/* TODO */