| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141 |
- --- a/drivers/net/wireless/ath/ath9k/ath9k.h
- +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
- @@ -624,6 +624,7 @@ struct ath_softc {
- struct ieee80211_hw *hw;
- struct device *dev;
-
- + u32 chan_bw;
- int chan_idx;
- int chan_is_ht;
- struct survey_info *cur_survey;
- @@ -691,6 +692,7 @@ struct ath_softc {
- u8 ant_tx, ant_rx;
- };
-
- +int ath9k_config(struct ieee80211_hw *hw, u32 changed);
- void ath9k_tasklet(unsigned long data);
- int ath_cabq_update(struct ath_softc *);
-
- --- a/drivers/net/wireless/ath/ath9k/debug.c
- +++ b/drivers/net/wireless/ath/ath9k/debug.c
- @@ -1576,6 +1576,50 @@ static const struct file_operations fops
- .owner = THIS_MODULE
- };
-
- +
- +static ssize_t read_file_chan_bw(struct file *file, char __user *user_buf,
- + size_t count, loff_t *ppos)
- +{
- + struct ath_softc *sc = file->private_data;
- + char buf[32];
- + unsigned int len;
- +
- + len = sprintf(buf, "0x%08x\n", sc->chan_bw);
- + return simple_read_from_buffer(user_buf, count, ppos, buf, len);
- +}
- +
- +static ssize_t write_file_chan_bw(struct file *file, const char __user *user_buf,
- + size_t count, loff_t *ppos)
- +{
- + struct ath_softc *sc = file->private_data;
- + unsigned long chan_bw;
- + char buf[32];
- + ssize_t len;
- +
- + len = min(count, sizeof(buf) - 1);
- + if (copy_from_user(buf, user_buf, len))
- + return -EFAULT;
- +
- + buf[len] = '\0';
- + if (strict_strtoul(buf, 0, &chan_bw))
- + return -EINVAL;
- +
- + sc->chan_bw = chan_bw;
- + if (!(sc->sc_flags & SC_OP_INVALID))
- + ath9k_config(sc->hw, IEEE80211_CONF_CHANGE_CHANNEL);
- +
- + return count;
- +}
- +
- +static const struct file_operations fops_chanbw = {
- + .read = read_file_chan_bw,
- + .write = write_file_chan_bw,
- + .open = ath9k_debugfs_open,
- + .owner = THIS_MODULE,
- + .llseek = default_llseek,
- +};
- +
- +
- int ath9k_init_debug(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
- @@ -1642,5 +1686,8 @@ int ath9k_init_debug(struct ath_hw *ah)
- debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_eeprom);
-
- + debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
- + sc, &fops_chanbw);
- +
- return 0;
- }
- --- a/drivers/net/wireless/ath/ath9k/main.c
- +++ b/drivers/net/wireless/ath/ath9k/main.c
- @@ -1537,7 +1537,7 @@ static void ath9k_disable_ps(struct ath_
-
- }
-
- -static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
- +int ath9k_config(struct ieee80211_hw *hw, u32 changed)
- {
- struct ath_softc *sc = hw->priv;
- struct ath_hw *ah = sc->sc_ah;
- @@ -1588,9 +1588,11 @@ static int ath9k_config(struct ieee80211
-
- if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
- struct ieee80211_channel *curchan = hw->conf.channel;
- + struct ath9k_channel *hchan;
- int pos = curchan->hw_value;
- int old_pos = -1;
- unsigned long flags;
- + u32 oldflags;
-
- if (ah->curchan)
- old_pos = ah->curchan - &ah->channels[0];
- @@ -1638,7 +1640,23 @@ static int ath9k_config(struct ieee80211
- memset(&sc->survey[pos], 0, sizeof(struct survey_info));
- }
-
- - 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;
- + }
- +
- + if (ath_set_channel(sc, hw, hchan) < 0) {
- ath_err(common, "Unable to set channel\n");
- mutex_unlock(&sc->mutex);
- return -EINVAL;
- --- a/drivers/net/wireless/ath/ath9k/hw.c
- +++ b/drivers/net/wireless/ath/ath9k/hw.c
- @@ -1576,6 +1576,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- caldata->rtt_hist.num_readings)
- allow_fbs = true;
-
- + if (!ah->curchan || ((ah->curchan->channelFlags ^ chan->channelFlags) &
- + (CHANNEL_HALF | CHANNEL_QUARTER)))
- + bChannelChange = false;
- +
- if (bChannelChange &&
- (ah->chip_fullsleep != true) &&
- (ah->curchan != NULL) &&
|
