kmod-sched-cake: bump to 20180827

[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / 512-ath9k_channelbw_debugfs.patch

diff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
index 088460a64ad2575092cc71f8876bf78511bb17b8..2ebb73d689dfc60524561aeeb1f318df051dbec1 100644 (file)
--- 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
-@@ -1524,6 +1524,52 @@ static const struct file_operations fops
+@@ -1421,6 +1421,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,28 +53,28 @@
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
-@@ -1545,6 +1591,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1442,6 +1488,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,
+       debugfs_create_devm_seqfile(sc->dev, "dma", sc->debug.debugfs_phy,
+                                   read_file_dma);
+       debugfs_create_devm_seqfile(sc->dev, "interrupt", sc->debug.debugfs_phy,
 --- 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;
+@@ -151,6 +151,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
+@@ -297,11 +297,13 @@ EXPORT_SYMBOL(ath9k_cmn_get_hw_crypto_ke
  /*
   * Update internal channel flags.
   */
@@ -89,8 +89,8 @@
  
        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)
+@@ -309,7 +311,19 @@ static void ath9k_cmn_update_ichannel(st
+       if (chan->band == NL80211_BAND_5GHZ)
                flags |= CHANNEL_5GHZ;
  
 -      switch (chandef->width) {
@@ -110,7 +110,7 @@
        case NL80211_CHAN_WIDTH_5:
                flags |= CHANNEL_QUARTER;
                break;
-@@ -97,10 +111,11 @@ struct ath9k_channel *ath9k_cmn_get_chan
+@@ -342,10 +356,11 @@ struct ath9k_channel *ath9k_cmn_get_chan
                                            struct cfg80211_chan_def *chandef)
  {
        struct ieee80211_channel *curchan = chandef->chan;