diff options
author | Gábor Stefanik <netrolller.3d@gmail.com> | 2009-08-27 22:49:49 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-28 14:40:55 -0400 |
commit | 64e368bf9c3690eebd4b3a5cc243f39e902ecdd1 (patch) | |
tree | f39751877ea511aa2ecc640278c6560be0301c06 /drivers/net/wireless/b43/phy_g.c | |
parent | 867b2efe68b6bb929e3bd1c6d699ba61ff2cf847 (diff) | |
download | kernel_samsung_tuna-64e368bf9c3690eebd4b3a5cc243f39e902ecdd1.zip kernel_samsung_tuna-64e368bf9c3690eebd4b3a5cc243f39e902ecdd1.tar.gz kernel_samsung_tuna-64e368bf9c3690eebd4b3a5cc243f39e902ecdd1.tar.bz2 |
b43: Implement antenna diversity support for LP-PHY
The A/G-PHY changes are fallout fixes from the enum change,
which in turn allows the LP-PHY code to be much simpler.
The antenna_to_phyctl change is a fix for a potential
existing bug that this patch may otherwise trigger.
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/phy_g.c')
-rw-r--r-- | drivers/net/wireless/b43/phy_g.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c index e471312..bdff9af 100644 --- a/drivers/net/wireless/b43/phy_g.c +++ b/drivers/net/wireless/b43/phy_g.c @@ -2664,7 +2664,7 @@ static void b43_gphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna) tmp = b43_phy_read(dev, B43_PHY_BBANDCFG); tmp &= ~B43_PHY_BBANDCFG_RXANT; - tmp |= (autodiv ? B43_ANTENNA_AUTO0 : antenna) + tmp |= (autodiv ? B43_ANTENNA_AUTO1 : antenna) << B43_PHY_BBANDCFG_RXANT_SHIFT; b43_phy_write(dev, B43_PHY_BBANDCFG, tmp); |