From 3773de62939dad20e5a74f419155e151b965cbc1 Mon Sep 17 00:00:00 2001
From: Ivo van Doorn <ivdoorn@gmail.com>
Date: Sun, 27 Jul 2008 15:06:21 +0200
Subject: [PATCH] --- yaml --- r: 107707 b: refs/heads/master c:
 ada662f3eb6231ab27f5e6366d4e5c395d25edd3 h: refs/heads/master i:   107705:
 a82894571a5fa95dc32036f252df45353aaddee2   107703:
 dc94bc1177077282e270670de9ee0b166709eb7b v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00config.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b71895782fe0..a73c0d784a7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2b690714cd7d328561bfb9bf941edd6a3316a85
+refs/heads/master: ada662f3eb6231ab27f5e6366d4e5c395d25edd3
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00config.c b/trunk/drivers/net/wireless/rt2x00/rt2x00config.c
index 3f89516e8332..d134c3be539a 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00config.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00config.c
@@ -254,6 +254,8 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
 			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 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
 			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) {