diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-10-04 14:09:50 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-10-06 16:30:39 -0400 |
commit | 95792178a58716a6afaeb5ab9654f1a0f17a5e8e (patch) | |
tree | 869bcf8f46f6851057233d464fc454652a1b5220 /drivers/net/wireless/ath/ath9k/hw.h | |
parent | 8eb4980c33c35e97a0a226fdbc07e38da0f1f4aa (diff) |
ath9k_hw: merge ath9k_hw_ani_monitor_old and ath9k_hw_ani_monitor_new
After the last rounds of cleanup, these functions are now functionally
equivalent and can thus be merged.
Also get rid of some excessive (and redundant) debug messages.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hw.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index c982a24146d..87627dd6346 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -564,9 +564,6 @@ struct ath_hw_private_ops { | |||
564 | * | 564 | * |
565 | * @config_pci_powersave: | 565 | * @config_pci_powersave: |
566 | * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC | 566 | * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC |
567 | * | ||
568 | * @ani_monitor: called periodically by the core driver to collect | ||
569 | * MIB stats and adjust ANI if specific thresholds have been reached. | ||
570 | */ | 567 | */ |
571 | struct ath_hw_ops { | 568 | struct ath_hw_ops { |
572 | void (*config_pci_powersave)(struct ath_hw *ah, | 569 | void (*config_pci_powersave)(struct ath_hw *ah, |
@@ -607,8 +604,6 @@ struct ath_hw_ops { | |||
607 | u32 burstDuration); | 604 | u32 burstDuration); |
608 | void (*set11n_virtualmorefrag)(struct ath_hw *ah, void *ds, | 605 | void (*set11n_virtualmorefrag)(struct ath_hw *ah, void *ds, |
609 | u32 vmf); | 606 | u32 vmf); |
610 | |||
611 | void (*ani_monitor)(struct ath_hw *ah, struct ath9k_channel *chan); | ||
612 | }; | 607 | }; |
613 | 608 | ||
614 | struct ath_nf_limits { | 609 | struct ath_nf_limits { |
@@ -969,8 +964,7 @@ void ar9002_hw_load_ani_reg(struct ath_hw *ah, struct ath9k_channel *chan); | |||
969 | extern int modparam_force_new_ani; | 964 | extern int modparam_force_new_ani; |
970 | void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning); | 965 | void ath9k_ani_reset(struct ath_hw *ah, bool is_scanning); |
971 | void ath9k_hw_proc_mib_event(struct ath_hw *ah); | 966 | void ath9k_hw_proc_mib_event(struct ath_hw *ah); |
972 | void ath9k_hw_attach_ani_ops_old(struct ath_hw *ah); | 967 | void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan); |
973 | void ath9k_hw_attach_ani_ops_new(struct ath_hw *ah); | ||
974 | 968 | ||
975 | #define ATH_PCIE_CAP_LINK_CTRL 0x70 | 969 | #define ATH_PCIE_CAP_LINK_CTRL 0x70 |
976 | #define ATH_PCIE_CAP_LINK_L0S 1 | 970 | #define ATH_PCIE_CAP_LINK_L0S 1 |