From patchwork Sat Oct 22 07:21:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1109564wrr; Sat, 22 Oct 2022 01:49:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6v8uTXj0ncM+w8OzuuQGH2yJBMYBOf6vD9C7BDAN7EQt0Lbn7CZQxR1Ks+TNfaz5N33x0b X-Received: by 2002:a05:6402:5291:b0:45c:3f6a:d4bc with SMTP id en17-20020a056402529100b0045c3f6ad4bcmr21068060edb.285.1666428542472; Sat, 22 Oct 2022 01:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666428542; cv=none; d=google.com; s=arc-20160816; b=pCEz8Ic9j89FIXGMjqqdmA9OYqoWXr3e42w5aV5S3CBfaX6E0T/hJhJD1mliaxXcpw OxeFhVIohZC55X2L7SzWsUNd+p1MQJVuAXfKobdK1/KpuRa0H/vFWW54ZL7LI35U1H+5 Hz/9PN8T770Lan6N+dgDi5uldasFA6nc/mcPpx4zOWdzC1XWCl+gmYxXZ3jhV7oLqwFm 7nxLAUf3iphleQBrC7P7Jwf3DFPYJOqTCZSWlayrRd6luTTANBR1Ioy1oLVLWJoD2t/b 2rxVDEvLPqMyfoKssVtZQzXM2NWKCbhTeILrOEAyXUQNWu6BHwuWTiJaLTxICTz9ku6t coTw== 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=6lic7GtjKSNSlCNkMjO8zOUjRWmmC+cNPbP9LoygaPQ=; b=xqlPtZu7iJ2tz1vcQmTxYhCURQOiLYK5Fd0jeYzMQmqhGhFxNAMQj0fpInVnktbxLp XprFngB3ZJh4S4eXQe9r0C4qvzWx5DsX/b7MRAKXQcqVWEkSTY7Y+UPmCOu/qJJfrONN C2n457xxFReepY26dr2pn2rcix2jy3Lq3FR6JDhxGI1vRLYZO4WsGIh3zn2aqTqDyVbd amuEU5gbJtq3i50gf/R9MK57OC2CXoWP5XFP9aeO5cwSPis8mEBxzc/oFeSi1cnKb0ou ZU7g3QQJMkc/HgzJlRpqnFiC8W3H3vYE4bq8a9EvWK6F5em77QekczjRgEqQ7/UhdYiY qlXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Tz8MJWZi; 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 j11-20020a05640211cb00b0045f802c0b98si11374821edw.443.2022.10.22.01.48.38; Sat, 22 Oct 2022 01:49:02 -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=Tz8MJWZi; 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 S234524AbiJVIsF (ORCPT + 99 others); Sat, 22 Oct 2022 04:48:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43996 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235273AbiJVIpF (ORCPT ); Sat, 22 Oct 2022 04:45:05 -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 197032ECF57; Sat, 22 Oct 2022 01:09:07 -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 215D1B82DB2; Sat, 22 Oct 2022 07:43:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3489AC433B5; Sat, 22 Oct 2022 07:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424605; bh=VpSA4BMhFeKTWyRx8kXmF54tw9u0jbtrAQ4h/xDZpo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tz8MJWZikgEqpMsDZ7uj8CG0mYn3DjptpICY9UfwZ96I0NPeT608rXM+A3SdUuDKW jNGNSkFIgb6XoHn1suH6cTfc/+HEem8UOq5SkZKnOMNinctDbGsMJgotSfWiAeYoBR O1x+YdgyhDIbSpeGXLXw3mOhSvs+SU2PJEDSJEBY= 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.19 209/717] wifi: mac80211: allow bw change during channel switch in mesh Date: Sat, 22 Oct 2022 09:21:28 +0200 Message-Id: <20221022072452.264380904@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747376975586659917?= X-GMAIL-MSGID: =?utf-8?q?1747376975586659917?= 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 9ca25ae503b0..37484c26259d 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3545,9 +3545,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)