From patchwork Mon Mar 7 02:14:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith Manoharan X-Patchwork-Id: 614231 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 p272EQUo018213 for ; Mon, 7 Mar 2011 02:14:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755181Ab1CGCOY (ORCPT ); Sun, 6 Mar 2011 21:14:24 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:47324 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755159Ab1CGCOY (ORCPT ); Sun, 6 Mar 2011 21:14:24 -0500 Received: by yxs7 with SMTP id 7so1452952yxs.19 for ; Sun, 06 Mar 2011 18:14:23 -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=Kh/3UfXQKxBMQHjHtIE/YoWIS5LAPu36hDWshKAIn9M=; b=qYCSP8SO7dQfNgx8GIEioJ35PQ6LzupTvhx3r5XTqBWjmuVJEHBeMzurBJ1AvI8BBy OpShR5op5htnfnZCbxmf/ZTA4e5TM6vavyn7C1GoxSuxyAmfwOcq0wof1vh9B+cGColA 3vCVnKHIsS23dxax7THKt+LE5uyHs5M++n298= 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=V08ZGbkmT6t1Mj+YjCAQcdMgrQabiEQI2N22bi3cUfb4RFSL/Fiwu/i7k9aWtfD5eK 6kjpOY9FIdMNA2I707wprphqT8ZZ+qvNwUCbbgI85pyOhftabkS9R0FDBtKnHnOo7L24 SegAbazeBaIl3wyFP1QKkEGri8e6O/lVF7T24= Received: by 10.151.117.9 with SMTP id u9mr3710005ybm.424.1299464063493; Sun, 06 Mar 2011 18:14:23 -0800 (PST) Received: from bodhi ([117.197.194.30]) by mx.google.com with ESMTPS id q29sm1416004yba.2.2011.03.06.18.14.20 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 06 Mar 2011 18:14:22 -0800 (PST) From: Sujith MIME-Version: 1.0 Message-ID: <19828.16246.623659.384085@gargle.gargle.HOWL> Date: Mon, 7 Mar 2011 07:44:14 +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 15/34] 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]); Mon, 07 Mar 2011 02:14:26 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 72aa04e..b134d41 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -117,17 +117,10 @@ 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; } __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,