diff options
author | David S. Miller <davem@davemloft.net> | 2010-01-28 06:12:38 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-28 06:12:38 -0800 |
commit | 05ba712d7eb156009753e18e5116cabd869cc6e2 (patch) | |
tree | 1ad850d6889f6b3671a5636653940f20a7d22bdf /drivers/net/wireless/ath/ath9k/main.c | |
parent | 257ddbdad13cd3c4f7d03b85af632c508aa8abc9 (diff) | |
parent | b473946a0853860e13b51c28add5524741117786 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index c0c571c2e8c..6aaca0026da 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1470,10 +1470,10 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw, (sc->sc_ah->opmode == NL80211_IFTYPE_MESH_POINT)) { ath9k_ps_wakeup(sc); ath9k_hw_stoptxdma(sc->sc_ah, sc->beacon.beaconq); - ath_beacon_return(sc, avp); ath9k_ps_restore(sc); } + ath_beacon_return(sc, avp); sc->sc_flags &= ~SC_OP_BEACONS; for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) { |