projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ath9k: merge initval updates
[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
6303ce4
..
ac3ddd7
100644
(file)
--- 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
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -68
2,6 +682
,7 @@ struct ath_spec_scan {
+@@ -68
3,6 +683
,7 @@ struct ath_spec_scan {
* @config_pci_powersave:
* @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
*
* @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
* @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
-@@ -70
4,6 +705
,7 @@ struct ath_hw_ops {
+@@ -70
5,6 +706
,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);
@@
-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
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
-@@ -17
09,6 +1709
,26 @@ static void ar9003_hw_tx99_set_txpower(s
+@@ -17
60,6 +1760
,26 @@ static void ar9003_hw_tx99_set_txpower(s
ATH9K_POW_SM(p_pwr_array[ALL_TARGET_HT40_14], 0));
}
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);
void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
{
struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
-@@ -17
39,6 +1759
,7 @@ void ar9003_hw_attach_phy_ops(struct ath
+@@ -17
90,6 +1810
,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;
priv_ops->set_radar_params = ar9003_hw_set_radar_params;
priv_ops->fast_chan_change = ar9003_hw_fast_chan_change;
@@
-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
-@@ -82
4,7 +824
,8 @@ static void ath9k_init_txpower_limits(st
+@@ -82
9,7 +829
,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)
-@@ -9
55,6 +956
,18 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -9
60,6 +961
,18 @@ void ath9k_set_hw_capab(struct ath_softc
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)
{
-@@ -100
0,6 +1013
,8 @@ int ath9k_init_device(u16 devid, struct
+@@ -100
5,6 +1018
,8 @@ int ath9k_init_device(u16 devid, struct
ARRAY_SIZE(ath9k_tpt_blink));
#endif
ARRAY_SIZE(ath9k_tpt_blink));
#endif