mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-20 12:27:07 +03:00
4f69a1b329
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23822 3c298f89-4303-0410-b956-a3cf2f4a3e73
116 lines
3.8 KiB
Diff
116 lines
3.8 KiB
Diff
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
|
@@ -654,6 +654,37 @@ err_hw:
|
|
return ret;
|
|
}
|
|
|
|
+static void ath9k_init_band_txpower(struct ath_softc *sc, int band)
|
|
+{
|
|
+ struct ieee80211_supported_band *sband;
|
|
+ struct ieee80211_channel *chan;
|
|
+ struct ath_hw *ah = sc->sc_ah;
|
|
+ struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
|
|
+ int i;
|
|
+
|
|
+ sband = &sc->sbands[band];
|
|
+ for (i = 0; i < sband->n_channels; i++) {
|
|
+ chan = &sband->channels[i];
|
|
+ ah->curchan = &ah->channels[chan->hw_value];
|
|
+ ath9k_cmn_update_ichannel(ah->curchan, chan, NL80211_CHAN_HT20);
|
|
+ ath9k_hw_set_txpowerlimit(ah, MAX_RATE_POWER, true);
|
|
+ chan->max_power = reg->max_power_level / 2;
|
|
+ }
|
|
+}
|
|
+
|
|
+static void ath9k_init_txpower_limits(struct ath_softc *sc)
|
|
+{
|
|
+ struct ath_hw *ah = sc->sc_ah;
|
|
+ struct ath9k_channel *curchan = ah->curchan;
|
|
+
|
|
+ if (ah->caps.hw_caps & ATH9K_HW_CAP_2GHZ)
|
|
+ ath9k_init_band_txpower(sc, IEEE80211_BAND_2GHZ);
|
|
+ if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
|
|
+ ath9k_init_band_txpower(sc, IEEE80211_BAND_5GHZ);
|
|
+
|
|
+ ah->curchan = curchan;
|
|
+}
|
|
+
|
|
void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
|
|
{
|
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
|
@@ -748,6 +779,8 @@ int ath9k_init_device(u16 devid, struct
|
|
if (error != 0)
|
|
goto error_rx;
|
|
|
|
+ ath9k_init_txpower_limits(sc);
|
|
+
|
|
/* Register with mac80211 */
|
|
error = ieee80211_register_hw(hw);
|
|
if (error)
|
|
--- a/drivers/net/wireless/ath/ath9k/common.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/common.c
|
|
@@ -107,12 +107,10 @@ static u32 ath9k_get_extchanmode(struct
|
|
/*
|
|
* Update internal channel flags.
|
|
*/
|
|
-void ath9k_cmn_update_ichannel(struct ieee80211_hw *hw,
|
|
- struct ath9k_channel *ichan)
|
|
+void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
|
|
+ struct ieee80211_channel *chan,
|
|
+ enum nl80211_channel_type channel_type)
|
|
{
|
|
- struct ieee80211_channel *chan = hw->conf.channel;
|
|
- struct ieee80211_conf *conf = &hw->conf;
|
|
-
|
|
ichan->channel = chan->center_freq;
|
|
ichan->chan = chan;
|
|
|
|
@@ -124,9 +122,8 @@ void ath9k_cmn_update_ichannel(struct ie
|
|
ichan->channelFlags = CHANNEL_5GHZ | CHANNEL_OFDM;
|
|
}
|
|
|
|
- if (conf_is_ht(conf))
|
|
- ichan->chanmode = ath9k_get_extchanmode(chan,
|
|
- conf->channel_type);
|
|
+ if (channel_type != NL80211_CHAN_NO_HT)
|
|
+ ichan->chanmode = ath9k_get_extchanmode(chan, channel_type);
|
|
}
|
|
EXPORT_SYMBOL(ath9k_cmn_update_ichannel);
|
|
|
|
@@ -142,7 +139,7 @@ struct ath9k_channel *ath9k_cmn_get_curc
|
|
|
|
chan_idx = curchan->hw_value;
|
|
channel = &ah->channels[chan_idx];
|
|
- ath9k_cmn_update_ichannel(hw, channel);
|
|
+ ath9k_cmn_update_ichannel(channel, curchan, hw->conf.channel_type);
|
|
|
|
return channel;
|
|
}
|
|
--- a/drivers/net/wireless/ath/ath9k/common.h
|
|
+++ b/drivers/net/wireless/ath/ath9k/common.h
|
|
@@ -62,8 +62,9 @@ enum ath_stomp_type {
|
|
|
|
int ath9k_cmn_padpos(__le16 frame_control);
|
|
int ath9k_cmn_get_hw_crypto_keytype(struct sk_buff *skb);
|
|
-void ath9k_cmn_update_ichannel(struct ieee80211_hw *hw,
|
|
- struct ath9k_channel *ichan);
|
|
+void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
|
|
+ struct ieee80211_channel *chan,
|
|
+ enum nl80211_channel_type channel_type);
|
|
struct ath9k_channel *ath9k_cmn_get_curchannel(struct ieee80211_hw *hw,
|
|
struct ath_hw *ah);
|
|
int ath9k_cmn_count_streams(unsigned int chainmask, int max);
|
|
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
|
|
@@ -1405,7 +1405,9 @@ static int ath9k_htc_config(struct ieee8
|
|
ath_print(common, ATH_DBG_CONFIG, "Set channel: %d MHz\n",
|
|
curchan->center_freq);
|
|
|
|
- ath9k_cmn_update_ichannel(hw, &priv->ah->channels[pos]);
|
|
+ ath9k_cmn_update_ichannel(&priv->ah->channels[pos],
|
|
+ hw->conf.channel,
|
|
+ hw->conf.channel_type);
|
|
|
|
if (ath9k_htc_set_channel(priv, hw, &priv->ah->channels[pos]) < 0) {
|
|
ath_print(common, ATH_DBG_FATAL,
|