From patchwork Mon Oct 24 11:30:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8715 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp423208wru; Mon, 24 Oct 2022 05:24:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4IHIQgnf78V09cuzecphOB2YDGwVhem8ZOb+KRG8iyRmMOS9igzdhsAOJmj+jZGj+37eL7 X-Received: by 2002:a17:902:900a:b0:178:77c7:aa28 with SMTP id a10-20020a170902900a00b0017877c7aa28mr32730081plp.3.1666614250072; Mon, 24 Oct 2022 05:24:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666614250; cv=none; d=google.com; s=arc-20160816; b=WCcyKquKiuvojA+dxokjOO5BIakiVpiHGhUTBK+DS3SSX8G0416ae/DQWo9hM5OFqx QDxO30Q5Yq4XdgiMQYj7h+ztMTstYTJ0XXx0URV/ZmQO6rBLhGi+ZqlTprBBo3XN4rTh KMXMPGIyIr0lK/XXe6ICGruqz5M3WGV8cdvf8u0Rt1zQ37SPWRGXpDobWBGv8mReqOuL 0k3lQf2xW57eXW/563z95eBAHZ4fy9Q/S/k4Uedw7tQc6E+gB2Jx6PZSeNW1UjbikZts jIjTe/a3IoJ8Vwsed0ORGarBRXvURrEVgV0c8LA/3Gh/dhC1h6tWN4qcuA+yGpNsrspl MBag== 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=BmjIE5B3zfGI2+D8S32mnLQmCYzGBjIIoY51wfkFBaA=; b=ufVkyLYERxaJdamYewGJ/9gAUYov+sC0JDr6dGVN/tWoliAvLGtyWVAfxS2h6sBVel glz96J0xvOK17PlkbHrIaUcV8493k+I4mzlobqJbLCFSLh5MGLEG1zdOb17t+VXQe1lL 4LVYJTqFgydZBI6dbn4s2lrjZ6YGX+WQBFSu/0rKMTACTCEubNFSASdU2N/jfB1FeNsX wueAvIyf1FSydB7b+vNLJ8B9j0Vx0XKhHEAAg2ZchSzPyHgsCgQI2KkkLk2zygTVM04X c36AQpiCSLeXv6fIEqqa/kvQe1nyYsvf7YgpV8uyvkJEzYgTuGnoLba3LE4jjLBgCVKp mkYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=eJdFmILx; 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 q14-20020a17090311ce00b001789fa8f90esi40284293plh.408.2022.10.24.05.23.54; Mon, 24 Oct 2022 05:24: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=eJdFmILx; 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 S233313AbiJXMWi (ORCPT + 99 others); Mon, 24 Oct 2022 08:22:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233136AbiJXMUE (ORCPT ); Mon, 24 Oct 2022 08:20:04 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44FBE8321F; Mon, 24 Oct 2022 04:58:47 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 020C36125A; Mon, 24 Oct 2022 11:48:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 14123C433D7; Mon, 24 Oct 2022 11:48:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612133; bh=eLN93t/jveBM8FxvP6yV878dqRgau5Ybg1+Lv+R+Zrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eJdFmILxeNuzmYXZZ+Ch4+giV+slpHXjMjzukX2taiWEIEyEIGfIwpI+YfoV1+aLp SNEXc+1fKYEfCGrHC64V0kgXlrThyfZymUGbgPDbinWgUR1lFTO5rz6qpP+QmXWljx zLSwSlJAEzm5o954qdgdByG4t2qBV4OmupfPm1kI= 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.14 083/210] wifi: mac80211: allow bw change during channel switch in mesh Date: Mon, 24 Oct 2022 13:30:00 +0200 Message-Id: <20221024112959.750786437@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747571704194540568?= X-GMAIL-MSGID: =?utf-8?q?1747571704194540568?= 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 f769b08e6f2a..94293b57f1b2 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3111,9 +3111,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)