From patchwork Mon Oct 24 11:28:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9680 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp535565wru; Mon, 24 Oct 2022 09:13:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7LOYjDSWuuY2/+tFGI7mxoakwJdEesYpjwaTYRga9tmVHaVL1P5n9EFvgQck4BeyPP8pJh X-Received: by 2002:a17:90a:c258:b0:20b:23d5:8eb2 with SMTP id d24-20020a17090ac25800b0020b23d58eb2mr38371564pjx.85.1666627990269; Mon, 24 Oct 2022 09:13:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627990; cv=none; d=google.com; s=arc-20160816; b=JA+BToEiaE98B1B6GhpF3eCw86tncdIRsgC2j5SQyXR52kR7zrsSebRdc1wTp1MKzg 6EewsrzA1nP7lG0/0k5XQ6WX3O0659Eh0WYnAXRbSapnintif3KsnAZaxzCziKwrkLD6 p8rE2mS316OGfDT39G+LF0IsmxFS5ujkS4hfOQqDHoa9qj5twszXaw8xZqTaVLjgZgKg 8BGFmvMfGK12CBJT4gDdgM5TeNdk+bpF2Nz+BWrwvvOCLSbHSJucDolPrrVexiZVP2H0 LpfgPKlwyC95XZMiEjhAtN0UOBokD/dWH+oU3m42qBmBbtlNwTOE91hytfRsnc5xyqaD PsMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DiKZfw5OrjXcuVZIIV+EJyTpWnGEi484QH5Xtd4eZU4=; b=Q9OFb46eWyh+LNCW/UZIAzBGqP/nlpCYxun0EZR5iMfvTmyaGvfU47wKgCO7/PdvMM VqjJpc5iDXKh55OnYTC7PGP9QnvstMBkAEMHLw6qqYcuMD8xBEg170TqEHNwFJaFahFB LuwO/oTS4OzL7u0t1vKjoiq/9rLLHBuCXd9vv7OTOZ90PQjXn9fCNuUV1xekXoHiUKRy njWLImxBicr9mmdlYRQ9nDSEfg04wy/+n2doF9wmmeiUpCEwYVirj1rnYmYNUMoFgSC4 o+o4eDGAX1adQRno0tBfxdv9dOqAJA0JHL//MLoHx45C8PUBlf9ehPQSDgXAv5bC571O SvuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r7Yym9za; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id me4-20020a17090b17c400b0020dba4e1b21si530681pjb.0.2022.10.24.09.12.55; Mon, 24 Oct 2022 09:13:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r7Yym9za; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232797AbiJXQMZ (ORCPT + 99 others); Mon, 24 Oct 2022 12:12:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232777AbiJXQFa (ORCPT ); Mon, 24 Oct 2022 12:05:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72486264BE; Mon, 24 Oct 2022 07:58:30 -0700 (PDT) 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 1BF06B8164B; Mon, 24 Oct 2022 12:20:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63155C433D6; Mon, 24 Oct 2022 12:20:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614021; bh=JTuqz7XI2XwjVG0MMTdnj7U3jbDzFHngQ8w9OjJuMJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r7Yym9zaMJtdAqE69NhWf4XMsZh+0EtmfLILz54tdpvrz7JLofO0C2d6t9by3C2Q4 uEESPq6lPGvdWlFDDeNVDqwBljaiZRGySReHm4mprVzy5xSLJgwHbnvBMygY5cZ3ga 6zvOYRexv4O+1XgMPvph05y6wpuhL7DDcjTcEz74= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hari Chandrakanthan , Johannes Berg , Sasha Levin Subject: [PATCH 5.10 102/390] wifi: mac80211: allow bw change during channel switch in mesh Date: Mon, 24 Oct 2022 13:28:19 +0200 Message-Id: <20221024113027.012358409@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747586111780776558?= X-GMAIL-MSGID: =?utf-8?q?1747586111780776558?= From: Hari Chandrakanthan [ Upstream commit 6b75f133fe05c36c52d691ff21545d5757fff721 ] >From 'IEEE Std 802.11-2020 section 11.8.8.4.1': The mesh channel switch may be triggered by the need to avoid interference to a detected radar signal, or to reassign mesh STA channels to ensure the MBSS connectivity. A 20/40 MHz MBSS may be changed to a 20 MHz MBSS and a 20 MHz MBSS may be changed to a 20/40 MHz MBSS. Since the standard allows the change of bandwidth during the channel switch in mesh, remove the bandwidth check present in ieee80211_set_csa_beacon. Fixes: c6da674aff94 ("{nl,cfg,mac}80211: enable the triggering of CSA frame in mesh") Signed-off-by: Hari Chandrakanthan Link: https://lore.kernel.org/r/1658903549-21218-1-git-send-email-quic_haric@quicinc.com Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/cfg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 8010967a6874..c6a7f1c99abc 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3357,9 +3357,6 @@ static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata, case NL80211_IFTYPE_MESH_POINT: { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; - if (params->chandef.width != sdata->vif.bss_conf.chandef.width) - return -EINVAL; - /* changes into another band are not supported */ if (sdata->vif.bss_conf.chandef.chan->band != params->chandef.chan->band)