rt2x00: Start bugging when rt2x00lib doesn't filter SW diversity

rt2x00lib should filter SW diversity out before sending any configuration
changes to the driver. When rt2x00lib fails to do this, it is important
that such events are reported because it _must_ be fixed.
So upgrading the error level to a BUG_ON() which will make sure
this bug gets noticed whenever it happens.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 9 insertions, 14 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index b9e2f3a4990b..7ea4247442b3 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -437,6 +437,13 @@ static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
         u16 csr5;
         u16 csr6;
 
+        /*
+         * We should never come here because rt2x00lib is supposed
+         * to catch this and send us the correct antenna explicitely.
+         */
+        BUG_ON(ant->rx == ANTENNA_SW_DIVERSITY ||
+               ant->tx == ANTENNA_SW_DIVERSITY);
+
         rt2500usb_bbp_read(rt2x00dev, 2, &r2);
         rt2500usb_bbp_read(rt2x00dev, 14, &r14);
         rt2500usb_register_read(rt2x00dev, PHY_CSR5, &csr5);
@@ -456,14 +463,8 @@ 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:
+        default:
                 rt2x00_set_field8(&r2, BBP_R2_TX_ANTENNA, 2);
                 rt2x00_set_field16(&csr5, PHY_CSR5_CCK, 2);
                 rt2x00_set_field16(&csr6, PHY_CSR6_OFDM, 2);
@@ -480,14 +481,8 @@ static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
         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:
+        default:
                 rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 2);
                 break;
         }