|
|
|
|
@ -1,16 +1,6 @@
|
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
|
|
|
|
@@ -701,6 +701,7 @@ struct ath_softc {
|
|
|
|
|
struct ieee80211_hw *hw;
|
|
|
|
|
struct device *dev;
|
|
|
|
|
|
|
|
|
|
+ u32 chan_bw;
|
|
|
|
|
struct survey_info *cur_survey;
|
|
|
|
|
struct survey_info survey[ATH9K_NUM_CHANNELS];
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
|
|
|
|
@@ -1918,6 +1918,50 @@ static const struct file_operations fops
|
|
|
|
|
@@ -1918,6 +1918,52 @@ static const struct file_operations fops
|
|
|
|
|
.owner = THIS_MODULE
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@ -19,10 +9,11 @@
|
|
|
|
|
+ size_t count, loff_t *ppos)
|
|
|
|
|
+{
|
|
|
|
|
+ struct ath_softc *sc = file->private_data;
|
|
|
|
|
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
|
|
|
|
+ char buf[32];
|
|
|
|
|
+ unsigned int len;
|
|
|
|
|
+
|
|
|
|
|
+ len = sprintf(buf, "0x%08x\n", sc->chan_bw);
|
|
|
|
|
+ len = sprintf(buf, "0x%08x\n", common->chan_bw);
|
|
|
|
|
+ return simple_read_from_buffer(user_buf, count, ppos, buf, len);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
@ -30,6 +21,7 @@
|
|
|
|
|
+ size_t count, loff_t *ppos)
|
|
|
|
|
+{
|
|
|
|
|
+ struct ath_softc *sc = file->private_data;
|
|
|
|
|
+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
|
|
|
|
+ unsigned long chan_bw;
|
|
|
|
|
+ char buf[32];
|
|
|
|
|
+ ssize_t len;
|
|
|
|
|
@ -42,7 +34,7 @@
|
|
|
|
|
+ if (kstrtoul(buf, 0, &chan_bw))
|
|
|
|
|
+ return -EINVAL;
|
|
|
|
|
+
|
|
|
|
|
+ sc->chan_bw = chan_bw;
|
|
|
|
|
+ common->chan_bw = chan_bw;
|
|
|
|
|
+ if (!test_bit(SC_OP_INVALID, &sc->sc_flags))
|
|
|
|
|
+ ath9k_ops.config(sc->hw, IEEE80211_CONF_CHANGE_CHANNEL);
|
|
|
|
|
+
|
|
|
|
|
@ -61,7 +53,7 @@
|
|
|
|
|
int ath9k_init_debug(struct ath_hw *ah)
|
|
|
|
|
{
|
|
|
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
|
|
|
|
@@ -1937,6 +1981,8 @@ int ath9k_init_debug(struct ath_hw *ah)
|
|
|
|
|
@@ -1937,6 +1983,8 @@ int ath9k_init_debug(struct ath_hw *ah)
|
|
|
|
|
|
|
|
|
|
debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
|
|
|
|
|
&fops_eeprom);
|
|
|
|
|
@ -70,41 +62,66 @@
|
|
|
|
|
debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
|
|
|
|
|
&fops_dma);
|
|
|
|
|
debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
|
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
|
|
|
|
@@ -1199,8 +1199,10 @@ static int ath9k_config(struct ieee80211
|
|
|
|
|
--- a/drivers/net/wireless/ath/ath.h
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath.h
|
|
|
|
|
@@ -129,6 +129,7 @@ struct ath_common {
|
|
|
|
|
struct ieee80211_hw *hw;
|
|
|
|
|
int debug_mask;
|
|
|
|
|
enum ath_device_state state;
|
|
|
|
|
+ u32 chan_bw;
|
|
|
|
|
|
|
|
|
|
if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
|
|
|
|
|
struct ieee80211_channel *curchan = hw->conf.chandef.chan;
|
|
|
|
|
+ struct ath9k_channel *hchan;
|
|
|
|
|
int pos = curchan->hw_value;
|
|
|
|
|
int old_pos = -1;
|
|
|
|
|
+ u32 oldflags;
|
|
|
|
|
unsigned long flags;
|
|
|
|
|
struct ath_ani ani;
|
|
|
|
|
|
|
|
|
|
if (ah->curchan)
|
|
|
|
|
@@ -1237,7 +1239,23 @@ static int ath9k_config(struct ieee80211
|
|
|
|
|
memset(&sc->survey[pos], 0, sizeof(struct survey_info));
|
|
|
|
|
}
|
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/common.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/common.c
|
|
|
|
|
@@ -52,11 +52,13 @@ EXPORT_SYMBOL(ath9k_cmn_get_hw_crypto_ke
|
|
|
|
|
/*
|
|
|
|
|
* Update internal channel flags.
|
|
|
|
|
*/
|
|
|
|
|
-static void ath9k_cmn_update_ichannel(struct ath9k_channel *ichan,
|
|
|
|
|
+static void ath9k_cmn_update_ichannel(struct ath_common *common,
|
|
|
|
|
+ struct ath9k_channel *ichan,
|
|
|
|
|
struct cfg80211_chan_def *chandef)
|
|
|
|
|
{
|
|
|
|
|
struct ieee80211_channel *chan = chandef->chan;
|
|
|
|
|
u16 flags = 0;
|
|
|
|
|
+ int width;
|
|
|
|
|
|
|
|
|
|
ichan->channel = chan->center_freq;
|
|
|
|
|
ichan->chan = chan;
|
|
|
|
|
@@ -64,7 +66,19 @@ static void ath9k_cmn_update_ichannel(st
|
|
|
|
|
if (chan->band == IEEE80211_BAND_5GHZ)
|
|
|
|
|
flags |= CHANNEL_5GHZ;
|
|
|
|
|
|
|
|
|
|
- if (ath_set_channel(sc, hw, &sc->sc_ah->channels[pos]) < 0) {
|
|
|
|
|
+ hchan = &sc->sc_ah->channels[pos];
|
|
|
|
|
+ oldflags = hchan->channelFlags;
|
|
|
|
|
+ switch (sc->chan_bw) {
|
|
|
|
|
+ case 5:
|
|
|
|
|
+ hchan->channelFlags &= ~CHANNEL_HALF;
|
|
|
|
|
+ hchan->channelFlags |= CHANNEL_QUARTER;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case 10:
|
|
|
|
|
+ hchan->channelFlags &= ~CHANNEL_QUARTER;
|
|
|
|
|
+ hchan->channelFlags |= CHANNEL_HALF;
|
|
|
|
|
+ break;
|
|
|
|
|
+ default:
|
|
|
|
|
+ hchan->channelFlags &= ~(CHANNEL_HALF | CHANNEL_QUARTER);
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
- switch (chandef->width) {
|
|
|
|
|
+ switch (common->chan_bw) {
|
|
|
|
|
+ case 5:
|
|
|
|
|
+ width = NL80211_CHAN_WIDTH_5;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case 10:
|
|
|
|
|
+ width = NL80211_CHAN_WIDTH_10;
|
|
|
|
|
+ break;
|
|
|
|
|
+ default:
|
|
|
|
|
+ width = chandef->width;
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ if (ath_set_channel(sc, hw, hchan) < 0) {
|
|
|
|
|
ath_err(common, "Unable to set channel\n");
|
|
|
|
|
mutex_unlock(&sc->mutex);
|
|
|
|
|
ath9k_ps_restore(sc);
|
|
|
|
|
+ switch (width) {
|
|
|
|
|
case NL80211_CHAN_WIDTH_5:
|
|
|
|
|
flags |= CHANNEL_QUARTER;
|
|
|
|
|
break;
|
|
|
|
|
@@ -97,12 +111,13 @@ struct ath9k_channel *ath9k_cmn_get_chan
|
|
|
|
|
struct cfg80211_chan_def *chandef)
|
|
|
|
|
{
|
|
|
|
|
struct ieee80211_channel *curchan = chandef->chan;
|
|
|
|
|
+ struct ath_common *common = ath9k_hw_common(ah);
|
|
|
|
|
struct ath9k_channel *channel;
|
|
|
|
|
u8 chan_idx;
|
|
|
|
|
|
|
|
|
|
chan_idx = curchan->hw_value;
|
|
|
|
|
channel = &ah->channels[chan_idx];
|
|
|
|
|
- ath9k_cmn_update_ichannel(channel, chandef);
|
|
|
|
|
+ ath9k_cmn_update_ichannel(common, channel, chandef);
|
|
|
|
|
|
|
|
|
|
return channel;
|
|
|
|
|
}
|
|
|
|
|
|
Felix Fietkau
11 years ago