From patchwork Wed Oct 19 08:25:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp348648wrs; Wed, 19 Oct 2022 07:10:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5HlTrNjFJwZspXfxXLKTTB1m+i/CKT/pmnxEQgJ71y9IIWx/w2tUJ5n7VeuvIDE0NaCgJa X-Received: by 2002:a05:6402:5485:b0:459:147a:d902 with SMTP id fg5-20020a056402548500b00459147ad902mr7946335edb.263.1666188628157; Wed, 19 Oct 2022 07:10:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666188628; cv=none; d=google.com; s=arc-20160816; b=K8D4qI0xU0sIt/Z64IUT4rcb+yh7BL+sa4gFJdiZncVBnLaPJ2aPs+SC/VAUBwWdyX NRL89nN35/kM77rFojF66VrtcinCsmnSCiXI1sXPUWCTBF3rRYbd/nyeOm7UVO03ErNF siHlhKRXeYhHAPzV7N0HN2H5iE+KcglnJwcRQB7CwO2JhUQXDe2cznT7F7kpSeZillxR gncm9Pt9fW1NzxaznTD5MdIUdXav4J5jYlCJUlokMcFdzUFvPoY9ze7UdqmUIk8Dp+yG 1PLGGXcnJKwTGjOs/gm6LtFoyAWxFSqY3csr4Nl2EEN7SJjfTXbrAv0nJg53IWO4oHzw XITQ== 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=QuSA+kxX7po9bgqRysegFXeVClYwDeYvUrva9tYk0Y4=; b=Xpzzt3rUAcyeBdEj5K+r0Xxc+gU0ip2VNKVAbHCCIaiH2tR+0/iTpebgEjDYHR4Ia0 l1ErL+9MPV3OFDjjdxApQf8Q28kJI8jtoeI16QMHpUaBBoS3bgmIF6TvOfX5CJ+cL3tV Ib4FAwL59R7uWp8/l5YhcJ0WJF8KGdERtZf5RMadOMygz2KaKplOKnsgQhvgzyDCDLHd kbiK1f8fiOMIYnv1RqCR4XUPH65B2iRYnYR9YAJYePCDhiOa+sr0/nNAP7EiF87FWzgp LVoyn/Rj4XVznH6aeQY2acQdl+uRevHbgwq79zcIStkA/jOgp7bO5QzIMlSUdcvqyK2z Z9rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=loiDd8iK; 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 o19-20020aa7dd53000000b00447dfae6181si12282404edw.235.2022.10.19.07.09.57; Wed, 19 Oct 2022 07:10:28 -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=loiDd8iK; 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 S231960AbiJSNxT (ORCPT + 99 others); Wed, 19 Oct 2022 09:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233749AbiJSNwa (ORCPT ); Wed, 19 Oct 2022 09:52: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 030A91946E7; Wed, 19 Oct 2022 06:36:16 -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 51515B82321; Wed, 19 Oct 2022 08:49:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B421DC433C1; Wed, 19 Oct 2022 08:49:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169347; bh=JD5EGFdbeO8eIPr4yRiMiBSbkCZWKHBuu0ZkMSKqJqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=loiDd8iKuiaHR5QOwzUrvtcnQcFAvJNjAyi2lpLbciBQYt+EZCC98cvMYISwP+eI0 mFxj6ujwlchbvE1l4VGLOYayoC6iPljYm19O/ELQOmkwjnU4hhbr0Y05iUwXybe9UE 4P330ApytTdqO1q/aDjwA4CWGcrK/Nq0+VmfxvhY= 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 6.0 243/862] wifi: mac80211: allow bw change during channel switch in mesh Date: Wed, 19 Oct 2022 10:25:30 +0200 Message-Id: <20221019083300.754397190@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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=ham 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?1747125406807681257?= X-GMAIL-MSGID: =?utf-8?q?1747125406807681257?= 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 a4f6971b7a19..e5239a17a875 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3597,9 +3597,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)