diff options
author | Oleksij Rempel <linux@rempel-privat.de> | 2014-02-25 08:48:55 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-02-28 14:33:16 -0500 |
commit | b57ba3b2f7b00e1241c2ebabb0906321a4e64414 (patch) | |
tree | b6839290ecfe1d48cf304af43eefffc166dad8f7 /drivers/net/wireless/ath/ath9k/init.c | |
parent | 91884fad852da4d00b1a5f5d57203e08884a3c1d (diff) |
ath9k: move ath9k_reload_chainmask_settings to common
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 88be85274b40..c0a4e866edca 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -642,20 +642,6 @@ static void ath9k_init_txpower_limits(struct ath_softc *sc) | |||
642 | ah->curchan = curchan; | 642 | ah->curchan = curchan; |
643 | } | 643 | } |
644 | 644 | ||
645 | void ath9k_reload_chainmask_settings(struct ath_softc *sc) | ||
646 | { | ||
647 | struct ath_hw *ah = sc->sc_ah; | ||
648 | struct ath_common *common = ath9k_hw_common(ah); | ||
649 | |||
650 | if (!(ah->caps.hw_caps & ATH9K_HW_CAP_HT)) | ||
651 | return; | ||
652 | |||
653 | if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ) | ||
654 | ath9k_cmn_setup_ht_cap(ah, &common->sbands[IEEE80211_BAND_2GHZ].ht_cap); | ||
655 | if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ) | ||
656 | ath9k_cmn_setup_ht_cap(ah, &common->sbands[IEEE80211_BAND_5GHZ].ht_cap); | ||
657 | } | ||
658 | |||
659 | static const struct ieee80211_iface_limit if_limits[] = { | 645 | static const struct ieee80211_iface_limit if_limits[] = { |
660 | { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) | | 646 | { .max = 2048, .types = BIT(NL80211_IFTYPE_STATION) | |
661 | BIT(NL80211_IFTYPE_P2P_CLIENT) | | 647 | BIT(NL80211_IFTYPE_P2P_CLIENT) | |
@@ -772,7 +758,7 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) | |||
772 | &common->sbands[IEEE80211_BAND_5GHZ]; | 758 | &common->sbands[IEEE80211_BAND_5GHZ]; |
773 | 759 | ||
774 | ath9k_init_wow(hw); | 760 | ath9k_init_wow(hw); |
775 | ath9k_reload_chainmask_settings(sc); | 761 | ath9k_cmn_reload_chainmask(ah); |
776 | 762 | ||
777 | SET_IEEE80211_PERM_ADDR(hw, common->macaddr); | 763 | SET_IEEE80211_PERM_ADDR(hw, common->macaddr); |
778 | } | 764 | } |