mac80211: update to wireless-testing 2012-02-06
[openwrt/openwrt.git] / package / mac80211 / patches / 513-ath9k_channelbw_debugfs.patch
1 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
2 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
3 @@ -595,6 +595,7 @@ struct ath_softc {
4 struct ieee80211_hw *hw;
5 struct device *dev;
6
7 + u32 chan_bw;
8 int chan_idx;
9 int chan_is_ht;
10 struct survey_info *cur_survey;
11 @@ -659,6 +660,7 @@ struct ath_softc {
12 u8 ant_tx, ant_rx;
13 };
14
15 +int ath9k_config(struct ieee80211_hw *hw, u32 changed);
16 void ath9k_tasklet(unsigned long data);
17 int ath_cabq_update(struct ath_softc *);
18
19 --- a/drivers/net/wireless/ath/ath9k/debug.c
20 +++ b/drivers/net/wireless/ath/ath9k/debug.c
21 @@ -1663,6 +1663,50 @@ static const struct file_operations fops
22 .owner = THIS_MODULE
23 };
24
25 +
26 +static ssize_t read_file_chan_bw(struct file *file, char __user *user_buf,
27 + size_t count, loff_t *ppos)
28 +{
29 + struct ath_softc *sc = file->private_data;
30 + char buf[32];
31 + unsigned int len;
32 +
33 + len = sprintf(buf, "0x%08x\n", sc->chan_bw);
34 + return simple_read_from_buffer(user_buf, count, ppos, buf, len);
35 +}
36 +
37 +static ssize_t write_file_chan_bw(struct file *file, const char __user *user_buf,
38 + size_t count, loff_t *ppos)
39 +{
40 + struct ath_softc *sc = file->private_data;
41 + unsigned long chan_bw;
42 + char buf[32];
43 + ssize_t len;
44 +
45 + len = min(count, sizeof(buf) - 1);
46 + if (copy_from_user(buf, user_buf, len))
47 + return -EFAULT;
48 +
49 + buf[len] = '\0';
50 + if (strict_strtoul(buf, 0, &chan_bw))
51 + return -EINVAL;
52 +
53 + sc->chan_bw = chan_bw;
54 + if (!(sc->sc_flags & SC_OP_INVALID))
55 + ath9k_config(sc->hw, IEEE80211_CONF_CHANGE_CHANNEL);
56 +
57 + return count;
58 +}
59 +
60 +static const struct file_operations fops_chanbw = {
61 + .read = read_file_chan_bw,
62 + .write = write_file_chan_bw,
63 + .open = ath9k_debugfs_open,
64 + .owner = THIS_MODULE,
65 + .llseek = default_llseek,
66 +};
67 +
68 +
69 int ath9k_init_debug(struct ath_hw *ah)
70 {
71 struct ath_common *common = ath9k_hw_common(ah);
72 @@ -1727,6 +1771,9 @@ int ath9k_init_debug(struct ath_hw *ah)
73 debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
74 &fops_eeprom);
75
76 + debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
77 + sc, &fops_chanbw);
78 +
79 sc->debug.regidx = 0;
80 memset(&sc->debug.bb_mac_samp, 0, sizeof(sc->debug.bb_mac_samp));
81 sc->debug.sampidx = 0;
82 --- a/drivers/net/wireless/ath/ath9k/main.c
83 +++ b/drivers/net/wireless/ath/ath9k/main.c
84 @@ -1559,7 +1559,7 @@ static void ath9k_disable_ps(struct ath_
85
86 }
87
88 -static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
89 +int ath9k_config(struct ieee80211_hw *hw, u32 changed)
90 {
91 struct ath_softc *sc = hw->priv;
92 struct ath_hw *ah = sc->sc_ah;
93 @@ -1609,9 +1609,11 @@ static int ath9k_config(struct ieee80211
94
95 if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
96 struct ieee80211_channel *curchan = hw->conf.channel;
97 + struct ath9k_channel *hchan;
98 int pos = curchan->hw_value;
99 int old_pos = -1;
100 unsigned long flags;
101 + u32 oldflags;
102
103 if (ah->curchan)
104 old_pos = ah->curchan - &ah->channels[0];
105 @@ -1659,7 +1661,23 @@ static int ath9k_config(struct ieee80211
106 memset(&sc->survey[pos], 0, sizeof(struct survey_info));
107 }
108
109 - if (ath_set_channel(sc, hw, &sc->sc_ah->channels[pos]) < 0) {
110 + hchan = &sc->sc_ah->channels[pos];
111 + oldflags = hchan->channelFlags;
112 + switch (sc->chan_bw) {
113 + case 5:
114 + hchan->channelFlags &= ~CHANNEL_HALF;
115 + hchan->channelFlags |= CHANNEL_QUARTER;
116 + break;
117 + case 10:
118 + hchan->channelFlags &= ~CHANNEL_QUARTER;
119 + hchan->channelFlags |= CHANNEL_HALF;
120 + break;
121 + default:
122 + hchan->channelFlags &= ~(CHANNEL_HALF | CHANNEL_QUARTER);
123 + break;
124 + }
125 +
126 + if (ath_set_channel(sc, hw, hchan) < 0) {
127 ath_err(common, "Unable to set channel\n");
128 mutex_unlock(&sc->mutex);
129 return -EINVAL;
130 --- a/drivers/net/wireless/ath/ath9k/hw.c
131 +++ b/drivers/net/wireless/ath/ath9k/hw.c
132 @@ -1608,6 +1608,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
133 caldata->rtt_hist.num_readings)
134 allow_fbs = true;
135
136 + if (!ah->curchan || ((ah->curchan->channelFlags ^ chan->channelFlags) &
137 + (CHANNEL_HALF | CHANNEL_QUARTER)))
138 + bChannelChange = false;
139 +
140 if (bChannelChange &&
141 (ah->chip_fullsleep != true) &&
142 (ah->curchan != NULL) &&