projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: merge another round of upstream (or -pending) fixes and cleanups
[openwrt.git]
/
package
/
kernel
/
mac80211
/
patches
/
550-ath9k_entropy_from_adc.patch
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
b8209a5
..
6cd09bd
100644
(file)
--- 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
* @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
-@@ -68
3,6 +684
,7 @@ struct ath_hw_ops {
+@@ -68
4,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);
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
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
-@@ -84
7,7 +847
,8 @@ static void ath9k_init_txpower_limits(st
+@@ -84
5,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);
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)
}
void ath9k_reload_chainmask_settings(struct ath_softc *sc)
-@@ -97
8,6 +979,18 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -97
6,6 +977,18 @@ static void ath9k_set_hw_capab(struct at
SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
}
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)
{
int ath9k_init_device(u16 devid, struct ath_softc *sc,
const struct ath_bus_ops *bus_ops)
{
-@@ -102
3,6 +1036
,8 @@ int ath9k_init_device(u16 devid, struct
+@@ -102
1,6 +1034
,8 @@ int ath9k_init_device(u16 devid, struct
ARRAY_SIZE(ath9k_tpt_blink));
#endif
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
if (error)
--- a/drivers/net/wireless/ath/ath9k/hw-ops.h
+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
-@@ -9
4,6 +94
,12 @@ static inline void ath9k_hw_tx99_set_txp
+@@ -9
5,6 +95
,12 @@ static inline void ath9k_hw_tx99_set_txp
ath9k_hw_ops(ah)->tx99_set_txpower(ah, power);
}
ath9k_hw_ops(ah)->tx99_set_txpower(ah, power);
}