[PATCH] rt2x00: SW diversity should default to antenna B

Although ANTENNA_SW_DIVERSITY should never be send
to the driver, we should still handle it to prevent bugs.
But instead of defaulting to ANTENNA_HW_DIVERSITY we
should default to ANTENNA_B instead.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 16 insertions, 10 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index a9872f95361b..958b148d8f50 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -438,17 +438,19 @@ static void rt2500pci_config_antenna(struct rt2x00_dev *rt2x00dev,
          * Configure the TX antenna.
          */
         switch (ant->tx) {
-        case ANTENNA_SW_DIVERSITY:
-        case ANTENNA_HW_DIVERSITY:
-                rt2x00_set_field8(&r2, BBP_R2_TX_ANTENNA, 2);
-                rt2x00_set_field32(&reg, BBPCSR1_CCK, 2);
-                rt2x00_set_field32(&reg, BBPCSR1_OFDM, 2);
-                break;
         case ANTENNA_A:
                 rt2x00_set_field8(&r2, BBP_R2_TX_ANTENNA, 0);
                 rt2x00_set_field32(&reg, BBPCSR1_CCK, 0);
                 rt2x00_set_field32(&reg, BBPCSR1_OFDM, 0);
                 break;
+        case ANTENNA_HW_DIVERSITY:
+        case ANTENNA_SW_DIVERSITY:
+                /*
+                 * NOTE: We should never come here because rt2x00lib is
+                 * supposed to catch this and send us the correct antenna
+                 * explicitely. However we are nog going to bug about this.
+                 * Instead, just default to antenna B.
+                 */
         case ANTENNA_B:
                 rt2x00_set_field8(&r2, BBP_R2_TX_ANTENNA, 2);
                 rt2x00_set_field32(&reg, BBPCSR1_CCK, 2);
@@ -460,13 +462,17 @@ static void rt2500pci_config_antenna(struct rt2x00_dev *rt2x00dev,
          * Configure the RX antenna.
          */
         switch (ant->rx) {
-        case ANTENNA_SW_DIVERSITY:
-        case ANTENNA_HW_DIVERSITY:
-                rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 2);
-                break;
         case ANTENNA_A:
                 rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 0);
                 break;
+        case ANTENNA_HW_DIVERSITY:
+        case ANTENNA_SW_DIVERSITY:
+                /*
+                 * NOTE: We should never come here because rt2x00lib is
+                 * supposed to catch this and send us the correct antenna
+                 * explicitely. However we are nog going to bug about this.
+                 * Instead, just default to antenna B.
+                 */
         case ANTENNA_B:
                 rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 2);
                 break;