From 3fb67151ab8b804de552f1d8898c5b60f37525ba Mon Sep 17 00:00:00 2001
From: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Date: Wed, 13 Apr 2011 11:22:59 +0530
Subject: [PATCH] --- yaml --- r: 246847 b: refs/heads/master c:
 1c165c972b040f9ce199b8d8d3cc4f619872cba5 h: refs/heads/master i:   246845:
 d538ebc15859ba6b4b92590daa4e9802e4f0ce1e   246843:
 b15fb32e132eac54567011fef3cc467e54bdbd53   246839:
 605981fd5e493b54f0572cb6447b62bc814d6099   246831:
 1c3a3c40e15840a889ed77e5899e92ecd895f970   246815:
 0c0e284f4183562bc044ed32859becea78235996   246783:
 817505d340ee4c20f1c75d9cb05fb2f60e3a249e v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/htc.h | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/wmi.c | 7 ++++++-
 trunk/drivers/net/wireless/ath/ath9k/wmi.h | 6 ++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d01996f39cde..fb544aac2898 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29bbfb2491316f9a3888e74b0de7fccdbde67aaa
+refs/heads/master: 1c165c972b040f9ce199b8d8d3cc4f619872cba5
diff --git a/trunk/drivers/net/wireless/ath/ath9k/htc.h b/trunk/drivers/net/wireless/ath/ath9k/htc.h
index 9544cd7fd440..cf7909ec0769 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/htc.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/htc.h
@@ -96,8 +96,8 @@ struct tx_mgmt_hdr {
 } __packed;
 
 struct tx_beacon_header {
-	u8 len_changed;
 	u8 vif_index;
+	u8 len_changed;
 	u16 rev;
 } __packed;
 
diff --git a/trunk/drivers/net/wireless/ath/ath9k/wmi.c b/trunk/drivers/net/wireless/ath/ath9k/wmi.c
index 267a98fcf5f2..96171a2c6873 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/wmi.c
@@ -156,6 +156,7 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,
 	struct wmi_cmd_hdr *hdr;
 	u16 cmd_id;
 	void *wmi_event;
+	struct wmi_event_swba *swba;
 #ifdef CONFIG_ATH9K_HTC_DEBUGFS
 	__be32 txrate;
 #endif
@@ -170,7 +171,11 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,
 		wmi_event = skb_pull(skb, sizeof(struct wmi_cmd_hdr));
 		switch (cmd_id) {
 		case WMI_SWBA_EVENTID:
-			wmi->beacon_pending = *(u8 *)wmi_event;
+			swba = (struct wmi_event_swba *) wmi_event;
+
+			wmi->tsf = be64_to_cpu(swba->tsf);
+			wmi->beacon_pending = swba->beacon_pending;
+
 			tasklet_schedule(&wmi->drv_priv->swba_tasklet);
 			break;
 		case WMI_FATAL_EVENTID:
diff --git a/trunk/drivers/net/wireless/ath/ath9k/wmi.h b/trunk/drivers/net/wireless/ath/ath9k/wmi.h
index 6a36572b6fb8..2fa91a941a72 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/wmi.h
+++ b/trunk/drivers/net/wireless/ath/ath9k/wmi.h
@@ -36,6 +36,11 @@ struct wmi_fw_version {
 	__be16 minor;
 
 } __packed;
+
+struct wmi_event_swba {
+	__be64 tsf;
+	u8 beacon_pending;
+};
 enum wmi_cmd_id {
 	WMI_ECHO_CMDID = 0x0001,
 	WMI_ACCESS_MEMORY_CMDID,
@@ -106,6 +111,7 @@ struct wmi {
 	u32 cmd_rsp_len;
 	bool stopped;
 
+	u64 tsf;
 	u8 beacon_pending;
 	spinlock_t wmi_lock;