mac80211: update to wireless-testing 2012-02-06

[openwrt/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 ae65b60e1be8a80143a9b467ed07131e9bf91257..fe225cd5a8ee292fa43da05b74d05c664cdb0bd8 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 {
+@@ -595,6 +595,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;

-@@ -655,6 +656,7 @@ struct ath_softc {
+@@ -659,6 +660,7 @@ struct ath_softc {

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


@@ -69,7 +69,7 @@
  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)
+@@ -1727,6 +1771,9 @@ int ath9k_init_debug(struct ath_hw *ah)

        debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
                            &fops_eeprom);
  
        debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
                            &fops_eeprom);
  


@@ -81,7 +81,7 @@
        sc->debug.sampidx = 0;
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
        sc->debug.sampidx = 0;
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c

-@@ -1564,7 +1564,7 @@ static void ath9k_disable_ps(struct ath_
+@@ -1559,7 +1559,7 @@ static void ath9k_disable_ps(struct ath_

  
  }
  
  
  }
  


@@ -90,7 +90,7 @@
  {
        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;

-@@ -1616,9 +1616,11 @@ static int ath9k_config(struct ieee80211
+@@ -1609,9 +1609,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;


@@ -102,7 +102,7 @@
  
                if (ah->curchan)
                        old_pos = ah->curchan - &ah->channels[0];
  
                if (ah->curchan)
                        old_pos = ah->curchan - &ah->channels[0];

-@@ -1667,7 +1669,23 @@ static int ath9k_config(struct ieee80211
+@@ -1659,7 +1661,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 +129,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

-@@ -1609,6 +1609,10 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1608,6 +1608,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;