diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-04-06 10:41:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-04-06 10:41:23 +0000 |
| commit | 4e155c80d3d8811e19effa7f173a863f6b22f4bf (patch) | |
| tree | 6ace1120efe3767aa6ea23e33755ec4a69d4735d /package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch | |
| parent | c821836395122a28b692fdfe7ba6446195848496 (diff) | |
| download | upstream-4e155c80d3d8811e19effa7f173a863f6b22f4bf.tar.gz upstream-4e155c80d3d8811e19effa7f173a863f6b22f4bf.tar.bz2 upstream-4e155c80d3d8811e19effa7f173a863f6b22f4bf.zip | |
mac80211: update to wireless-testing 2014-03-31
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 40393
Diffstat (limited to 'package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch index 8f3cc03043..665d8aa64d 100644 --- a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch +++ b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1528,6 +1528,52 @@ static const struct file_operations fops +@@ -1532,6 +1532,52 @@ static const struct file_operations fops .owner = THIS_MODULE }; @@ -35,7 +35,7 @@ + return -EINVAL; + + common->chan_bw = chan_bw; -+ if (!test_bit(SC_OP_INVALID, &sc->sc_flags)) ++ if (!test_bit(ATH_OP_INVALID, &common->op_flags)) + ath9k_ops.config(sc->hw, IEEE80211_CONF_CHANGE_CHANNEL); + + return count; @@ -53,7 +53,7 @@ int ath9k_init_debug(struct ath_hw *ah) { struct ath_common *common = ath9k_hw_common(ah); -@@ -1549,6 +1595,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1553,6 +1599,8 @@ int ath9k_init_debug(struct ath_hw *ah) debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc, &fops_eeprom); @@ -64,17 +64,17 @@ 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; +@@ -140,6 +140,7 @@ struct ath_common { int debug_mask; enum ath_device_state state; + unsigned long op_flags; + 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 +@@ -296,11 +296,13 @@ EXPORT_SYMBOL(ath9k_cmn_get_hw_crypto_ke /* * Update internal channel flags. */ @@ -89,7 +89,7 @@ ichan->channel = chan->center_freq; ichan->chan = chan; -@@ -64,7 +66,19 @@ static void ath9k_cmn_update_ichannel(st +@@ -308,7 +310,19 @@ static void ath9k_cmn_update_ichannel(st if (chan->band == IEEE80211_BAND_5GHZ) flags |= CHANNEL_5GHZ; @@ -110,7 +110,7 @@ case NL80211_CHAN_WIDTH_5: flags |= CHANNEL_QUARTER; break; -@@ -97,10 +111,11 @@ struct ath9k_channel *ath9k_cmn_get_chan +@@ -341,10 +355,11 @@ struct ath9k_channel *ath9k_cmn_get_chan struct cfg80211_chan_def *chandef) { struct ieee80211_channel *curchan = chandef->chan; |