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>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index f5bdf1cae1d1..0f168443ad49 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -1456,7 +1456,8 @@ static u16 b43_antenna_to_phyctl(int antenna)
                 return B43_TXH_PHY_ANT2;
         case B43_ANTENNA3:
                 return B43_TXH_PHY_ANT3;
-        case B43_ANTENNA_AUTO:
+        case B43_ANTENNA_AUTO0:
+        case B43_ANTENNA_AUTO1:
                 return B43_TXH_PHY_ANT01AUTO;
         }
         B43_WARN_ON(1);