Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2934143iog; Mon, 20 Jun 2022 07:47:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vWX9yow72DyPfOkinucHIBABr2yFN2bKuqd7bqvopRtwzMY8q3/Uqrd+phLPw8oZ49SeEw X-Received: by 2002:a05:6a00:24c1:b0:518:c52f:f5 with SMTP id d1-20020a056a0024c100b00518c52f00f5mr25261810pfv.15.1655736466933; Mon, 20 Jun 2022 07:47:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655736466; cv=none; d=google.com; s=arc-20160816; b=t0h9mZK2kkCTauI93+UMwkDKL8SUZfh3d+Lw+JRMNT4pvm/S0FGFdSbX9R92b3Y/n9 DsjrWWmxva21+v8Ha+W24mIFYz6IQ8ywvnUNceK61RF6UmaqlBVNUaIpvyRyk0DSAEoa V5RHl+9lbujjEgRLxPULHz2uNzT9lbNwQ5L1WD5iyipW2YmW0YHWhzn6cawEFPitgpbu 6p3gj9U4xvshLSPWKVfltWeiVhpeaYaaCZg2t8FyupqUblUmwWDS1J5rjPziDyDmhtaP fsSdPW3AUju7Vdte/x6Ic7bmy0t0leJZQow/OR6Ej/3mWKWzfK9hC+NmarjiAGZEfVW5 MPfQ== 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=W4onWhx3YNfNSGlCcrSp4KhmRZv+RpxRU1EJktvZlxE=; b=0HHA6RHJLNLpWaptauGIXXfFoJqXSYBsyaC87bAdSEvSdu7WX7GWer2l5iza7vrSTo kCr+dcL94pMcFZMXRUDJ2osWISZeUGD49OcdUANp0SExPbPP95pWZBdt/9RVzgQNQj4B ZsnCNUtLIUyVQnr2ymUEKanPiWs0JgGyiVPiHY+I2oHTQc99jqt00+Gu+bGtBCY6OELP Wd91ut0wUHLGtz+xwqSCxKTEixRmvmm2wfu04w891lpstA2p77ZYlCTNW5ChA5h55O/K lMky9f0fTi086SOg5kTBgJpd1iDNd8R2u/4N03CQ+RuztLewylXPExR1U2WVYETMZx4A OLVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lVwGh1DD; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z22-20020a1709028f9600b00161e9f72b11si7238575plo.540.2022.06.20.07.47.32; Mon, 20 Jun 2022 07:47:46 -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=lVwGh1DD; 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 S244794AbiFTOUY (ORCPT + 99 others); Mon, 20 Jun 2022 10:20:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351115AbiFTOSc (ORCPT ); Mon, 20 Jun 2022 10:18:32 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2490938D93; Mon, 20 Jun 2022 06:33:08 -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 sin.source.kernel.org (Postfix) with ESMTPS id 427B4CE1394; Mon, 20 Jun 2022 13:07:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E093C3411B; Mon, 20 Jun 2022 13:07:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655730465; bh=P9YpZFue1tW+UBDOFxFwfnTgZzInENd113+wr2whioA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lVwGh1DDG7rLM4weRD4EMLBGTmJtjBHSSDliPbpXu5c9bbGYoZwRAWBfFT3yZtZ2p C/7VsOmnoIQvxMOWcP5XiKKlwIBpsgXJ/sk7l/o/IuarGyaI7fDCmleAmbpXQRsuet ybE/t/qsBQus6TBGVD8/49eVQWfMIm9kDG3kigfE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Guangbin Huang , "David S. Miller" , Sasha Levin Subject: [PATCH 5.15 061/106] net: hns3: set port base vlan tbl_sta to false before removing old vlan Date: Mon, 20 Jun 2022 14:51:20 +0200 Message-Id: <20220620124726.205777811@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220620124724.380838401@linuxfoundation.org> References: <20220620124724.380838401@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 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,T_SCC_BODY_TEXT_LINE 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 From: Guangbin Huang [ Upstream commit 9eda7d8bcbdb6909f202edeedff51948f1cad1e5 ] When modify port base vlan, the port base vlan tbl_sta needs to set to false before removing old vlan, to indicate this operation is not finish. Fixes: c0f46de30c96 ("net: hns3: fix port base vlan add fail when concurrent with reset") Signed-off-by: Guangbin Huang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index cdd1d2ebdde2..15098570047b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -10411,6 +10411,7 @@ static int hclge_modify_port_base_vlan_tag(struct hclge_vport *vport, if (ret) return ret; + vport->port_base_vlan_cfg.tbl_sta = false; /* remove old VLAN tag */ if (old_info->vlan_tag == 0) ret = hclge_set_vf_vlan_common(hdev, vport->vport_id, -- 2.35.1