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

Commit 5d9c7e3c authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: validate rx antenna settings 



Many chips are not able to deal with non-consecutive rx antenna selections
and respond with calibration errors, reset errors, etc.
When an antenna is selected as a tx antenna, also flag it for rx to avoid
chip issues.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 01967360

drivers/net/wireless/ath/ath9k/main.c

+18 −1
Original line number Diff line number Diff line
@@ -1923,12 +1923,29 @@ static u32 fill_chainmask(u32 cap, u32 new) 
	return filled;

}



static bool validate_antenna_mask(struct ath_hw *ah, u32 val)

{

	switch (val & 0x7) {

	case 0x1:

	case 0x3:

	case 0x7:

		return true;

	case 0x2:

		return (ah->caps.rx_chainmask == 1);

	default:

		return false;

	}

}



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

{

	struct ath_softc *sc = hw->priv;

	struct ath_hw *ah = sc->sc_ah;



	if (!rx_ant || !tx_ant)

	if (ah->caps.rx_chainmask != 1)

		rx_ant |= tx_ant;



	if (!validate_antenna_mask(ah, rx_ant) || !tx_ant)

		return -EINVAL;



	sc->ant_rx = rx_ant;