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, 5 insertions, 5 deletions

diff --git a/drivers/net/wireless/b43/phy_common.h b/drivers/net/wireless/b43/phy_common.h
index b47a0f55c0b6..28e384633c34 100644
--- a/drivers/net/wireless/b43/phy_common.h
+++ b/drivers/net/wireless/b43/phy_common.h
@@ -49,11 +49,11 @@ enum b43_interference_mitigation {
 
 /* Antenna identifiers */
 enum {
-        B43_ANTENNA0,           /* Antenna 0 */
-        B43_ANTENNA1,           /* Antenna 0 */
-        B43_ANTENNA_AUTO1,      /* Automatic, starting with antenna 1 */
-        B43_ANTENNA_AUTO0,      /* Automatic, starting with antenna 0 */
-        B43_ANTENNA2,
+        B43_ANTENNA0 = 0,       /* Antenna 0 */
+        B43_ANTENNA1 = 1,       /* Antenna 1 */
+        B43_ANTENNA_AUTO0 = 2,  /* Automatic, starting with antenna 0 */
+        B43_ANTENNA_AUTO1 = 3,  /* Automatic, starting with antenna 1 */
+        B43_ANTENNA2 = 4,
         B43_ANTENNA3 = 8,
 
         B43_ANTENNA_AUTO = B43_ANTENNA_AUTO0,