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 04218C35280 for ; Wed, 9 Mar 2022 16:50:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237956AbiCIQuY (ORCPT ); Wed, 9 Mar 2022 11:50:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236247AbiCIQc4 (ORCPT ); Wed, 9 Mar 2022 11:32:56 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CADA1AC2A6; Wed, 9 Mar 2022 08:28:25 -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 dfw.source.kernel.org (Postfix) with ESMTPS id C9EF261984; Wed, 9 Mar 2022 16:27:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59580C340EC; Wed, 9 Mar 2022 16:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646843274; bh=KnxeRE+Le/zxu/bcAkRRacwhz4IT1ZtXf1iBhjipU6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bBjDNK1oE19uqRmVE24iSI8oVCr/6kP++ARbQsDQToQNTC9hK4PgVce3MFRHDd0nw yccqJwLkrNCgL3BSXw00+nzmziZ9ZIFjNUuLI2DQ1bYFSCaunX2QWda+Q4FQmzKge5 Xkqnq/r6BILGQHVlNAWSO+nto2p9+dq2kwIP5TbltoTIZi7PfPoGHJ6nY7CHxagJKv OBubK0B8IpuEuJiKYl4ZStd+XO0gaxlP5Y3d7IgmapvLmVtAsJJDTK1XxLyCUrY11G MH8fi83BzGmFtEdHwvOltIrVOvRpw8sBAlCeFsl32klIIOnAWVmSEIdT/EX5USigfs UsIiD7yTMyV5g== 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.9 07/11] nl80211: Update bss channel on channel switch for P2P_CLIENT Date: Wed, 9 Mar 2022 11:27:12 -0500 Message-Id: <20220309162716.137399-7-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220309162716.137399-1-sashal@kernel.org> References: <20220309162716.137399-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 ab8bca39afa3..562e138deba2 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -14068,7 +14068,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