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

Commit b57ba3b2 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by John W. Linville
Browse files

ath9k: move ath9k_reload_chainmask_settings to common 



Signed-off-by: default avatarOleksij Rempel <linux@rempel-privat.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 91884fad

drivers/net/wireless/ath/ath9k/common-init.c

+16 −0
Original line number Diff line number Diff line
@@ -226,3 +226,19 @@ void ath9k_cmn_setup_ht_cap(struct ath_hw *ah, 
	ht_info->mcs.tx_params |= IEEE80211_HT_MCS_TX_DEFINED;

}

EXPORT_SYMBOL(ath9k_cmn_setup_ht_cap);



void ath9k_cmn_reload_chainmask(struct ath_hw *ah)

{

	struct ath_common *common = ath9k_hw_common(ah);



	if (!(ah->caps.hw_caps & ATH9K_HW_CAP_HT))

		return;



	if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ)

		ath9k_cmn_setup_ht_cap(ah,

			&common->sbands[IEEE80211_BAND_2GHZ].ht_cap);

	if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)

		ath9k_cmn_setup_ht_cap(ah,

			&common->sbands[IEEE80211_BAND_5GHZ].ht_cap);

}

EXPORT_SYMBOL(ath9k_cmn_reload_chainmask);

drivers/net/wireless/ath/ath9k/common-init.h

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ 
int ath9k_cmn_init_channels_rates(struct ath_common *common);

void ath9k_cmn_setup_ht_cap(struct ath_hw *ah,

			    struct ieee80211_sta_ht_cap *ht_info);

void ath9k_cmn_reload_chainmask(struct ath_hw *ah);

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

+1 −15
Original line number Diff line number Diff line
@@ -642,20 +642,6 @@ static void ath9k_init_txpower_limits(struct ath_softc *sc) 
	ah->curchan = curchan;

}



void ath9k_reload_chainmask_settings(struct ath_softc *sc)

{

	struct ath_hw *ah = sc->sc_ah;

	struct ath_common *common = ath9k_hw_common(ah);



	if (!(ah->caps.hw_caps & ATH9K_HW_CAP_HT))

		return;



	if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ)

		ath9k_cmn_setup_ht_cap(ah, &common->sbands[IEEE80211_BAND_2GHZ].ht_cap);

	if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)

		ath9k_cmn_setup_ht_cap(ah, &common->sbands[IEEE80211_BAND_5GHZ].ht_cap);

}



static const struct ieee80211_iface_limit if_limits[] = {

	{ .max = 2048,	.types = BIT(NL80211_IFTYPE_STATION) |

				 BIT(NL80211_IFTYPE_P2P_CLIENT) |
@@ -772,7 +758,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
			&common->sbands[IEEE80211_BAND_5GHZ];



	ath9k_init_wow(hw);

	ath9k_reload_chainmask_settings(sc);

	ath9k_cmn_reload_chainmask(ah);



	SET_IEEE80211_PERM_ADDR(hw, common->macaddr);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -2053,7 +2053,7 @@ static int ath9k_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant) 
		ah->rxchainmask = fill_chainmask(ah->caps.rx_chainmask, rx_ant);



	ah->txchainmask = fill_chainmask(ah->caps.tx_chainmask, tx_ant);

	ath9k_reload_chainmask_settings(sc);

	ath9k_cmn_reload_chainmask(ah);



	return 0;

}