diff options
Diffstat (limited to 'drivers/net/wireless/ath9k/hw.h')
-rw-r--r-- | drivers/net/wireless/ath9k/hw.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath9k/hw.h b/drivers/net/wireless/ath9k/hw.h index 3fdf9626a766..f4bf70215744 100644 --- a/drivers/net/wireless/ath9k/hw.h +++ b/drivers/net/wireless/ath9k/hw.h | |||
@@ -427,6 +427,7 @@ struct ath_hal { | |||
427 | struct ath9k_hw_capabilities ah_caps; | 427 | struct ath9k_hw_capabilities ah_caps; |
428 | struct ath9k_regulatory regulatory; | 428 | struct ath9k_regulatory regulatory; |
429 | u32 ah_flags; | 429 | u32 ah_flags; |
430 | u8 macaddr[ETH_ALEN]; | ||
430 | 431 | ||
431 | enum ath9k_power_mode ah_power_mode; | 432 | enum ath9k_power_mode ah_power_mode; |
432 | enum ath9k_power_mode ah_restore_mode; | 433 | enum ath9k_power_mode ah_restore_mode; |
@@ -457,11 +458,6 @@ struct ath_hal_5416 { | |||
457 | struct ath9k_tx_queue_info ah_txq[ATH9K_NUM_TX_QUEUES]; | 458 | struct ath9k_tx_queue_info ah_txq[ATH9K_NUM_TX_QUEUES]; |
458 | void __iomem *ah_cal_mem; | 459 | void __iomem *ah_cal_mem; |
459 | 460 | ||
460 | u8 ah_macaddr[ETH_ALEN]; | ||
461 | u8 ah_bssid[ETH_ALEN]; | ||
462 | u8 ah_bssidmask[ETH_ALEN]; | ||
463 | u16 ah_assocId; | ||
464 | |||
465 | int16_t ah_curchanRadIndex; | 461 | int16_t ah_curchanRadIndex; |
466 | u32 ah_maskReg; | 462 | u32 ah_maskReg; |
467 | u32 ah_txOkInterruptMask; | 463 | u32 ah_txOkInterruptMask; |
@@ -633,13 +629,11 @@ void ath9k_hw_setrxfilter(struct ath_hal *ah, u32 bits); | |||
633 | bool ath9k_hw_phy_disable(struct ath_hal *ah); | 629 | bool ath9k_hw_phy_disable(struct ath_hal *ah); |
634 | bool ath9k_hw_disable(struct ath_hal *ah); | 630 | bool ath9k_hw_disable(struct ath_hal *ah); |
635 | bool ath9k_hw_set_txpowerlimit(struct ath_hal *ah, u32 limit); | 631 | bool ath9k_hw_set_txpowerlimit(struct ath_hal *ah, u32 limit); |
636 | void ath9k_hw_getmac(struct ath_hal *ah, u8 *mac); | 632 | void ath9k_hw_setmac(struct ath_hal *ah, const u8 *mac); |
637 | bool ath9k_hw_setmac(struct ath_hal *ah, const u8 *mac); | ||
638 | void ath9k_hw_setopmode(struct ath_hal *ah); | 633 | void ath9k_hw_setopmode(struct ath_hal *ah); |
639 | void ath9k_hw_setmcastfilter(struct ath_hal *ah, u32 filter0, u32 filter1); | 634 | void ath9k_hw_setmcastfilter(struct ath_hal *ah, u32 filter0, u32 filter1); |
640 | void ath9k_hw_getbssidmask(struct ath_hal *ah, u8 *mask); | 635 | void ath9k_hw_setbssidmask(struct ath_softc *sc); |
641 | bool ath9k_hw_setbssidmask(struct ath_hal *ah, const u8 *mask); | 636 | void ath9k_hw_write_associd(struct ath_softc *sc); |
642 | void ath9k_hw_write_associd(struct ath_hal *ah, const u8 *bssid, u16 assocId); | ||
643 | u64 ath9k_hw_gettsf64(struct ath_hal *ah); | 637 | u64 ath9k_hw_gettsf64(struct ath_hal *ah); |
644 | void ath9k_hw_settsf64(struct ath_hal *ah, u64 tsf64); | 638 | void ath9k_hw_settsf64(struct ath_hal *ah, u64 tsf64); |
645 | void ath9k_hw_reset_tsf(struct ath_hal *ah); | 639 | void ath9k_hw_reset_tsf(struct ath_hal *ah); |