diff options
| author |   Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-11-02 14:35:42 -0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2009-11-11 17:09:01 -0500 |
| commit | 68a89116157d9d479a854db6d79a9116be79cd99 (patch) | |
| tree | 27102822d346694d3cfb56572eff1fcb40766790 /drivers/net/wireless/ath/ath9k/virtual.c | |
| parent | ath9k: use the passed ieee80211_hw on ath_rx_prepare() (diff) | |
| download | linux-dev-68a89116157d9d479a854db6d79a9116be79cd99.tar.xz linux-dev-68a89116157d9d479a854db6d79a9116be79cd99.zip | |
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/virtual.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/virtual.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/virtual.c b/drivers/net/wireless/ath/ath9k/virtual.c index 7678c4a2ca6f..69a871ba051f 100644 --- a/drivers/net/wireless/ath/ath9k/virtual.c +++ b/drivers/net/wireless/ath/ath9k/virtual.c @@ -526,8 +526,9 @@ int ath9k_wiphy_select(struct ath_wiphy *aphy) * frame being completed) */ spin_unlock_bh(&sc->wiphy_lock); - ath_radio_disable(sc); - ath_radio_enable(sc); + ath_radio_disable(sc, aphy->hw); + ath_radio_enable(sc, aphy->hw); + /* Only the primary wiphy hw is used for queuing work */ ieee80211_queue_work(aphy->sc->hw, &aphy->sc->chan_work); return -EBUSY; /* previous select still in progress */ |