From patchwork Mon Dec 2 14:28:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Kwaczynski X-Patchwork-Id: 3265651 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9E22B9F374 for ; Mon, 2 Dec 2013 14:29:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DF7DC201F5 for ; Mon, 2 Dec 2013 14:29:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B26D20165 for ; Mon, 2 Dec 2013 14:29:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752151Ab3LBO3j (ORCPT ); Mon, 2 Dec 2013 09:29:39 -0500 Received: from mail-ea0-f175.google.com ([209.85.215.175]:56440 "EHLO mail-ea0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751748Ab3LBO3j (ORCPT ); Mon, 2 Dec 2013 09:29:39 -0500 Received: by mail-ea0-f175.google.com with SMTP id z10so9094805ead.34 for ; Mon, 02 Dec 2013 06:29:37 -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=z7hLz3HF9YptW79Vt8vpKkqIkpjBhYhS31I9Y4CyTYg=; b=5ivDx0Ua27EDem/Rrl+UvMOJkqopsBZYnfeIHe3aqACtVbbx/YvujS8ir94k2kZJ63 e3A23EWVAT2dx3vvLFTgDzfHdybZTnVD4eO3uOVuwGBKCX4sXKZN0L3A8zWAtJ+JtL+E qQYZZ9EHJRkozQhXMMpaMEsVd/FSyvKnIjYME= 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=z7hLz3HF9YptW79Vt8vpKkqIkpjBhYhS31I9Y4CyTYg=; b=abbrcNs8G+2x48Z8mGNajqdUuOHMnnlKO3xH2a9hajDAWsnCbH4wCo7742Jp2ed1Zn 3wA+WUEzuhqe1+e4FbTOVmO4aUAdndZYWs9BjnTdsxlJhICJ+JYwg/je1VfwNxHdLwe+ Ms5KGUDuwDeXm4Fhwrb+gvIONTRGleXOvtGVX5kJrkkRrf28unB6Jl/6yr51p09LdqpH 6c7cMNMhZM02FMpi0wazwHVWZoCwU1MOj+WISdlo6NTG+1E4CGIFunplakDdWDuId0qT 0Fiv6Xcoj/qYuJNApopm7O+RLykSHGRC/GomXhZvHKkF+0+dvIIL+zy3YKjt57Ktd1Zt TLSA== X-Gm-Message-State: ALoCoQkL4Rk5NKK7DdX0ss2/eTYm2wIlCARl4ikdwSP2ZC2poqaGxUlIcLVhJdRZwXhN+gQIMGk+WIL+Kl7HwbfcemTbFM94U3sEUXJNPrmaQIdv8UGmd8o= X-Received: by 10.14.95.130 with SMTP id p2mr2038927eef.47.1385994577931; Mon, 02 Dec 2013 06:29:37 -0800 (PST) Received: from localhost.localdomain (host127.217.146.194.generacja.pl. [194.146.217.127]) by mx.google.com with ESMTPSA id l4sm35804598een.13.2013.12.02.06.29.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Dec 2013 06:29:33 -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 15:28:54 +0100 Message-Id: <1385994534-13383-2-git-send-email-marek.kwaczynski@tieto.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1385994534-13383-1-git-send-email-marek.kwaczynski@tieto.com> References: <1385994534-13383-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 | 8 ++++++++ net/mac80211/ieee80211_i.h | 4 ++++ net/mac80211/vht.c | 29 ++++++++++++++++++++--------- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 95667b0..f8cd150 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1409,6 +1409,14 @@ 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) { + u32 changed; + enum ieee80211_band band = + ieee80211_get_sdata_band(sdata); + ieee80211_vht_handle_recalc_opmode(sdata, sta, + params->vht_opmode, + band, 0, &changed); + } 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..2231661 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1510,6 +1510,10 @@ 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); +void ieee80211_vht_recalc_opmode(struct ieee80211_sub_if_data *sdata, + struct sta_info *sta, u8 opmode, + enum ieee80211_band band, bool nss_only, + u32 *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); diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c index de01127..397ae2a 100644 --- a/net/mac80211/vht.c +++ b/net/mac80211/vht.c @@ -350,14 +350,14 @@ 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, +void ieee80211_vht_recalc_opmode(struct ieee80211_sub_if_data *sdata, struct sta_info *sta, u8 opmode, - enum ieee80211_band band, bool nss_only) + enum ieee80211_band band, bool nss_only, + u32 *changed) { 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]; @@ -372,11 +372,11 @@ void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, if (sta->sta.rx_nss != nss) { sta->sta.rx_nss = nss; - changed |= IEEE80211_RC_NSS_CHANGED; + *changed |= IEEE80211_RC_NSS_CHANGED; } if (nss_only) - goto change; + return; switch (opmode & IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK) { case IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ: @@ -396,10 +396,21 @@ void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata, new_bw = ieee80211_sta_cur_vht_bw(sta); if (new_bw != sta->sta.bandwidth) { sta->sta.bandwidth = new_bw; - changed |= IEEE80211_RC_BW_CHANGED; + *changed |= IEEE80211_RC_BW_CHANGED; } +} + - change: - if (changed) - rate_control_rate_update(local, sband, sta, 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) +{ + u32 changed = 0; + ieee80211_vht_handle_recalc_opmode(sdata, sta, opmode, band, nss_only, + &changed); + + if (changed) { + rate_control_rate_update(local, sband, sta, changed); + + } }