From patchwork Mon Oct 24 11:30:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8435 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp401085wru; Mon, 24 Oct 2022 04:48:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM69KbSGb5VmvR6aqmqFpN2LxbI5NkbspqK7uX8W1qs8BbI8u00AvYVxOPoQZVN9dNsRe8oJ X-Received: by 2002:a05:6402:3890:b0:45c:2b5:b622 with SMTP id fd16-20020a056402389000b0045c02b5b622mr30868632edb.69.1666612086751; Mon, 24 Oct 2022 04:48:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612086; cv=none; d=google.com; s=arc-20160816; b=jhogvRVs2a98VuL0u9FjTEER6hU5tnOpyvZVgx5MOR4GY3gtqMqF14CcCrv9K2j2Cc rJlE8DEnyb8hVFQ60LH/qNCG2F4nsD2v8SQKslpbyDFOannozF/wi47/5MGs5gr82Z/B 2LYjht4huI2htP3DppxEuQiFuFn+3jY9QsAfsEMmoAX53OTwY/oHDUGpSVxvG6Tw6Seb xXe/Y2Wg0/TvyXcJiz8a5AqSkdBbx6gs72M98/J78K86xdYBhKmQSR7Z7KrFfglqfrRY vdUbii7IyC1bE++Ht2bHuVK5mNHvGcBU+s7FVZLe0ou+7UgEJ/FLsUY9Uo4rq7mOH1WJ v7DQ== 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=yIWLGeJDn1IHXrrfoU/H2O8KmkIXukfH6bLBo+7dVKk=; b=d2C/UBMU0zPK/WzLYEiHrExemi+KrvyYISE/G1Jn0LHvdU58LrT/i5r/ztUs3kHCci Z73aNjRn3/AJIVcQkflqfBE+YQkFkjCnQXbGEwdpZo2jFYKiZtzS1t7uuZZptFWHWW7o 3uvkR8iyQYUdyiZ9+1HIJw3ZjzBR7eZz1xer+uQSSk94AHPnM/oa0REuKYH3BPAmxJ01 cCExWQ3l/BxDoi9jg4zM2vqcsqmb6/hVk05jbaR3B8WTQN0kRAptBmRGesLYZD7nst/E ABeEIvQqmvutkaWvPcGOt3vfDmehVw5vaBALtXb/4tjDGMRS46Aq2PE1D0ZL1z0mnqH/ tHPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="eieu9/5X"; 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 i15-20020a05640242cf00b0045a1dbedd92si35987246edc.35.2022.10.24.04.47.43; Mon, 24 Oct 2022 04:48:06 -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="eieu9/5X"; 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 S231529AbiJXLrL (ORCPT + 99 others); Mon, 24 Oct 2022 07:47:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231407AbiJXLpM (ORCPT ); Mon, 24 Oct 2022 07:45:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23B0B6BD51; Mon, 24 Oct 2022 04:42:27 -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 1D44361254; Mon, 24 Oct 2022 11:41:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22FB9C433C1; Mon, 24 Oct 2022 11:41:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611668; bh=z03gnAyu/ZPDMEYEDNx/tGiKO/URw4LGx7hfVzA473Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eieu9/5XTn9nK9IqkJhoq+ZzNVWRyEIGOrsbQ5iQ4fUkX7NknaKP3mATyt2YgNzAh 7Jo/45iAYM6ucaJJ2p+kTU+WhHnTh0LvPLUVsrKVOkXUIWU6ukVDC33yxfKCF/d2t5 iCCoI/ftrw8zZn8PewIQPt+NgIfqjOzhCi3fukkk= 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.9 066/159] wifi: mac80211: allow bw change during channel switch in mesh Date: Mon, 24 Oct 2022 13:30:20 +0200 Message-Id: <20221024112951.872628357@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747569435152273483?= X-GMAIL-MSGID: =?utf-8?q?1747569435152273483?= 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 091ac3a7b186..85beeb32f59f 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -3016,9 +3016,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)