---

yaml --- r: 107707 b: refs/heads/master c: ada662f h: refs/heads/master i: 107705: a828945 107703: dc94bc1 v: v3
git-mirror · Aug 1, 2008 · 3773de6 · 3773de6
1 parent 7f85d84
commit 3773de6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -254,13 +254,17 @@ 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;
 		else if (default_ant->tx != ANTENNA_SW_DIVERSITY)
 			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) {