aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-06-19 06:17:47 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:47 -0400
commitb7351a003ca29ac4372393040ffb06dc04309e2e (patch)
tree577ec6d8e8c1241691890518de97ae20f12da4af /drivers
parentf58d4ed98bfe7b2febcd6f0d62744b623e4b8371 (diff)
ath9k: remove unnecessary clearing of SC_OP_WAIT_{BEACON,CAB} flags
All SC_OP_WAIT_* flags will be cleared in 'ath9k_conf' when PS mode is disabled, so we don't have to clear it here. Changes-licensed-under: ISC Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/recv.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index c00b9051bb53..385bd4cd550b 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -528,14 +528,6 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)
528 ath_beacon_config(sc, NULL); 528 ath_beacon_config(sc, NULL);
529 } 529 }
530 530
531 if (!(sc->hw->conf.flags & IEEE80211_CONF_PS)) {
532 /* We are not in PS mode anymore; remain awake */
533 DPRINTF(sc, ATH_DBG_PS, "Not in PS mode anymore, remain "
534 "awake\n");
535 sc->sc_flags &= ~(SC_OP_WAIT_FOR_BEACON | SC_OP_WAIT_FOR_CAB);
536 return;
537 }
538
539 if (ath_beacon_dtim_pending_cab(skb)) { 531 if (ath_beacon_dtim_pending_cab(skb)) {
540 /* 532 /*
541 * Remain awake waiting for buffered broadcast/multicast 533 * Remain awake waiting for buffered broadcast/multicast