Merge branch 'master' of git://nbd.name/openwrt
[openwrt.git] / package / kernel / mac80211 / patches / 512-ath9k_channelbw_debugfs.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -1530,6 +1530,52 @@ 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;
+       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+       char buf[32];
+       unsigned int len;
+
+       len = sprintf(buf, "0x%08x\n", common->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;
+       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+       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 (kstrtoul(buf, 0, &chan_bw))
+               return -EINVAL;
+
+       common->chan_bw = chan_bw;
+       if (!test_bit(SC_OP_INVALID, &sc->sc_flags))
+               ath9k_ops.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 = simple_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
+
 int ath9k_init_debug(struct ath_hw *ah)
 {
        struct ath_common *common = ath9k_hw_common(ah);
@@ -1551,6 +1597,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);
        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/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -130,6 +130,7 @@ struct ath_common {
        struct ieee80211_hw *hw;
        int debug_mask;
        enum ath_device_state state;
+       u32 chan_bw;
 
        struct ath_ani ani;
 
--- 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;
 
-       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;
+       }
+
+       switch (width) {
        case NL80211_CHAN_WIDTH_5:
                flags |= CHANNEL_QUARTER;
                break;
@@ -97,10 +111,11 @@ 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;
 
        channel = &ah->channels[curchan->hw_value];
-       ath9k_cmn_update_ichannel(channel, chandef);
+       ath9k_cmn_update_ichannel(common, channel, chandef);
 
        return channel;
 }
 
comments