From patchwork Mon Oct 24 11:29:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp622177wru; Mon, 24 Oct 2022 12:44:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7vgS+4x6cdCrIsDHzTr66Wz8fyuDW5HFjTlF5mW677c78Q0aNuBg9ooXmQFOhbm/+0Kebx X-Received: by 2002:a17:907:6d18:b0:78e:259d:c391 with SMTP id sa24-20020a1709076d1800b0078e259dc391mr29229286ejc.615.1666640693908; Mon, 24 Oct 2022 12:44:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666640693; cv=none; d=google.com; s=arc-20160816; b=j8R+WFIV1kTHXx+72Imv4hAqt0yHbXoPQYhDQgCkPTOxhh0sJaONj1e3+r6ErFjJf0 6TVm+hxfRY/0DqDyYehjdlG8WcMQsJnjuOPQP+Oc1PimGQn1O5mCbW6DZLJbpO2o2CM8 K/aEeQdw6LvcK5MJTmxDQXv0gKqVCwMduhybpszzNo+uNg7E3HV03SsnzPF5RCN/fm81 FJHQhvxta5lJZjTbClvRTuKAYh6QhPaWVc4haJOoOXKbZiWzRD2TrV4hUFDwrM110HWr AJM1Y9uBhDaxB8wev7IQkVE3ysLW+6LTswM+joG95p9Kx2jBB2Q9LS1/x+X14doQDAk5 UCDA== 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=Bl9h3Ayx0vlpoZHSWMlJwxNPMPnDfrrsj+W1i5MNqYE=; b=uohFu3I+gUqu8yZAHJVQAv7zkjsPk7H6+gJDjH8G7YuQUrO1/ZB/J6bjHsfR/FDPNN LQsvK0GzFEEqPidXcz2TmUrVjNn3/KykAkWgal3o5Y/Z8ijVrKaFtO2qILWfZneUnfql awMFCHuCelL9C8bBXJ2/CjN9xai8PwZ3kYYXbkgDne6+cNytx3hq7zO730GrL8b3+xPN i1eKhUdB1ha8HqjSjeRZ321Z+ht/CbhS/xdcwALAZ9K74ZxH0GhjTWgwSlwIC/UYruI6 508S3/0/V1YTevgDemMQgizvDLVbH8FkU4tjLfdmX3ZNwMkjpIrTneH3fAMz7XQ74zeQ xC1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CiHEjh55; 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 dm21-20020a05640222d500b00461c9edc3a5si575203edb.77.2022.10.24.12.44.25; Mon, 24 Oct 2022 12:44:53 -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=CiHEjh55; 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 S232855AbiJXTho (ORCPT + 99 others); Mon, 24 Oct 2022 15:37:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229571AbiJXThU (ORCPT ); Mon, 24 Oct 2022 15:37:20 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B07231A1B2B; Mon, 24 Oct 2022 11:07:45 -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 807F3B811F0; Mon, 24 Oct 2022 11:57:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D81E0C433D6; Mon, 24 Oct 2022 11:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612664; bh=505urnuajDADdjKpJXCrkWDj0DTk+ko2H4lq40J9GpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CiHEjh55BtlAJAXf9bQgxStEx5HhAOhgoKlDt5mmZi7mtMRjXb097gy7tEGGNpZKl DPs7pkezovEUa6lgqZASNSQkOTwZuJd1+WRjj5uN5kmMaqCeAZU/KJGEWEQAdpJc5w IVqbFFZfEfnVdNqcBY3gsYhUgtdY2vd5tXmhgiVE= 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 4.19 072/229] wifi: mac80211: allow bw change during channel switch in mesh Date: Mon, 24 Oct 2022 13:29:51 +0200 Message-Id: <20221024113001.410601924@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747599432475654791?= X-GMAIL-MSGID: =?utf-8?q?1747599432475654791?= 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 9348caf1c611..5659af1bec17 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3136,9 +3136,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)