From patchwork Fri Jan 21 03:00:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith Manoharan X-Patchwork-Id: 493651 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0L31WxM005357 for ; Fri, 21 Jan 2011 03:01:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751892Ab1AUDBb (ORCPT ); Thu, 20 Jan 2011 22:01:31 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:40518 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751103Ab1AUDBb (ORCPT ); Thu, 20 Jan 2011 22:01:31 -0500 Received: by mail-iw0-f174.google.com with SMTP id 9so1249489iwn.19 for ; Thu, 20 Jan 2011 19:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:mime-version:content-type :content-transfer-encoding:message-id:date:to:x-mailer:cc:subject; bh=5aPyHgeW5WE9jqztAvriZ1GKYceEeCI20Wr3rrhWfYU=; b=fGgfsDkbGyON/cUfQrAhcZB3k723QagBds64yTi7fRtcb7cpaQWANGn4xD9+X5If8o FeRA8omTKG+PnTSvRYj2EzAAt+ZpLoR5q3eMfuiUHKTJe8N7HXgEerJqMbhCqvXfn1k4 9EZfWFj/Y7+uHu5gJx457Acuo+hThFp4Wtlcs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:mime-version:content-type:content-transfer-encoding:message-id :date:to:x-mailer:cc:subject; b=qaPaoGH5P6QicMgfEw67LHo18XuqOCUAndKcadBHK7R6R2x6sknUJU2p8N/2z9hlU/ 8m6vWUB97jDqCBKjNR1C2Of7ZzyltzyeKdxnSlU58wD4domQmCG70ZP3neISETbh3jEM crIC6DQq8i0mirFtrEPtyojspcxLgwaWqRuP8= Received: by 10.42.223.132 with SMTP id ik4mr74081icb.333.1295578891017; Thu, 20 Jan 2011 19:01:31 -0800 (PST) Received: from bodhi ([117.205.82.212]) by mx.google.com with ESMTPS id z4sm7379637ibg.19.2011.01.20.19.01.27 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 20 Jan 2011 19:01:30 -0800 (PST) From: Sujith MIME-Version: 1.0 Message-ID: <19768.63197.462196.80033@gargle.gargle.HOWL> Date: Fri, 21 Jan 2011 08:30:45 +0530 To: linux-wireless@vger.kernel.org X-Mailer: VM 8.1.1 under 23.2.1 (x86_64-unknown-linux-gnu) CC: ath9k-devel@venema.h4ckr.net Subject: [RFC/WIP 11/33] ath9k_htc: Fix WMI and beacon header Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 21 Jan 2011 03:01:33 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 87e2d41..6a09ad4 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -95,8 +95,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/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c index dc862f5..8ed6fe6 100644 --- a/drivers/net/wireless/ath/ath9k/wmi.c +++ b/drivers/net/wireless/ath/ath9k/wmi.c @@ -158,6 +158,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 @@ -172,7 +173,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/drivers/net/wireless/ath/ath9k/wmi.h b/drivers/net/wireless/ath/ath9k/wmi.h index 4208427..24f16fa 100644 --- a/drivers/net/wireless/ath/ath9k/wmi.h +++ b/drivers/net/wireless/ath/ath9k/wmi.h @@ -31,6 +31,11 @@ struct wmi_cmd_hdr { __be16 seq_no; } __packed; +struct wmi_event_swba { + __be64 tsf; + u8 beacon_pending; +}; + enum wmi_cmd_id { WMI_ECHO_CMDID = 0x0001, WMI_ACCESS_MEMORY_CMDID, @@ -100,6 +105,7 @@ struct wmi { u32 cmd_rsp_len; bool stopped; + u64 tsf; u8 beacon_pending; spinlock_t wmi_lock;