From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89236C072B1 for ; Thu, 30 May 2019 04:31:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5FD4625647 for ; Thu, 30 May 2019 04:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559190668; bh=CYi8NvBAxVHnyCPZsVnbMsCHDi5Ti7e1WI+OTRJsNws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=qRZCYSLRlhlGVOhx4KAkCvE3Nle6k0i6BM2Up985xjlv0FvsTcsCu5Gf4nbtcGMap ppGsYQrIQEZoMmRrDsLj4F0ZgljS2HKaHhxZAABwudeKhPDYkF1kNeLq3Wbu1D6MhF baAoh9Xc1X8dTXPKCFFKYc9Ou/pWynItjMGYXZus= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729601AbfE3DNt (ORCPT ); Wed, 29 May 2019 23:13:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:60192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729596AbfE3DNt (ORCPT ); Wed, 29 May 2019 23:13:49 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A102E24556; Thu, 30 May 2019 03:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186028; bh=CYi8NvBAxVHnyCPZsVnbMsCHDi5Ti7e1WI+OTRJsNws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g2vf315RdJi/hQSBHX7mFGUJDXEqLy1OX6UMP1Vk+4LHC3k6jSEt2bxlEi/jIgTeB sX2aIaCnG/PT3aj9F6L3rR+wqROW9C+a8Frphr4t5iO484Meh7Ci9lAGlAPn9S8UEb m4+CR/oEEAaJS7bp0j5Sx6nvvgHlhUAett1lzxjc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sergey Matyukevich , Johannes Berg , Sasha Levin Subject: [PATCH 5.0 104/346] mac80211/cfg80211: update bss channel on channel switch Date: Wed, 29 May 2019 20:02:57 -0700 Message-Id: <20190530030546.399761699@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030540.363386121@linuxfoundation.org> References: <20190530030540.363386121@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 5dc8cdce1d722c733f8c7af14c5fb595cfedbfa8 ] FullMAC STAs have no way to update bss channel after CSA channel switch completion. As a result, user-space tools may provide inconsistent channel info. For instance, consider the following two commands: $ sudo iw dev wlan0 link $ sudo iw dev wlan0 info The latter command gets channel info from the hardware, so most probably its output will be correct. However the former command gets channel info from scan cache, so its output will contain outdated channel info. In fact, current bss channel info will not be updated until the next [re-]connect. Note that mac80211 STAs have a workaround for this, but it requires access to internal cfg80211 data, see ieee80211_chswitch_work: /* XXX: shouldn't really modify cfg80211-owned data! */ ifmgd->associated->channel = sdata->csa_chandef.chan; This patch suggests to convert mac80211 workaround into cfg80211 behavior and to update current bss channel in cfg80211_ch_switch_notify. Signed-off-by: Sergey Matyukevich Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/mlme.c | 3 --- net/wireless/nl80211.c | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 6878215672871..715ab0e6579cb 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1167,9 +1167,6 @@ static void ieee80211_chswitch_work(struct work_struct *work) goto out; } - /* XXX: shouldn't really modify cfg80211-owned data! */ - ifmgd->associated->channel = sdata->csa_chandef.chan; - ifmgd->csa_waiting_bcn = true; ieee80211_sta_reset_beacon_monitor(sdata); diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 156ce708b5330..0044bfb526abc 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -15667,6 +15667,11 @@ void cfg80211_ch_switch_notify(struct net_device *dev, wdev->chandef = *chandef; wdev->preset_chandef = *chandef; + + if (wdev->iftype == NL80211_IFTYPE_STATION && + !WARN_ON(!wdev->current_bss)) + wdev->current_bss->pub.channel = chandef->chan; + nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL, NL80211_CMD_CH_SWITCH_NOTIFY, 0); } -- 2.20.1