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

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

rt2x00: Implement get_antenna and set_antenna callback functions 



Implement the get_antenna and set_antenna callback functions, which will
allow clients to control the antenna for all non-11n hardware (Antenna handling
in rt2800 is still a bit magical, so we can't use the set_antenna for those drivers
yet).

To best support the set_antenna callback some modifications are needed in the
diversity handling. We should never look at the default antenna settings to determine
if software diversity is enabled. Instead we should set the diversity flag when
possible, which will allow the link_tuner to automatically pick up the tuning.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e7dee444

drivers/net/wireless/rt2x00/rt2400pci.c

+2 −0
Original line number Diff line number Diff line
@@ -1720,6 +1720,8 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = { 
	.tx_last_beacon		= rt2400pci_tx_last_beacon,

	.rfkill_poll		= rt2x00mac_rfkill_poll,

	.flush			= rt2x00mac_flush,

	.set_antenna		= rt2x00mac_set_antenna,

	.get_antenna		= rt2x00mac_get_antenna,

	.get_ringparam		= rt2x00mac_get_ringparam,

};

drivers/net/wireless/rt2x00/rt2500pci.c

+2 −0
Original line number Diff line number Diff line
@@ -2013,6 +2013,8 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = { 
	.tx_last_beacon		= rt2500pci_tx_last_beacon,

	.rfkill_poll		= rt2x00mac_rfkill_poll,

	.flush			= rt2x00mac_flush,

	.set_antenna		= rt2x00mac_set_antenna,

	.get_antenna		= rt2x00mac_get_antenna,

	.get_ringparam		= rt2x00mac_get_ringparam,

};

drivers/net/wireless/rt2x00/rt2500usb.c

+2 −0
Original line number Diff line number Diff line
@@ -1823,6 +1823,8 @@ static const struct ieee80211_ops rt2500usb_mac80211_ops = { 
	.conf_tx		= rt2x00mac_conf_tx,

	.rfkill_poll		= rt2x00mac_rfkill_poll,

	.flush			= rt2x00mac_flush,

	.set_antenna		= rt2x00mac_set_antenna,

	.get_antenna		= rt2x00mac_get_antenna,

	.get_ringparam		= rt2x00mac_get_ringparam,

};

drivers/net/wireless/rt2x00/rt2x00.h

+2 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,8 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw, u16 queue, 
		      const struct ieee80211_tx_queue_params *params);

void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw);

void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop);

int rt2x00mac_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant);

int rt2x00mac_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);

void rt2x00mac_get_ringparam(struct ieee80211_hw *hw,

			     u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max);

drivers/net/wireless/rt2x00/rt2x00config.c

+26 −19
Original line number Diff line number Diff line
@@ -109,15 +109,6 @@ void rt2x00lib_config_erp(struct rt2x00_dev *rt2x00dev, 
	rt2x00dev->ops->lib->config_erp(rt2x00dev, &erp, changed);

}



static inline

enum antenna rt2x00lib_config_antenna_check(enum antenna current_ant,

					    enum antenna default_ant)

{

	if (current_ant != ANTENNA_SW_DIVERSITY)

		return current_ant;

	return (default_ant != ANTENNA_SW_DIVERSITY) ? default_ant : ANTENNA_B;

}



void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,

			      struct antenna_setup config)

{
@@ -126,19 +117,35 @@ void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev, 
	struct antenna_setup *active = &rt2x00dev->link.ant.active;



	/*

	 * Failsafe: Make sure we are not sending the

	 * ANTENNA_SW_DIVERSITY state to the driver.

	 * If that happens, fallback to hardware defaults,

	 * or our own default.

	 * When the caller tries to send the SW diversity,

	 * we must update the ANTENNA_RX_DIVERSITY flag to

	 * enable the antenna diversity in the link tuner.

	 *

	 * Secondly, we must guarentee we never send the

	 * software antenna diversity command to the driver.

	 */

	if (!(ant->flags & ANTENNA_RX_DIVERSITY))

		config.rx = rt2x00lib_config_antenna_check(config.rx, def->rx);

	else if (config.rx == ANTENNA_SW_DIVERSITY)

	if (!(ant->flags & ANTENNA_RX_DIVERSITY)) {

		if (config.rx == ANTENNA_SW_DIVERSITY) {

			ant->flags |= ANTENNA_RX_DIVERSITY;



			if (def->rx == ANTENNA_SW_DIVERSITY)

				config.rx = ANTENNA_B;

			else

				config.rx = def->rx;

		}

	} else if (config.rx == ANTENNA_SW_DIVERSITY)

		config.rx = active->rx;



	if (!(ant->flags & ANTENNA_TX_DIVERSITY))

		config.tx = rt2x00lib_config_antenna_check(config.tx, def->tx);

	else if (config.tx == ANTENNA_SW_DIVERSITY)

	if (!(ant->flags & ANTENNA_TX_DIVERSITY)) {

		if (config.tx == ANTENNA_SW_DIVERSITY) {

			ant->flags |= ANTENNA_TX_DIVERSITY;



			if (def->tx == ANTENNA_SW_DIVERSITY)

				config.tx = ANTENNA_B;

			else

				config.tx = def->tx;

		}

	} else if (config.tx == ANTENNA_SW_DIVERSITY)

		config.tx = active->tx;



	/*