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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBDD5C3527D for ; Wed, 9 Mar 2022 16:50:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237909AbiCIQuL (ORCPT ); Wed, 9 Mar 2022 11:50:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235395AbiCIQcy (ORCPT ); Wed, 9 Mar 2022 11:32:54 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3385757B26; Wed, 9 Mar 2022 08:28:18 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 167B5B82251; Wed, 9 Mar 2022 16:27:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2119C340E8; Wed, 9 Mar 2022 16:26:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646843219; bh=K3FO2TWXO6pAN8KGOhYItbIUmKhC+J+Tj77X8skAVOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EBADp+5GJnF4hXl7S5RDZSAYJfamXZWyd7TtT/tYZpVI4ucEOafmOgTovh3w9fqfc bacJDNIUIw/I2d/haThEwFII21/JDTMfT30/TetlcasAXfmdDmLML8I9vssi/qlUAX rzg0eL9GUGcLOVeoPMaB215pLgCsJygbVXmYqbHJNR30X5lz6XIrMS6mnX3uQ+xRmv spJT/xocjTOJZmWmG8sQlYXuOJ91i3k+gopwAKpaegsP033YOaurNkRGjOeCIn6n3b Y6beXTCbxGKrIywJHCP+zcxx5yyIeca+fFAwltkQFL3d+hFUYbtsI7+DymIJwt6iLa B8WTFha8/gbUA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sreeramya Soratkal , Johannes Berg , Sasha Levin , johannes@sipsolutions.net, davem@davemloft.net, kuba@kernel.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 08/12] nl80211: Update bss channel on channel switch for P2P_CLIENT Date: Wed, 9 Mar 2022 11:26:13 -0500 Message-Id: <20220309162618.137226-8-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220309162618.137226-1-sashal@kernel.org> References: <20220309162618.137226-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sreeramya Soratkal [ Upstream commit e50b88c4f076242358b66ddb67482b96947438f2 ] The wdev channel information is updated post channel switch only for the station mode and not for the other modes. Due to this, the P2P client still points to the old value though it moved to the new channel when the channel change is induced from the P2P GO. Update the bss channel after CSA channel switch completion for P2P client interface as well. Signed-off-by: Sreeramya Soratkal Link: https://lore.kernel.org/r/1646114600-31479-1-git-send-email-quic_ssramya@quicinc.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/nl80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index bbc3c876a5d8..7085c54e6e50 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -14777,7 +14777,8 @@ void cfg80211_ch_switch_notify(struct net_device *dev, wdev->chandef = *chandef; wdev->preset_chandef = *chandef; - if (wdev->iftype == NL80211_IFTYPE_STATION && + if ((wdev->iftype == NL80211_IFTYPE_STATION || + wdev->iftype == NL80211_IFTYPE_P2P_CLIENT) && !WARN_ON(!wdev->current_bss)) wdev->current_bss->pub.channel = chandef->chan; -- 2.34.1