[PATCH] rt2x00: Correctly translate mac80211 antenna setup to rt2x00

mac80211 has 3 values for the antenna setup:
 0 - default
 1 - use antenna 1
 2 - use antenna 2

This means that rt2x00 should store the default value
from the EEPROM somwhere and use that when mac80211 indicates
that the antenna setup is 0.
This also implies that rt2x00 should no longer write the
hw->config.antenna_sel_* values based on the EEPROM input.

This also adds the basis in rt2x00lib for correct software
diversity handling. By default rt2x00lib will now configure
antenna B instead of hardware diversity.

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, 17 insertions, 8 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 98edd621c13b..31531f7cc125 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -385,7 +385,7 @@ static void rt2500usb_config_txpower(struct rt2x00_dev *rt2x00dev,
 }
 
 static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
-                                     const int antenna_tx, const int antenna_rx)
+                                     struct antenna_setup *ant)
 {
         u8 r2;
         u8 r14;
@@ -400,7 +400,7 @@ static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
         /*
          * Configure the TX antenna.
          */
-        switch (antenna_tx) {
+        switch (ant->tx) {
         case ANTENNA_SW_DIVERSITY:
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r2, BBP_R2_TX_ANTENNA, 1);
@@ -422,7 +422,7 @@ static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
         /*
          * Configure the RX antenna.
          */
-        switch (antenna_rx) {
+        switch (ant->rx) {
         case ANTENNA_SW_DIVERSITY:
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r14, BBP_R14_RX_ANTENNA, 1);
@@ -487,9 +487,7 @@ static void rt2500usb_config(struct rt2x00_dev *rt2x00dev,
                 rt2500usb_config_txpower(rt2x00dev,
                                          libconf->conf->power_level);
         if (flags & CONFIG_UPDATE_ANTENNA)
-                rt2500usb_config_antenna(rt2x00dev,
-                                         libconf->conf->antenna_sel_tx,
-                                         libconf->conf->antenna_sel_rx);
+                rt2500usb_config_antenna(rt2x00dev, &libconf->ant);
         if (flags & (CONFIG_UPDATE_SLOT_TIME | CONFIG_UPDATE_BEACON_INT))
                 rt2500usb_config_duration(rt2x00dev, libconf);
 }
@@ -1278,12 +1276,23 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev)
         /*
          * Identify default antenna configuration.
          */
-        rt2x00dev->hw->conf.antenna_sel_tx =
+        rt2x00dev->default_ant.tx =
             rt2x00_get_field16(eeprom, EEPROM_ANTENNA_TX_DEFAULT);
-        rt2x00dev->hw->conf.antenna_sel_rx =
+        rt2x00dev->default_ant.rx =
             rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RX_DEFAULT);
 
         /*
+         * When the eeprom indicates SW_DIVERSITY use HW_DIVERSITY instead.
+         * I am not 100% sure about this, but the legacy drivers do not
+         * indicate antenna swapping in software is required when
+         * diversity is enabled.
+         */
+        if (rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY)
+                rt2x00dev->default_ant.tx = ANTENNA_HW_DIVERSITY;
+        if (rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY)
+                rt2x00dev->default_ant.rx = ANTENNA_HW_DIVERSITY;
+
+        /*
          * Store led mode, for correct led behaviour.
          */
         rt2x00dev->led_mode =