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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 2FC14C2BB55 for ; Thu, 16 Apr 2020 15:49:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 09ABB20732 for ; Thu, 16 Apr 2020 15:49:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587052179; bh=Zg0lXdbFYkI82DZL3HsOsGw1RamNs7bH/YilUYo10QM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bAvoyhzTB/stuy5pTS/1SUC8YhPUplspUjckqVXU+HQjNwQQAx9APPZWeWT1pqpqm jl0YyHH3Hlr9I5PPujT7HniXMCZHV9QJCoGB6ol8bhCZPy17UwKxsC94+Zs0FcPD1a XDQZ9C1nRaM5fOgwU1UpS/pasi97ATN+XsexFDj0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442628AbgDPPtg (ORCPT ); Thu, 16 Apr 2020 11:49:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:44080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2896663AbgDPNdB (ORCPT ); Thu, 16 Apr 2020 09:33:01 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 B6D3422281; Thu, 16 Apr 2020 13:32:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587043959; bh=Zg0lXdbFYkI82DZL3HsOsGw1RamNs7bH/YilUYo10QM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QqZHWAFpMA5NkAuX+7d8zStByJCIRutlCMDvrhKRb7g8Ahm8QrS1PE0MpAk/g5ry7 Vfd4znEzWpeaKlQCThxboNZEb8qQcYFkak07R+NvulZ09JTKmZ3Da+BWlotO86vhYG t1Q3zzeqSDHQNqrbllSUPpEmK2rFp5ChXeCE5Abc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilan Peer , Luca Coelho , Johannes Berg , Sasha Levin Subject: [PATCH 5.5 023/257] cfg80211: Do not warn on same channel at the end of CSA Date: Thu, 16 Apr 2020 15:21:14 +0200 Message-Id: <20200416131328.860716097@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131325.891903893@linuxfoundation.org> References: <20200416131325.891903893@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilan Peer [ Upstream commit 05dcb8bb258575a8dd3499d0d78bd2db633c2b23 ] When cfg80211_update_assoc_bss_entry() is called, there is a verification that the BSS channel actually changed. As some APs use CSA also for bandwidth changes, this would result with a kernel warning. Fix this by removing the WARN_ON(). Signed-off-by: Ilan Peer Signed-off-by: Luca Coelho Link: https://lore.kernel.org/r/iwlwifi.20200326150855.96316ada0e8d.I6710376b1b4257e5f4712fc7ab16e2b638d512aa@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/wireless/scan.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/wireless/scan.c b/net/wireless/scan.c index aef240fdf8df6..328402ab64a3f 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -2022,7 +2022,11 @@ void cfg80211_update_assoc_bss_entry(struct wireless_dev *wdev, spin_lock_bh(&rdev->bss_lock); - if (WARN_ON(cbss->pub.channel == chan)) + /* + * Some APs use CSA also for bandwidth changes, i.e., without actually + * changing the control channel, so no need to update in such a case. + */ + if (cbss->pub.channel == chan) goto done; /* use transmitting bss */ -- 2.20.1