Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drivers/net/wireless/rt2x00/rt2x00config.c

+4 −0
Original line number Diff line number Diff line
@@ -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) {