From patchwork Wed Oct 3 04:30:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Palivela X-Patchwork-Id: 1540221 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 44971E0163 for ; Wed, 3 Oct 2012 04:31:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969Ab2JCEbJ (ORCPT ); Wed, 3 Oct 2012 00:31:09 -0400 Received: from hub022-nj-3.exch022.serverdata.net ([206.225.164.186]:57763 "EHLO HUB022-nj-3.exch022.serverdata.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751776Ab2JCEad (ORCPT ); Wed, 3 Oct 2012 00:30:33 -0400 Received: from [192.168.10.60] (122.183.20.86) by east.exch022.serverdata.net (10.240.6.37) with Microsoft SMTP Server (TLS) id 14.2.309.2; Tue, 2 Oct 2012 21:30:32 -0700 Message-ID: <506BBF62.4080906@posedge.com> Date: Wed, 3 Oct 2012 10:00:26 +0530 From: Mahesh Palivela User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: Johannes Berg CC: "linux-wireless@vger.kernel.org" Subject: [PATCH v4 1/2] mac80211: VHT peer STA caps Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Mahesh Palivela Rename vht_capabilities to vht_cap Signed-off-by: Mahesh Palivela --- include/linux/ieee80211.h | 2 +- net/mac80211/main.c | 2 +- net/mac80211/mlme.c | 4 ++-- net/mac80211/util.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) tmp = cpu_to_le32(cap); -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 2385119..afd12d9 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1109,7 +1109,7 @@ struct ieee80211_ht_operation { #define VHT_MCS_SUPPORTED_SET_SIZE 8 -struct ieee80211_vht_capabilities { +struct ieee80211_vht_cap { __le32 vht_capabilities_info; u8 vht_supported_mcs_set[VHT_MCS_SUPPORTED_SET_SIZE]; } __packed; diff --git a/net/mac80211/main.c b/net/mac80211/main.c index c80c449..0ec170f 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -832,7 +832,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) if (supp_vht) local->scan_ies_len += - 2 + sizeof(struct ieee80211_vht_capabilities); + 2 + sizeof(struct ieee80211_vht_cap); if (!local->ops->hw_scan) { /* For hw_scan, driver needs to set these up. */ diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 2dbd9e1..85a7005 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -343,7 +343,7 @@ static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata, cap = vht_cap.cap; /* reserve and fill IE */ - pos = skb_put(skb, sizeof(struct ieee80211_vht_capabilities) + 2); + pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2); ieee80211_ie_build_vht_cap(pos, &vht_cap, cap); } @@ -392,7 +392,7 @@ static void ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) 4 + /* power capability */ 2 + 2 * sband->n_channels + /* supported channels */ 2 + sizeof(struct ieee80211_ht_cap) + /* HT */ - 2 + sizeof(struct ieee80211_vht_capabilities) + /* VHT */ + 2 + sizeof(struct ieee80211_vht_cap) + /* VHT */ assoc_data->ie_len + /* extra IEs */ 9, /* WMM */ GFP_KERNEL); diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 22ca350..4af69cc 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1788,8 +1788,8 @@ u8 *ieee80211_ie_build_vht_cap(u8 *pos, struct ieee80211_sta_vht_cap *vht_cap, __le32 tmp; *pos++ = WLAN_EID_VHT_CAPABILITY; - *pos++ = sizeof(struct ieee80211_vht_capabilities); - memset(pos, 0, sizeof(struct ieee80211_vht_capabilities)); + *pos++ = sizeof(struct ieee80211_vht_cap); + memset(pos, 0, sizeof(struct ieee80211_vht_cap)); /* capability flags */