diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-11-02 17:35:42 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-11 17:09:01 -0500 |
commit | 68a89116157d9d479a854db6d79a9116be79cd99 (patch) | |
tree | 27102822d346694d3cfb56572eff1fcb40766790 /drivers/net/wireless/ath/ath9k/ath9k.h | |
parent | cee71d6c1471953239ea4c13306888cf2b36426e (diff) |
ath9k: pass the ieee80211_hw on radio enable/disable
We use the ieee80211_hw for radio enable/disable but the wrong
structure hw was being used in consideration for virtual wiphys
as each virtual wiphy has its own ieee80211_hw struct.
Just pass the hw struct to ensure we use the right one. This should
fix the hw used and passed for radio enable/disable. This includes
the stoping / starting of the software TX queues so mac80211 doesn't
send us data for a specific virtual wiphy. ath9k already takes care
of pausing virtual wiphys and stopping the respective queues on its
own, but this should handle the idle mac80211 conf calls as well.
Cc: Jouni.Malinen <Jouni.Malinen@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index da5357838dda..59ce7ec5b224 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -655,8 +655,9 @@ void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw, | |||
655 | void ath_update_chainmask(struct ath_softc *sc, int is_ht); | 655 | void ath_update_chainmask(struct ath_softc *sc, int is_ht); |
656 | int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw, | 656 | int ath_set_channel(struct ath_softc *sc, struct ieee80211_hw *hw, |
657 | struct ath9k_channel *hchan); | 657 | struct ath9k_channel *hchan); |
658 | void ath_radio_enable(struct ath_softc *sc); | 658 | |
659 | void ath_radio_disable(struct ath_softc *sc); | 659 | void ath_radio_enable(struct ath_softc *sc, struct ieee80211_hw *hw); |
660 | void ath_radio_disable(struct ath_softc *sc, struct ieee80211_hw *hw); | ||
660 | 661 | ||
661 | #ifdef CONFIG_PCI | 662 | #ifdef CONFIG_PCI |
662 | int ath_pci_init(void); | 663 | int ath_pci_init(void); |