From patchwork Wed Apr 13 05:54:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith Manoharan X-Patchwork-Id: 702811 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 p3D5qKBX025544 for ; Wed, 13 Apr 2011 05:52:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753418Ab1DMFwT (ORCPT ); Wed, 13 Apr 2011 01:52:19 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:58841 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752572Ab1DMFwS (ORCPT ); Wed, 13 Apr 2011 01:52:18 -0400 Received: by mail-iy0-f174.google.com with SMTP id 14so275049iyb.19 for ; Tue, 12 Apr 2011 22:52:18 -0700 (PDT) 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=zamdX3B8KcOsoufOAFgp+SYOHBvzSzfgWR5x+ofepb4=; b=MuwGFcKoRNsYVh2QKdxizu61nDVG3pzzA/XwmVT9qRWkPcZNII3rHX2lJ8zvOkcKfO Amk6sUTqnCpCw3rV73nIfoKwK3v7vhjbVu67mH3LRUyA9NXMVXKF17YYFG3LJAeTDuca QCju7jXcyiwFxd9IBeyigveeA+H7g9Mw/DKEI= 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=l5UfRwcIWcx5/CdQUrnZNYWeFTNKfdxPXGW94N6+YHpppKgqgj7uT7GPXSL4OsBI6D sE+LWTMDjiFFXau5z+UyYDNcW8mTeZ14Y9RcxcOdW+6OaanbusnWfBg61ZE74pBv3kba u6Di1JTQVbYwQM7L658cnRzFmp7PL3Mnfb8uQ= Received: by 10.42.18.4 with SMTP id v4mr1078125ica.399.1302673938395; Tue, 12 Apr 2011 22:52:18 -0700 (PDT) Received: from atheros-test ([182.72.177.186]) by mx.google.com with ESMTPS id i26sm185083iby.24.2011.04.12.22.52.15 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Apr 2011 22:52:17 -0700 (PDT) From: Sujith MIME-Version: 1.0 Message-ID: <19877.15011.484382.666651@gargle.gargle.HOWL> Date: Wed, 13 Apr 2011 11:24:43 +0530 To: linville@tuxdriver.com X-Mailer: VM 8.1.1 under 23.3.1 (x86_64-unknown-linux-gnu) CC: linux-wireless@vger.kernel.org, ath9k-devel@venema.h4ckr.net Subject: [PATCH 17/40] ath9k_htc: Sync struct ath9k_htc_target_vif with FW 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]); Wed, 13 Apr 2011 05:52:21 +0000 (UTC) From: Sujith Manoharan Signed-off-by: Sujith Manoharan --- drivers/net/wireless/ath/ath9k/htc.h | 12 +++--------- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 8 ++++---- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index e096624..f74f45f 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -117,17 +117,11 @@ struct ath9k_htc_cap_target { struct ath9k_htc_target_vif { u8 index; - u8 des_bssid[ETH_ALEN]; - __be32 opmode; + u8 opmode; u8 myaddr[ETH_ALEN]; - u8 bssid[ETH_ALEN]; - u32 flags; - u32 flags_ext; - u16 ps_sta; - __be16 rtsthreshold; u8 ath_cap; - u8 node; - s8 mcast_rate; + __be16 rtsthreshold; + u8 pad; } __packed; #define ATH_HTC_STA_AUTH 0x0001 diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index 9bb20f3..4002267 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -349,7 +349,7 @@ static int ath9k_htc_add_monitor_interface(struct ath9k_htc_priv *priv) memset(&hvif, 0, sizeof(struct ath9k_htc_target_vif)); memcpy(&hvif.myaddr, common->macaddr, ETH_ALEN); - hvif.opmode = cpu_to_be32(HTC_M_MONITOR); + hvif.opmode = HTC_M_MONITOR; hvif.index = ffz(priv->vif_slot); WMI_CMD_BUF(WMI_VAP_CREATE_CMDID, &hvif); @@ -1039,13 +1039,13 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw, switch (vif->type) { case NL80211_IFTYPE_STATION: - hvif.opmode = cpu_to_be32(HTC_M_STA); + hvif.opmode = HTC_M_STA; break; case NL80211_IFTYPE_ADHOC: - hvif.opmode = cpu_to_be32(HTC_M_IBSS); + hvif.opmode = HTC_M_IBSS; break; case NL80211_IFTYPE_AP: - hvif.opmode = cpu_to_be32(HTC_M_HOSTAP); + hvif.opmode = HTC_M_HOSTAP; break; default: ath_err(common,