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>

diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index c00b9051bb5349fe0eaa4a1627c6f601aac39db4..385bd4cd550b0a54cde35b75f5684e765b1748ae 100644 (file)
--- 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)
                ath_beacon_config(sc, NULL);
        }
 
-       if (!(sc->hw->conf.flags & IEEE80211_CONF_PS)) {
-               /* We are not in PS mode anymore; remain awake */
-               DPRINTF(sc, ATH_DBG_PS, "Not in PS mode anymore, remain "
-                       "awake\n");
-               sc->sc_flags &= ~(SC_OP_WAIT_FOR_BEACON | SC_OP_WAIT_FOR_CAB);
-               return;
-       }
-
        if (ath_beacon_dtim_pending_cab(skb)) {
                /*
                 * Remain awake waiting for buffered broadcast/multicast