Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2933079iog; Mon, 20 Jun 2022 07:46:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tgrRqCiiArLCZ3OlAKDwaSnFXQ5mKkHinVe+gUZgxdNkpg8bzeUm54vwi5H6R9Uttr81bw X-Received: by 2002:a17:902:860c:b0:16a:20a0:f6e4 with SMTP id f12-20020a170902860c00b0016a20a0f6e4mr6815359plo.164.1655736387013; Mon, 20 Jun 2022 07:46:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655736387; cv=none; d=google.com; s=arc-20160816; b=c3zkg4ZdBH3ycCyIYnMVNQvKrFcC6V4bMEU8GcE2ZoZFiVKsanm0odjWczjZSfI92f 9VzO2isM2oprmavYwcVHlK6tyJdYfpRIWpyBOGAMAWneQAVgfjb0V9qyv2QlrEY8kUSF Der6vkT3Hw7fcX8/dGgs4VrXyTcp0DoIBYPQMcNMXAq8fJtDhK8bloWqBLxgSvD/HK7z LWInxuBvf+NkrZy9OnjD37STVb0S7xPcCphROjHl2fo9HKo25cO8XJM1tX82OTkGk40r NwInuqAA4GCBtITgBq7dF+YdC6mzvfv1snJ7XV8P2fX5iJm23uaeZ1/NgAskAqh/Rhre dPlw== 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=lRrVI5jMh7nByJc/cxS8Q1TDYQR6I4m+jEWHnUJxSvE=; b=A+V1bcQJwrjZBu8GwSSaE+CGjT/q18JOubw0IyQfAEZgp+dnEdC5ToF0nB4HfAKcfM yojsAZjERGSKu38rfFCLle1OfSvcWeFdXh64JY6ykT5B1CUfwXhWld1k+/Eq7/r++bbz 0fHa49+D2XL8zMIfolV7UDRS/4I+MD/KNiAfJMlQDa9sCBdgj6Rre7qP2lzIkAwibVvX z5SzlZLj56Y6beCHK7+bNqb3YU41EC9HLSm9sgUIQNF0yNt1V7thhH5Zf3ojLZygt/9X 9V7VzJIxxcKlyR+BkX8ciXxFSz+iRIAg2rZMO0ZcQRi21RrqqFq/CGMI2k99KQP9cl6o 29oA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Jh6NZHPT; 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 c6-20020a63d146000000b0040512c16dfasi16141854pgj.235.2022.06.20.07.46.15; Mon, 20 Jun 2022 07:46:27 -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=Jh6NZHPT; 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 S243173AbiFTNAL (ORCPT + 99 others); Mon, 20 Jun 2022 09:00:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244088AbiFTM7O (ORCPT ); Mon, 20 Jun 2022 08:59:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96AD618B0C; Mon, 20 Jun 2022 05:56:17 -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 3C306B811A0; Mon, 20 Jun 2022 12:56:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A974C3411B; Mon, 20 Jun 2022 12:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655729776; bh=zU0vCiW5Glqa+FnlR3SUqx1nsQyiU2Ml+h1jd4dFlno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jh6NZHPTPEdazlpyburRUZwW7wT2AmSlYImUiJ2aoA9nOxWuOzgMd3NBXaHVIlx+i vxG9EMbkPImlQOhuCUf5jDrB/TTVUqzcfPQxlWaVOlPZd6s8Peu6Nq3jOJx3ff90/x ox8EkDYWleScVQGvtaIU4YwrY/u6BjzjXjlETUiE= 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.18 069/141] net: hns3: set port base vlan tbl_sta to false before removing old vlan Date: Mon, 20 Jun 2022 14:50:07 +0200 Message-Id: <20220620124731.578483792@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220620124729.509745706@linuxfoundation.org> References: <20220620124729.509745706@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 8cebb180c812..5d1615e27a1c 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -10136,6 +10136,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