mac80211: fix patch when running on ssb based devices

[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 ef568dc2ad22106d6cd245854b13891cb9ded79f..ae65b60e1be8a80143a9b467ed07131e9bf91257 100644 (file)
--- a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch
+++ b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch
@@ -8,7 +8,7 @@
        int chan_idx;
        int chan_is_ht;
        struct survey_info *cur_survey;
-@@ -654,6 +655,7 @@ struct ath_softc {
+@@ -655,6 +656,7 @@ struct ath_softc {
        u8 ant_tx, ant_rx;
  };
  
@@ -81,7 +81,7 @@
        sc->debug.sampidx = 0;
 --- 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_
+@@ -1564,7 +1564,7 @@ static void ath9k_disable_ps(struct ath_
  
  }
  
@@ -90,19 +90,19 @@
  {
        struct ath_softc *sc = hw->priv;
        struct ath_hw *ah = sc->sc_ah;
-@@ -1606,9 +1606,10 @@ static int ath9k_config(struct ieee80211
+@@ -1616,9 +1616,11 @@ static int ath9k_config(struct ieee80211
  
        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;
-+              u32 oldflags;
                unsigned long flags;
++              u32 oldflags;
  
                if (ah->curchan)
-@@ -1661,7 +1662,23 @@ static int ath9k_config(struct ieee80211
+                       old_pos = ah->curchan - &ah->channels[0];
+@@ -1667,7 +1669,23 @@ static int ath9k_config(struct ieee80211
                        memset(&sc->survey[pos], 0, sizeof(struct survey_info));
                }
  
@@ -129,7 +129,7 @@
                        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
+@@ -1609,6 +1609,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
            caldata->rtt_hist.num_readings)
                allow_fbs = true;