From patchwork Tue Jan 20 12:35:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz.Dziedzic@tieto.com X-Patchwork-Id: 5668961 X-Patchwork-Delegate: johannes@sipsolutions.net 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 49E58C058D for ; Tue, 20 Jan 2015 12:36:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6769120306 for ; Tue, 20 Jan 2015 12:36:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CE3920303 for ; Tue, 20 Jan 2015 12:36:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755141AbbATMgr (ORCPT ); Tue, 20 Jan 2015 07:36:47 -0500 Received: from mail-we0-f175.google.com ([74.125.82.175]:63697 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754716AbbATMgp (ORCPT ); Tue, 20 Jan 2015 07:36:45 -0500 Received: by mail-we0-f175.google.com with SMTP id k11so36920176wes.6 for ; Tue, 20 Jan 2015 04:36:44 -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; bh=4svQ3GXudcum9BjXbdSit+7+CSRjwI9KHut8j7VfAJI=; b=EiPZQK0zCburmcrfkkBC36w3vUYrciUnSN80F29zZE09iJmVkGHTidlBKhPSqErPZj 3MtPel1B9mSxDCJMt9PFYFMvlva+2nzL6EBqxcvwTQf9D6bo2pB/AHoyiNBjVKe5DQWO 0iCdwO9hWipg9LPECLkW330JQEgvfgEc7u0IQ= 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; bh=4svQ3GXudcum9BjXbdSit+7+CSRjwI9KHut8j7VfAJI=; b=QW3yfdApECHlrU3D9sgT5nlaJOOpBdNXhq3QSv4WIAVFW+DYPiq0SbilY+Hqe9wLNv KvhdurcEd5Ue4vNe801MjyY2sipA/hMto5q730Y2P97pbFKNj11f+iP/lUtbc3NBJu9P k8Gx1+wjcZIxBLo40AxegELQlOhtgAMxJKIwAr6oMagHh9hXaqQyxlz5KOgDCiLPeT6m 6YfehC73VNDEOwORMU9TLCTivre/8BvxOE2084XCNm7cyIxsj/CMg26M98JdenmJYnRI /VojCx8s5hUgt9AVMs0Xi47my0sizzfsuYznF7H9i0583zPThhy1FWbT0RNqwWDHUj+X 3G5g== X-Gm-Message-State: ALoCoQkqoTJtYf0+HkODtiJDmGuU1BJe2zu9GEqMWFRqket4VZx7HxaJnUndnYATkDSu8eWlUUlCvv0EE/OT9zHoiw7FnH02ICOQq4jegztp7a3WFyd/TCRsXxQtHcdgD4xsw5LGClSVD9MzTwCQg4nYn2XKggqpDpg9axt8qBBGVwJjAgC+zbEA18QhavaeNWRlT1iFbRbJ X-Received: by 10.180.107.195 with SMTP id he3mr46746707wib.44.1421757404096; Tue, 20 Jan 2015 04:36:44 -0800 (PST) Received: from localhost.localdomain (apn-46-76-65-212.dynamic.gprs.plus.pl. [46.76.65.212]) by mx.google.com with ESMTPSA id d7sm8816890wjs.2.2015.01.20.04.36.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jan 2015 04:36:43 -0800 (PST) From: Janusz Dziedzic To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Janusz Dziedzic Subject: [RFCv3 1/4] mac80211: ibss/mesh move bw checking Date: Tue, 20 Jan 2015 13:35:15 +0100 Message-Id: <1421757318-8343-1-git-send-email-janusz.dziedzic@tieto.com> X-Mailer: git-send-email 1.9.1 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,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 We will need this as a preparetion for VHT. Signed-off-by: Janusz Dziedzic --- net/mac80211/ht.c | 2 -- net/mac80211/ibss.c | 4 ++++ net/mac80211/mesh_plink.c | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/net/mac80211/ht.c b/net/mac80211/ht.c index ff630be..7a76ce6 100644 --- a/net/mac80211/ht.c +++ b/net/mac80211/ht.c @@ -252,8 +252,6 @@ bool ieee80211_ht_cap_ie_to_sta_ht_cap(struct ieee80211_sub_if_data *sdata, break; } - if (bw != sta->sta.bandwidth) - changed = true; sta->sta.bandwidth = bw; sta->cur_max_bandwidth = diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index b606b53..9fe045f 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -1048,6 +1048,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, /* we both use HT */ struct ieee80211_ht_cap htcap_ie; struct cfg80211_chan_def chandef; + enum ieee80211_sta_rx_bandwidth bw = sta->sta.bandwidth; ieee80211_ht_oper_to_chandef(channel, elems->ht_operation, @@ -1066,6 +1067,9 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, rates_updated |= ieee80211_ht_cap_ie_to_sta_ht_cap( sdata, sband, &htcap_ie, sta); + + if (bw != sta->sta.bandwidth) + rates_updated |= true; } if (sta && rates_updated) { diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index b488e18..9875d82 100644 --- a/net/mac80211/mesh_plink.c +++ b/net/mac80211/mesh_plink.c @@ -382,6 +382,7 @@ static void mesh_sta_info_init(struct ieee80211_sub_if_data *sdata, enum ieee80211_band band = ieee80211_get_sdata_band(sdata); struct ieee80211_supported_band *sband; u32 rates, basic_rates = 0, changed = 0; + enum ieee80211_sta_rx_bandwidth bw = sta->sta.bandwidth; sband = local->hw.wiphy->bands[band]; rates = ieee80211_sta_get_rates(sdata, elems, band, &basic_rates); @@ -401,6 +402,9 @@ static void mesh_sta_info_init(struct ieee80211_sub_if_data *sdata, elems->ht_cap_elem, sta)) changed |= IEEE80211_RC_BW_CHANGED; + if (bw != sta->sta.bandwidth) + changed |= IEEE80211_RC_BW_CHANGED; + /* HT peer is operating 20MHz-only */ if (elems->ht_operation && !(elems->ht_operation->ht_param &