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 79788C433FE for ; Wed, 9 Mar 2022 16:24:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234553AbiCIQZQ (ORCPT ); Wed, 9 Mar 2022 11:25:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235466AbiCIQXS (ORCPT ); Wed, 9 Mar 2022 11:23:18 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6955A57B30; Wed, 9 Mar 2022 08:21:43 -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 D5C18B81EE7; Wed, 9 Mar 2022 16:21:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BB79C340EC; Wed, 9 Mar 2022 16:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646842900; bh=Iqwh5RWoW5jbhU7n09L6jNGAntnAJR+hnRZr6bdNjKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aEYwrB8eKxFsDp7WgQwQEdFdQUSXISbWOF78vKqpEiLsz0AFgaCdJrztTRVFXdBTP 4zqi4N37LO5adkJjCTOmWtneH5dndxUXPQPmeeEyY+0Z/POSWoFjMe8L4N09F9YOVy B/+pY6KUtGHF6YaBdbKCA0fA5FiTAvW3DwbaySuiH2OKZARTRYnTNTDR3DBBWRnubw lKngKfWOJ8cQ7VUIRQnSNuHuA6pInXnIXKAM3zwXR4VvN5AlVFJLtjLPfdxeYYmJsD 0fMGu4pACwlfxKRzWJyYzI9v9xIQNYEsM+LFPDFOOLMiDMzU4U2eys+4ErDSidE4a9 PDqDlD7y2Al6Q== 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 5.15 20/24] nl80211: Update bss channel on channel switch for P2P_CLIENT Date: Wed, 9 Mar 2022 11:19:39 -0500 Message-Id: <20220309161946.136122-20-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220309161946.136122-1-sashal@kernel.org> References: <20220309161946.136122-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: netdev@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 99564db14aa1..2f9ead98a9da 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -17525,7 +17525,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)) cfg80211_update_assoc_bss_entry(wdev, chandef->chan); -- 2.34.1