mac80211: merge pending regulatory fixes

[openwrt-10.03/.git] / package / mac80211 / patches / 540-ath9k_disable_hw_rfkill.patch

diff --git a/package/mac80211/patches/540-ath9k_disable_hw_rfkill.patch b/package/mac80211/patches/540-ath9k_disable_hw_rfkill.patch
index 83cd9a1ce4b574aff65891625f72ae169c6f7d88..a74ea0da970ae5e6a5110b8218f7b4ffd99778bf 100644 (file)
--- a/package/mac80211/patches/540-ath9k_disable_hw_rfkill.patch
+++ b/package/mac80211/patches/540-ath9k_disable_hw_rfkill.patch
@@ -82,7 +82,7 @@
        if (!ath9k_hw_private_ops(ah)->restore_chainmask)
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1406,7 +1406,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1402,7 +1402,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
        ath9k_hw_init_qos(ah);
  
        if (ah->caps.hw_caps & ATH9K_HW_CAP_RFSILENT)
@@ -93,7 +93,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -576,7 +576,6 @@ struct ath_hw_private_ops {
+@@ -581,7 +581,6 @@ struct ath_hw_private_ops {
        void (*set_delta_slope)(struct ath_hw *ah, struct ath9k_channel *chan);
        bool (*rfbus_req)(struct ath_hw *ah);
        void (*rfbus_done)(struct ath_hw *ah);