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

Commit 0f4ac38b authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: kill hw.conf.antenna_sel_{rx,tx} 



Never actually used.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d9fe60de

drivers/net/wireless/b43/main.c

+3 −22
Original line number Diff line number Diff line
@@ -1339,25 +1339,6 @@ u8 b43_ieee80211_antenna_sanitize(struct b43_wldev *dev, 
	return antenna_nr;

}



static int b43_antenna_from_ieee80211(struct b43_wldev *dev, u8 antenna)

{

	antenna = b43_ieee80211_antenna_sanitize(dev, antenna);

	switch (antenna) {

	case 0:		/* default/diversity */

		return B43_ANTENNA_DEFAULT;

	case 1:		/* Antenna 0 */

		return B43_ANTENNA0;

	case 2:		/* Antenna 1 */

		return B43_ANTENNA1;

	case 3:		/* Antenna 2 */

		return B43_ANTENNA2;

	case 4:		/* Antenna 3 */

		return B43_ANTENNA3;

	default:

		return B43_ANTENNA_DEFAULT;

	}

}



/* Convert a b43 antenna number value to the PHY TX control value. */

static u16 b43_antenna_to_phyctl(int antenna)

{
@@ -1399,7 +1380,7 @@ static void b43_write_beacon_template(struct b43_wldev *dev, 
				  len, ram_offset, shm_size_offset, rate);



	/* Write the PHY TX control parameters. */

	antenna = b43_antenna_from_ieee80211(dev, info->antenna_sel_tx);

	antenna = B43_ANTENNA_DEFAULT;

	antenna = b43_antenna_to_phyctl(antenna);

	ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);

	/* We can't send beacons with short preamble. Would get PHY errors. */
@@ -3399,9 +3380,9 @@ static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) 
	}



	/* Antennas for RX and management frame TX. */

	antenna = b43_antenna_from_ieee80211(dev, conf->antenna_sel_tx);

	antenna = B43_ANTENNA_DEFAULT;

	b43_mgmtframe_txantenna(dev, antenna);

	antenna = b43_antenna_from_ieee80211(dev, conf->antenna_sel_rx);

	antenna = B43_ANTENNA_DEFAULT;

	if (phy->ops->set_rx_antenna)

		phy->ops->set_rx_antenna(dev, antenna);

drivers/net/wireless/b43legacy/main.c

+2 −16
Original line number Diff line number Diff line
@@ -2556,20 +2556,6 @@ static int b43legacy_switch_phymode(struct b43legacy_wl *wl, 
	return err;

}



static int b43legacy_antenna_from_ieee80211(u8 antenna)

{

	switch (antenna) {

	case 0: /* default/diversity */

		return B43legacy_ANTENNA_DEFAULT;

	case 1: /* Antenna 0 */

		return B43legacy_ANTENNA0;

	case 2: /* Antenna 1 */

		return B43legacy_ANTENNA1;

	default:

		return B43legacy_ANTENNA_DEFAULT;

	}

}



static int b43legacy_op_dev_config(struct ieee80211_hw *hw,

				   struct ieee80211_conf *conf)

{
@@ -2583,8 +2569,8 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw, 
	int err = 0;

	u32 savedirqs;



	antenna_tx = b43legacy_antenna_from_ieee80211(conf->antenna_sel_tx);

	antenna_rx = b43legacy_antenna_from_ieee80211(conf->antenna_sel_rx);

	antenna_tx = B43legacy_ANTENNA_DEFAULT;

	antenna_rx = B43legacy_ANTENNA_DEFAULT;



	mutex_lock(&wl->mutex);

	dev = wl->current_dev;

drivers/net/wireless/p54/p54common.c

+1 −2
Original line number Diff line number Diff line
@@ -1198,8 +1198,7 @@ static int p54_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf) 
	struct p54_common *priv = dev->priv;



	mutex_lock(&priv->conf_mutex);

	priv->rx_antenna = (conf->antenna_sel_rx == 0) ?

		2 : conf->antenna_sel_tx - 1;

	priv->rx_antenna = 2; /* automatic */

	priv->output_power = conf->power_level << 2;

	ret = p54_set_freq(dev, cpu_to_le16(conf->channel->center_freq));

	p54_set_vdcf(dev);

drivers/net/wireless/rt2x00/rt2x00config.c

+4 −16
Original line number Diff line number Diff line
@@ -199,23 +199,15 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
	 * to work with untill the link tuner decides that an antenna

	 * switch should be performed.

	 */

	if (!conf->antenna_sel_rx &&

	    default_ant->rx != ANTENNA_SW_DIVERSITY &&

	if (default_ant->rx != ANTENNA_SW_DIVERSITY &&

	    default_ant->rx != active_ant->rx)

		flags |= CONFIG_UPDATE_ANTENNA;

	else if (conf->antenna_sel_rx &&

		 conf->antenna_sel_rx != active_ant->rx)

		flags |= CONFIG_UPDATE_ANTENNA;

	else if (active_ant->rx == ANTENNA_SW_DIVERSITY)

		flags |= CONFIG_UPDATE_ANTENNA;



	if (!conf->antenna_sel_tx &&

	    default_ant->tx != ANTENNA_SW_DIVERSITY &&

	if (default_ant->tx != ANTENNA_SW_DIVERSITY &&

	    default_ant->tx != active_ant->tx)

		flags |= CONFIG_UPDATE_ANTENNA;

	else if (conf->antenna_sel_tx &&

		 conf->antenna_sel_tx != active_ant->tx)

		flags |= CONFIG_UPDATE_ANTENNA;

	else if (active_ant->tx == ANTENNA_SW_DIVERSITY)

		flags |= CONFIG_UPDATE_ANTENNA;
@@ -252,18 +244,14 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
	}



	if (flags & CONFIG_UPDATE_ANTENNA) {

		if (conf->antenna_sel_rx)

			libconf.ant.rx = conf->antenna_sel_rx;

		else if (default_ant->rx != ANTENNA_SW_DIVERSITY)

		if (default_ant->rx != ANTENNA_SW_DIVERSITY)

			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)

		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;

drivers/net/wireless/rt2x00/rt2x00dev.c

+2 −4
Original line number Diff line number Diff line
@@ -249,11 +249,9 @@ static void rt2x00lib_evaluate_antenna(struct rt2x00_dev *rt2x00dev) 
	rt2x00dev->link.ant.flags &= ~ANTENNA_RX_DIVERSITY;

	rt2x00dev->link.ant.flags &= ~ANTENNA_TX_DIVERSITY;



	if (rt2x00dev->hw->conf.antenna_sel_rx == 0 &&

	    rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY)

	if (rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY)

		rt2x00dev->link.ant.flags |= ANTENNA_RX_DIVERSITY;

	if (rt2x00dev->hw->conf.antenna_sel_tx == 0 &&

	    rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY)

	if (rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY)

		rt2x00dev->link.ant.flags |= ANTENNA_TX_DIVERSITY;



	if (!(rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) &&