From patchwork Mon Oct 24 11:29:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9769 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp551179wru; Mon, 24 Oct 2022 09:48:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6iU5YOPQsFWyxl6EtogXj7r+CFL0s8u6NrKGZITt7Hzi7wx91qD1lRphh7h+7spCYHK6U+ X-Received: by 2002:a17:907:701:b0:780:2c44:e4dd with SMTP id xb1-20020a170907070100b007802c44e4ddmr29239017ejb.589.1666630081214; Mon, 24 Oct 2022 09:48:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666630081; cv=none; d=google.com; s=arc-20160816; b=I/ci0O/8agCl1ZLH+PE1xN5ib+5K4+XJ6ZjARP6CPieVv058tyhwSRVWQ1uz04c1QC NlYIc/RDky3V95h903ys2/GXrL4lmC3ISAj1MGBZIwkb05gwenxzIx00Umg51EigBTcM B5ekIMAl4/hoWeHsTHpLQv8WgJkUScDkNwSsrdoIlCQZYh3P6aPuYkBE+/+HxzXvx9k7 6y2saAf3mVm2cp0crp4tka7M3j7M5tHkeK5MRB1dLWi9Dd7qDBeUKdgfIIfqZx05RbML WO/Nq4Fb72fVkdEc8W1ZlTGRXVm7wF0dnvoxNNcxZPE0auJUodwGplYbzTE6P+sgoNSd dNbQ== 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=oRK/mxgbRT/P333akUHFL/j+sMpKLiB/JenJxEuDy6A=; b=PwHZ2s9z48zrY0JTmGGPpFg6BzqQOwVEjPiY3+Tmiq8UtQKA4E7GzY7xGPkkTMpIm/ Ht1Ail8g37hEWtVFjUDDNa/UfZ2TQWKufGu8+OYL0Hw1lh6gZvIj6lW8iJtQC/CtV11y 7IXWD2uqfFgQU/RMFic/j5VjMkO1BoI5sDDht9Rm6Isu1IrFoYf9lHHm8MManOalSiUu BgUpjRJCUCmNIJcl8owBcpMECt6ccuOCDMRZyZEUiujjlQ1rn4+UZJOe0i4RdIX+luf7 fLRAKOtdRHzdPJxgdjsnoL1GKR8sVtMTncO8UZOtS3U+BFYodeitALzhlV/uRTDjlCdI E0Lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EXgGN5c9; 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 b12-20020a170906660c00b007919dbd3770si184373ejp.485.2022.10.24.09.47.36; Mon, 24 Oct 2022 09:48:01 -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=EXgGN5c9; 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 S234771AbiJXQqI (ORCPT + 99 others); Mon, 24 Oct 2022 12:46:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234766AbiJXQos (ORCPT ); Mon, 24 Oct 2022 12:44:48 -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 DC31C1413A5; Mon, 24 Oct 2022 08:30:56 -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 9D2FFB8125D; Mon, 24 Oct 2022 12:08:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0330AC433D6; Mon, 24 Oct 2022 12:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613324; bh=4VCSDqSlPZ+rCOtkOPxYpWeaHXHCLuVtW976ejNpcr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EXgGN5c9Iqyf74GPNxIKVmAuBOjsl9AUuZuoGqrGCtmBDKkfe/Sj1tZr+FBSeJIiP Bg7YxK3NlVNBXFEBkjbUvbVPc1oNI7K4O7yFth2j6ypIid3NBpZHic2E9ebeunVr+M I8/kIFIsmDtL9ADXqHwRb5NFX6wKh96B5xXI9bF0= 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.4 064/255] wifi: mac80211: allow bw change during channel switch in mesh Date: Mon, 24 Oct 2022 13:29:34 +0200 Message-Id: <20221024113004.669115686@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@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=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?1747588304157797046?= X-GMAIL-MSGID: =?utf-8?q?1747588304157797046?= 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 16f37fd0ac0e..9e3bff5aaf8b 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3280,9 +3280,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)