Commit ada662f3 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

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: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d2b69071
...@@ -254,6 +254,8 @@ config: ...@@ -254,6 +254,8 @@ config:
libconf.ant.rx = default_ant->rx; libconf.ant.rx = default_ant->rx;
else if (active_ant->rx == ANTENNA_SW_DIVERSITY) else if (active_ant->rx == ANTENNA_SW_DIVERSITY)
libconf.ant.rx = ANTENNA_B; libconf.ant.rx = ANTENNA_B;
else
libconf.ant.rx = active_ant->rx;
if (conf->antenna_sel_tx) if (conf->antenna_sel_tx)
libconf.ant.tx = conf->antenna_sel_tx; libconf.ant.tx = conf->antenna_sel_tx;
...@@ -261,6 +263,8 @@ config: ...@@ -261,6 +263,8 @@ config:
libconf.ant.tx = default_ant->tx; libconf.ant.tx = default_ant->tx;
else if (active_ant->tx == ANTENNA_SW_DIVERSITY) else if (active_ant->tx == ANTENNA_SW_DIVERSITY)
libconf.ant.tx = ANTENNA_B; libconf.ant.tx = ANTENNA_B;
else
libconf.ant.tx = active_ant->tx;
} }
if (flags & CONFIG_UPDATE_SLOT_TIME) { if (flags & CONFIG_UPDATE_SLOT_TIME) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment