From f33dcd05bf1c5af8b0b9dbe63e713593a48ccaf0 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Wed, 20 May 2009 21:59:08 +0300
Subject: [PATCH] --- yaml --- r: 150435 b: refs/heads/master c:
 ccdfeab6536ae55d43436ffaae949afde6e962ca h: refs/heads/master i:   150433:
 11e9a8ecaf6d85fd5be0be38144a04deb501cb8f   150431:
 9ab152fceef82932609edb7d79fbf5a522e379bf v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/ath9k.h | 1 +
 trunk/drivers/net/wireless/ath/ath9k/main.c  | 9 ++++++++-
 trunk/drivers/net/wireless/ath/ath9k/recv.c  | 7 +++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8f7a80727253..1cec9957ad35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 267a90127472be70b02ab13cbd355b5013e2aa51
+refs/heads/master: ccdfeab6536ae55d43436ffaae949afde6e962ca
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
index 0d4ac43f6d91..796a3adffea0 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -518,6 +518,7 @@ struct ath_rfkill {
 #define SC_OP_WAIT_FOR_CAB      BIT(16)
 #define SC_OP_WAIT_FOR_PSPOLL_DATA BIT(17)
 #define SC_OP_WAIT_FOR_TX_ACK   BIT(18)
+#define SC_OP_BEACON_SYNC       BIT(19)
 
 struct ath_bus_ops {
 	void		(*read_cachesize)(struct ath_softc *sc, int *csz);
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index 5759c9465029..61da08a1648c 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/main.c
@@ -487,7 +487,7 @@ static void ath9k_tasklet(unsigned long data)
 		 * the next Beacon.
 		 */
 		DPRINTF(sc, ATH_DBG_PS, "TSFOOR - Sync with next Beacon\n");
-		sc->sc_flags |= SC_OP_WAIT_FOR_BEACON;
+		sc->sc_flags |= SC_OP_WAIT_FOR_BEACON | SC_OP_BEACON_SYNC;
 	}
 
 	/* re-enable hardware interrupt */
@@ -914,6 +914,13 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
 		if (avp->av_opmode == NL80211_IFTYPE_STATION) {
 			sc->curaid = bss_conf->aid;
 			ath9k_hw_write_associd(sc);
+
+			/*
+			 * Request a re-configuration of Beacon related timers
+			 * on the receipt of the first Beacon frame (i.e.,
+			 * after time sync with the AP).
+			 */
+			sc->sc_flags |= SC_OP_BEACON_SYNC;
 		}
 
 		/* Configure the beacon */
diff --git a/trunk/drivers/net/wireless/ath/ath9k/recv.c b/trunk/drivers/net/wireless/ath/ath9k/recv.c
index 5e046b58ad93..5014a19b0f75 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/recv.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/recv.c
@@ -521,6 +521,13 @@ static void ath_rx_ps_beacon(struct ath_softc *sc, struct sk_buff *skb)
 	if (memcmp(sc->curbssid, mgmt->bssid, ETH_ALEN) != 0)
 		return; /* not from our current AP */
 
+	if (sc->sc_flags & SC_OP_BEACON_SYNC) {
+		sc->sc_flags &= ~SC_OP_BEACON_SYNC;
+		DPRINTF(sc, ATH_DBG_PS, "Reconfigure Beacon timers based on "
+			"timestamp from the AP\n");
+		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 "