[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>

5 files changed, 72 insertions, 18 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 2284cb308971..5b3adbae4820 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -409,13 +409,19 @@ static void rt2400pci_config_antenna(struct rt2x00_dev *rt2x00dev,
          * Configure the TX antenna.
          */
         switch (ant->tx) {
-        case ANTENNA_SW_DIVERSITY:
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r1, BBP_R1_TX_ANTENNA, 1);
                 break;
         case ANTENNA_A:
                 rt2x00_set_field8(&r1, BBP_R1_TX_ANTENNA, 0);
                 break;
+        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(&r1, BBP_R1_TX_ANTENNA, 2);
                 break;
@@ -425,13 +431,19 @@ static void rt2400pci_config_antenna(struct rt2x00_dev *rt2x00dev,
          * Configure the RX antenna.
          */
         switch (ant->rx) {
-        case ANTENNA_SW_DIVERSITY:
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1);
                 break;
         case ANTENNA_A:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 0);
                 break;
+        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(&r4, BBP_R4_RX_ANTENNA, 2);
                 break;
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;
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 31531f7cc125..60f729044427 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -401,7 +401,6 @@ static void rt2500usb_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, 1);
                 rt2x00_set_field16(&csr5, PHY_CSR5_CCK, 1);
@@ -412,6 +411,13 @@ static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field16(&csr5, PHY_CSR5_CCK, 0);
                 rt2x00_set_field16(&csr6, PHY_CSR6_OFDM, 0);
                 break;
+        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_field16(&csr5, PHY_CSR5_CCK, 2);
@@ -423,13 +429,19 @@ static void rt2500usb_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, 1);
                 break;
         case ANTENNA_A:
                 rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 0);
                 break;
+        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;
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index b644a66dcb50..aebc96344cd8 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -425,7 +425,6 @@ static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
                           !rt2x00_rf(&rt2x00dev->chip, RF5225));
 
         switch (ant->rx) {
-        case ANTENNA_SW_DIVERSITY:
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END,
@@ -440,6 +439,13 @@ static void rt61pci_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
                 else
                         rt2x00_set_field8(&r77, BBP_R77_PAIR, 3);
                 break;
+        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(&r4, BBP_R4_RX_ANTENNA, 1);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
@@ -473,7 +479,6 @@ static void rt61pci_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
                           !test_bit(CONFIG_FRAME_TYPE, &rt2x00dev->flags));
 
         switch (ant->rx) {
-        case ANTENNA_SW_DIVERSITY:
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2);
                 break;
@@ -481,6 +486,13 @@ static void rt61pci_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1);
                 rt2x00_set_field8(&r77, BBP_R77_PAIR, 3);
                 break;
+        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(&r4, BBP_R4_RX_ANTENNA, 1);
                 rt2x00_set_field8(&r77, BBP_R77_PAIR, 0);
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 92c78968a0b9..18324210c13a 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -409,7 +409,6 @@ static void rt73usb_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field8(&r3, BBP_R3_SMART_MODE, 0);
 
         switch (ant->rx) {
-        case ANTENNA_SW_DIVERSITY:
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END,
@@ -424,6 +423,13 @@ static void rt73usb_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
                 else
                         rt2x00_set_field8(&r77, BBP_R77_PAIR, 3);
                 break;
+        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(&r4, BBP_R4_RX_ANTENNA, 1);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
@@ -456,7 +462,6 @@ static void rt73usb_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
                           !test_bit(CONFIG_FRAME_TYPE, &rt2x00dev->flags));
 
         switch (ant->rx) {
-        case ANTENNA_SW_DIVERSITY:
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2);
                 break;
@@ -464,6 +469,13 @@ static void rt73usb_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1);
                 rt2x00_set_field8(&r77, BBP_R77_PAIR, 3);
                 break;
+        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(&r4, BBP_R4_RX_ANTENNA, 1);
                 rt2x00_set_field8(&r77, BBP_R77_PAIR, 0);