aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-12-14 17:07:08 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-12-14 17:07:08 +0000
commit43122f092ee5588d9f826d9ea470be8929b5be35 (patch)
treedcc6a45966b84db519841a242ff46181ef8943fa /package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
parentc411d7e762f2bd12685e86e0b162b88ec7432759 (diff)
downloadupstream-43122f092ee5588d9f826d9ea470be8929b5be35.tar.gz
upstream-43122f092ee5588d9f826d9ea470be8929b5be35.tar.bz2
upstream-43122f092ee5588d9f826d9ea470be8929b5be35.zip
ath9k: merge another round of cleanups and fixes submitted to linux-wireless
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39054 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch')
-rw-r--r--package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch4
1 files changed, 2 insertions, 2 deletions
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 f2640629dc..b8209a54ee 100644
--- a/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
+++ b/package/kernel/mac80211/patches/550-ath9k_entropy_from_adc.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -684,6 +684,7 @@ struct ath_spec_scan {
+@@ -661,6 +661,7 @@ struct ath_spec_scan {
* @config_pci_powersave:
* @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
*
@@ -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
-@@ -706,6 +707,7 @@ struct ath_hw_ops {
+@@ -683,6 +684,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);