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

Commit 72a80110 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath5k: Add support for antenna configuration 



Support setting the antenna configuration via cfg/mac80211. At the moment only
allow the simple pre-defined configurations we already have (fixed antenna A/B
or diversity), but more advanced settings are possible to implement.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 15d96753

drivers/net/wireless/ath/ath5k/base.c

+32 −0
Original line number Original line Diff line number Diff line
@@ -3413,6 +3413,36 @@ static int ath5k_conf_tx(struct ieee80211_hw *hw, u16 queue, 
	return ret;

	return ret;

}

}





static int ath5k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)

{

	struct ath5k_softc *sc = hw->priv;



	if (tx_ant == 1 && rx_ant == 1)

		ath5k_hw_set_antenna_mode(sc->ah, AR5K_ANTMODE_FIXED_A);

	else if (tx_ant == 2 && rx_ant == 2)

		ath5k_hw_set_antenna_mode(sc->ah, AR5K_ANTMODE_FIXED_B);

	else if ((tx_ant & 3) == 3 && (rx_ant & 3) == 3)

		ath5k_hw_set_antenna_mode(sc->ah, AR5K_ANTMODE_DEFAULT);

	else

		return -EINVAL;

	return 0;

}



static int ath5k_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)

{

	struct ath5k_softc *sc = hw->priv;



	switch (sc->ah->ah_ant_mode) {

	case AR5K_ANTMODE_FIXED_A:

		*tx_ant = 1; *rx_ant = 1; break;

	case AR5K_ANTMODE_FIXED_B:

		*tx_ant = 2; *rx_ant = 2; break;

	case AR5K_ANTMODE_DEFAULT:

		*tx_ant = 3; *rx_ant = 3; break;

	}

	return 0;

}



static const struct ieee80211_ops ath5k_hw_ops = {

static const struct ieee80211_ops ath5k_hw_ops = {

	.tx 		= ath5k_tx,

	.tx 		= ath5k_tx,

	.start 		= ath5k_start,

	.start 		= ath5k_start,
@@ -3433,6 +3463,8 @@ static const struct ieee80211_ops ath5k_hw_ops = { 
	.sw_scan_start	= ath5k_sw_scan_start,

	.sw_scan_start	= ath5k_sw_scan_start,

	.sw_scan_complete = ath5k_sw_scan_complete,

	.sw_scan_complete = ath5k_sw_scan_complete,

	.set_coverage_class = ath5k_set_coverage_class,

	.set_coverage_class = ath5k_set_coverage_class,

	.set_antenna	= ath5k_set_antenna,

	.get_antenna	= ath5k_get_antenna,

};

};





/********************\

/********************\