From patchwork Mon Dec 2 15:33:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Kwaczynski X-Patchwork-Id: 3265961 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 676B1C0D4A for ; Mon, 2 Dec 2013 15:34:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2199E20258 for ; Mon, 2 Dec 2013 15:34:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4F03202F2 for ; Mon, 2 Dec 2013 15:34:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752528Ab3LBPeS (ORCPT ); Mon, 2 Dec 2013 10:34:18 -0500 Received: from mail-ea0-f172.google.com ([209.85.215.172]:65318 "EHLO mail-ea0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752494Ab3LBPeQ (ORCPT ); Mon, 2 Dec 2013 10:34:16 -0500 Received: by mail-ea0-f172.google.com with SMTP id q10so9065820ead.17 for ; Mon, 02 Dec 2013 07:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0nMM4QxuNYXtJJwVAXM9g2qN4bKbwkkL6KZpxblYFbQ=; b=vxFHLggiPJtdn4JXCjE0l39XqXUGce+2fGGxmikm1QKF5fFE4HMWt4feGnkgLECEPk GmQpGTyiM0vynB/vj5qr9biHcwCyX7E/q65sR/1oSvcR1cwtahxj6MtMldKOG1ZzJC6R StJHTWvXPqiwBcOEaiLY6Ql3eoRFCyqRyGVT0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0nMM4QxuNYXtJJwVAXM9g2qN4bKbwkkL6KZpxblYFbQ=; b=d4hTSuH0e7+i01V7MAU4GAZJ/+/bGhxgX85lGkVpjOwvxaEexeCuLU4SxYRtnhXdzq Gw0Mgi9r7MGChkbPdiSiAA+MN1KL2u5xLolkrI4RhFh67kDBnfhJVTmNRVahMH+ELie/ 70AM8kWU6NMvv7QPVjRcO+5nVM58m36PuA2jqftIPxvRE5EoFmZ73Dbn4pUlA76EVjNP BZ3r77WvhhNlVI27CHjWGrK1Wa66BGtnYrY6T0PA8Hr72wahoe/B8pn8E77IXM/m1Nxo m0q/avr6MfESC84u+EX00sNpfKZOENRT1wlDJjK5FUXoNG/w+15YAbf1WqN9yu8I7UQY cEyg== X-Gm-Message-State: ALoCoQncuVYVndUUPwhXBagZuhopZNSadOQHBST0Xv3FeyklVqsOTHML5DDUniHNFsce1cQziHyCTF0ksTgQ/thO3BZtqg3Fyn1+EScj5Ic8yNJrGsBf4Kw= X-Received: by 10.14.7.2 with SMTP id 2mr7803681eeo.16.1385998454874; Mon, 02 Dec 2013 07:34:14 -0800 (PST) Received: from localhost.localdomain (host127.217.146.194.generacja.pl. [194.146.217.127]) by mx.google.com with ESMTPSA id g7sm23451609eet.12.2013.12.02.07.34.11 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 07:34:13 -0800 (PST) From: Marek Kwaczynski To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Marek Kwaczynski Subject: [PATCH 2/2] mac80211: Update opmode during adding new station Date: Mon, 2 Dec 2013 16:33:59 +0100 Message-Id: <1385998439-27632-2-git-send-email-marek.kwaczynski@tieto.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1385998439-27632-1-git-send-email-marek.kwaczynski@tieto.com> References: <1385998439-27632-1-git-send-email-marek.kwaczynski@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Update Operating mode is needed when User Space received Assoc Request contains Operating mode notification element. Signed-off-by: Marek Kwaczynski --- net/mac80211/cfg.c | 7 +++++++ net/mac80211/ieee80211_i.h | 3 +++ net/mac80211/vht.c | 31 ++++++++++++++++++++----------- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 95667b0..50f0841 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1409,6 +1409,13 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, */ if (!(params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER))) { sta_info_pre_move_state(sta, IEEE80211_STA_AUTH); + if (params->vht_opmode_used) { + enum ieee80211_band band = + ieee80211_get_sdata_band(sdata); + ieee80211_vht_recalc_handle_opmode(sdata, sta, + params->vht_opmode, + band, 0); + } sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC); } diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 29dc505..13965e1 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1510,6 +1510,9 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, struct sta_info *sta); enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta); void ieee80211_sta_set_rx_nss(struct sta_info *sta); +u32 ieee80211_vht_recalc_handle_opmode(struct ieee80211_sub_if_data *sdata, + struct sta_info *sta, u8 opmode, + enum ieee80211_band band, bool nss_only); void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, struct sta_info *sta, u8 opmode, enum ieee80211_band band, bool nss_only); diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c index de01127..4a5174c 100644 --- a/net/mac80211/vht.c +++ b/net/mac80211/vht.c @@ -350,21 +350,17 @@ void ieee80211_sta_set_rx_nss(struct sta_info *sta) sta->sta.rx_nss = max_t(u8, 1, ht_rx_nss); } -void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, - struct sta_info *sta, u8 opmode, - enum ieee80211_band band, bool nss_only) +u32 ieee80211_vht_recalc_handle_opmode(struct ieee80211_sub_if_data *sdata, + struct sta_info *sta, u8 opmode, + enum ieee80211_band band, bool nss_only) { - struct ieee80211_local *local = sdata->local; - struct ieee80211_supported_band *sband; enum ieee80211_sta_rx_bandwidth new_bw; - u32 changed = 0; u8 nss; - - sband = local->hw.wiphy->bands[band]; + u32 changed = -1; /* ignore - no support for BF yet */ if (opmode & IEEE80211_OPMODE_NOTIF_RX_NSS_TYPE_BF) - return; + return -EOPNOTSUPP; nss = opmode & IEEE80211_OPMODE_NOTIF_RX_NSS_MASK; nss >>= IEEE80211_OPMODE_NOTIF_RX_NSS_SHIFT; @@ -376,7 +372,7 @@ void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, } if (nss_only) - goto change; + return changed; switch (opmode & IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK) { case IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ: @@ -398,8 +394,21 @@ void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, sta->sta.bandwidth = new_bw; changed |= IEEE80211_RC_BW_CHANGED; } + return changed; +} + +void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, + struct sta_info *sta, u8 opmode, + enum ieee80211_band band, bool nss_only) +{ + struct ieee80211_local *local = sdata->local; + struct ieee80211_supported_band *sband; + u32 changed = 0; + + changed = ieee80211_vht_recalc_handle_opmode(sdata, sta, opmode, band, + nss_only); + sband = local->hw.wiphy->bands[band]; - change: if (changed) rate_control_rate_update(local, sband, sta, changed); }