mac80211: merge a few pending upstream fixes

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 543-ath9k_entropy_from_adc.patch

diff --git a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
index e536e1e9ed8e51153b6e35cda01656f1ead86ccc..304eb7dc8abeaa3c57355872fba215a87d05a6fd 100644 (file)
--- a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
+++ b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
@@ -18,7 +18,7 @@
        void (*spectral_scan_trigger)(struct ath_hw *ah);
 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
-@@ -1783,6 +1783,26 @@ static void ar9003_hw_tx99_set_txpower(s
+@@ -1796,6 +1796,26 @@ static void ar9003_hw_tx99_set_txpower(s
                  ATH9K_POW_SM(p_pwr_array[ALL_TARGET_HT40_14],  0));
  }
  
@@ -45,7 +45,7 @@
  void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
  {
        struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
-@@ -1818,6 +1838,7 @@ void ar9003_hw_attach_phy_ops(struct ath
+@@ -1831,6 +1851,7 @@ void ar9003_hw_attach_phy_ops(struct ath
        priv_ops->set_radar_params = ar9003_hw_set_radar_params;
        priv_ops->fast_chan_change = ar9003_hw_fast_chan_change;