[mac80211] fixes #31068, rename 999-ath9k.patch to 501-ath9k-eeprom_endianess.patch

[openwrt.git] / package / mac80211 / patches / 513-ath9k_channelbw_debugfs.patch

diff --git a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch
index ded102e..713a443 100644 (file)
--- a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch
+++ b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h

-@@ -591,6 +591,7 @@ struct ath_softc {
+@@ -624,6 +624,7 @@ struct ath_softc {

        struct ieee80211_hw *hw;
        struct device *dev;
  
        struct ieee80211_hw *hw;
        struct device *dev;
  


@@ -8,7 +8,7 @@
        int chan_idx;
        int chan_is_ht;
        struct survey_info *cur_survey;
        int chan_idx;
        int chan_is_ht;
        struct survey_info *cur_survey;

-@@ -654,6 +655,7 @@ struct ath_softc {
+@@ -691,6 +692,7 @@ struct ath_softc {

        u8 ant_tx, ant_rx;
  };
  
        u8 ant_tx, ant_rx;
  };
  


@@ -18,7 +18,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
  
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c

-@@ -1663,6 +1663,50 @@ static const struct file_operations fops
+@@ -1576,6 +1576,50 @@ static const struct file_operations fops

        .owner = THIS_MODULE
  };
  
        .owner = THIS_MODULE
  };
  


@@ -51,7 +51,7 @@
 +              return -EINVAL;
 +
 +      sc->chan_bw = chan_bw;
 +              return -EINVAL;
 +
 +      sc->chan_bw = chan_bw;

-+      if (!sc->ps_idle)
++      if (!(sc->sc_flags & SC_OP_INVALID))

 +              ath9k_config(sc->hw, IEEE80211_CONF_CHANGE_CHANNEL);
 +
 +      return count;
 +              ath9k_config(sc->hw, IEEE80211_CONF_CHANGE_CHANNEL);
 +
 +      return count;


@@ -69,19 +69,18 @@
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);

-@@ -1724,6 +1768,9 @@ int ath9k_init_debug(struct ath_hw *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);
 +
        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);
 +

-       sc->debug.regidx = 0;
-       memset(&sc->debug.bb_mac_samp, 0, sizeof(sc->debug.bb_mac_samp));
-       sc->debug.sampidx = 0;
+       return 0;
+ }

 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c

-@@ -1554,7 +1554,7 @@ static void ath9k_disable_ps(struct ath_
+@@ -1537,7 +1537,7 @@ static void ath9k_disable_ps(struct ath_

  
  }
  
  
  }
  


@@ -90,19 +89,19 @@
  {
        struct ath_softc *sc = hw->priv;
        struct ath_hw *ah = sc->sc_ah;
  {
        struct ath_softc *sc = hw->priv;
        struct ath_hw *ah = sc->sc_ah;

-@@ -1606,9 +1606,10 @@ static int ath9k_config(struct ieee80211
+@@ -1581,9 +1581,11 @@ static int ath9k_config(struct ieee80211

  
        if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                struct ieee80211_channel *curchan = hw->conf.channel;
  
        if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                struct ieee80211_channel *curchan = hw->conf.channel;

--              struct ath9k_channel old_chan;
-+              struct ath9k_channel old_chan, *hchan;
++              struct ath9k_channel *hchan;

                int pos = curchan->hw_value;
                int old_pos = -1;
                int pos = curchan->hw_value;
                int old_pos = -1;

-+              u32 oldflags;

                unsigned long flags;
                unsigned long flags;

++              u32 oldflags;

  
                if (ah->curchan)
  
                if (ah->curchan)

-@@ -1661,7 +1662,23 @@ static int ath9k_config(struct ieee80211
+                       old_pos = ah->curchan - &ah->channels[0];
+@@ -1631,7 +1633,23 @@ static int ath9k_config(struct ieee80211

                        memset(&sc->survey[pos], 0, sizeof(struct survey_info));
                }
  
                        memset(&sc->survey[pos], 0, sizeof(struct survey_info));
                }
  


@@ -129,7 +128,7 @@
                        return -EINVAL;
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
                        return -EINVAL;
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c

-@@ -1549,6 +1549,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1576,6 +1576,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st

            caldata->rtt_hist.num_readings)
                allow_fbs = true;
  
            caldata->rtt_hist.num_readings)
                allow_fbs = true;