rt2x00: Fix partial antenna configuration

The if-statement to determine the new TX/RX antenna
configuration was incomplete. It lacks the general
else-clause when the antenna wasn't changed.

This is a correct event, since it can occur when only
one of the antenna's has been changed or when the new
configuration is being forced (like when the interface
has just been added).

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

diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c
index 3f89516e8332128bf77c7b93959b7ea519556a57..d134c3be539a7af207ea5543b1e90e1f085ff945 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -254,6 +254,8 @@ config:
                        libconf.ant.rx = default_ant->rx;
                else if (active_ant->rx == ANTENNA_SW_DIVERSITY)
                        libconf.ant.rx = ANTENNA_B;
+               else
+                       libconf.ant.rx = active_ant->rx;
 
                if (conf->antenna_sel_tx)
                        libconf.ant.tx = conf->antenna_sel_tx;
@@ -261,6 +263,8 @@ config:
                        libconf.ant.tx = default_ant->tx;
                else if (active_ant->tx == ANTENNA_SW_DIVERSITY)
                        libconf.ant.tx = ANTENNA_B;
+               else
+                       libconf.ant.tx = active_ant->tx;
        }
 
        if (flags & CONFIG_UPDATE_SLOT_TIME) {