X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Fmac80211%2Fpatches%2F550-ath9k_entropy_from_adc.patch;h=6cd09bd6dd1cbbd2e06ac6bbb52a434c6498f7f2;hp=b8209a54ee4aa167ad4986c023b0dfedb76c349d;hb=8d1cb3a2ec444c94a3c3c179d05a925f38e920fd;hpb=42fa8ef915f687fd257068b8106c9c187d75f5ae;ds=sidebyside

diff --git a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
index b8209a54ee..6cd09bd6dd 100644
--- a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
+++ b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
@@ -8,7 +8,7 @@
   * @spectral_scan_config: set parameters for spectral scan and enable/disable it
   * @spectral_scan_trigger: trigger a spectral scan run
   * @spectral_scan_wait: wait for a spectral scan run to finish
-@@ -683,6 +684,7 @@ struct ath_hw_ops {
+@@ -684,6 +685,7 @@ struct ath_hw_ops {
  			struct ath_hw_antcomb_conf *antconf);
  	void (*antdiv_comb_conf_set)(struct ath_hw *ah,
  			struct ath_hw_antcomb_conf *antconf);
@@ -55,7 +55,7 @@
  	ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -847,7 +847,8 @@ static void ath9k_init_txpower_limits(st
+@@ -845,7 +845,8 @@ static void ath9k_init_txpower_limits(st
  	if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
  		ath9k_init_band_txpower(sc, IEEE80211_BAND_5GHZ);
  
@@ -65,7 +65,7 @@
  }
  
  void ath9k_reload_chainmask_settings(struct ath_softc *sc)
-@@ -978,6 +979,18 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -976,6 +977,18 @@ static void ath9k_set_hw_capab(struct at
  	SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
  }
  
@@ -84,7 +84,7 @@
  int ath9k_init_device(u16 devid, struct ath_softc *sc,
  		    const struct ath_bus_ops *bus_ops)
  {
-@@ -1023,6 +1036,8 @@ int ath9k_init_device(u16 devid, struct 
+@@ -1021,6 +1034,8 @@ int ath9k_init_device(u16 devid, struct 
  		ARRAY_SIZE(ath9k_tpt_blink));
  #endif
  
@@ -95,7 +95,7 @@
  	if (error)
 --- a/drivers/net/wireless/ath/ath9k/hw-ops.h
 +++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
-@@ -94,6 +94,12 @@ static inline void ath9k_hw_tx99_set_txp
+@@ -95,6 +95,12 @@ static inline void ath9k_hw_tx99_set_txp
  		ath9k_hw_ops(ah)->tx99_set_txpower(ah, power);
  }