mac80211: backport latest version from trunk

[openwrt-10.03/.git] / package / mac80211 / patches / 300-ath9k_gpio_settings.patch

diff --git a/package/mac80211/patches/300-ath9k_gpio_settings.patch b/package/mac80211/patches/300-ath9k_gpio_settings.patch
index e13e1cf727199067c17fff2680c8a6ec7aea73b5..7235ddeb57349f9600a7eaa0748438090dc5e732 100644 (file)
--- a/package/mac80211/patches/300-ath9k_gpio_settings.patch
+++ b/package/mac80211/patches/300-ath9k_gpio_settings.patch
@@ -1,6 +1,6 @@
 --- 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

-@@ -1200,6 +1200,12 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1091,6 +1091,12 @@ int ath9k_init_debug(struct ath_hw *ah)

                        sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
                goto err;
  
                        sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
                goto err;
  


@@ -26,7 +26,7 @@
        struct ar5416IniArray iniCommon;
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
        struct ar5416IniArray iniCommon;
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c

-@@ -1175,6 +1175,20 @@ static bool ath9k_hw_channel_change(stru
+@@ -1213,6 +1213,20 @@ static bool ath9k_hw_channel_change(stru

        return true;
  }
  
        return true;
  }
  


@@ -47,7 +47,7 @@
  bool ath9k_hw_check_alive(struct ath_hw *ah)
  {
        int count = 50;
  bool ath9k_hw_check_alive(struct ath_hw *ah)
  {
        int count = 50;

-@@ -1463,6 +1477,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1501,6 +1515,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st

        if (AR_SREV_9300_20_OR_LATER(ah))
                ar9003_hw_bb_watchdog_config(ah);
  
        if (AR_SREV_9300_20_OR_LATER(ah))
                ar9003_hw_bb_watchdog_config(ah);