From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4942AA0524 for ; Thu, 4 Feb 2021 12:38:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 38381240799; Thu, 4 Feb 2021 12:38:00 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id B751124076C for ; Thu, 4 Feb 2021 12:37:57 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cxR-0005hd-JM; Thu, 04 Feb 2021 11:37:57 +0000 From: Christian Ehrhardt To: Liron Himi Cc: dpdk stable Date: Thu, 4 Feb 2021 12:29:29 +0100 Message-Id: <20210204112954.2488123-114-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mvpp2: remove VLAN flush' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/39733ffb65cc20ab5989ba07979523d2dd0bfebd Thanks. Christian Ehrhardt --- >From 39733ffb65cc20ab5989ba07979523d2dd0bfebd Mon Sep 17 00:00:00 2001 From: Liron Himi Date: Wed, 27 Jan 2021 18:09:17 +0200 Subject: [PATCH] net/mvpp2: remove VLAN flush [ upstream commit 8fb1d5eba05899fb2a4c46156546898fffe15917 ] VLAN-flush in MUSDK is not supported yet. Until it does, the code should be removed as currently an redundant error message is displayed. Fixes: a8f3d6783a3c ("net/mrvl: support VLAN filtering") Signed-off-by: Liron Himi --- drivers/net/mvpp2/mrvl_ethdev.c | 12 ------------ drivers/net/mvpp2/mrvl_ethdev.h | 1 - 2 files changed, 13 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index 5621ff8c60..974a0fd142 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -673,18 +673,6 @@ mrvl_dev_start(struct rte_eth_dev *dev) priv->uc_mc_flushed = 1; } - if (!priv->vlan_flushed) { - ret = pp2_ppio_flush_vlan(priv->ppio); - if (ret) { - MRVL_LOG(ERR, "Failed to flush vlan list"); - /* - * TODO - * once pp2_ppio_flush_vlan() is supported jump to out - * goto out; - */ - } - priv->vlan_flushed = 1; - } ret = mrvl_mtu_set(dev, dev->data->mtu); if (ret) MRVL_LOG(ERR, "Failed to set MTU to %d", dev->data->mtu); diff --git a/drivers/net/mvpp2/mrvl_ethdev.h b/drivers/net/mvpp2/mrvl_ethdev.h index db6632f5b6..eee5182ce8 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.h +++ b/drivers/net/mvpp2/mrvl_ethdev.h @@ -186,7 +186,6 @@ struct mrvl_priv { uint8_t bpool_bit; uint8_t rss_hf_tcp; uint8_t uc_mc_flushed; - uint8_t vlan_flushed; uint8_t isolated; uint8_t multiseg; -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:32.691798387 +0100 +++ 0114-net-mvpp2-remove-VLAN-flush.patch 2021-02-04 12:04:28.146789841 +0100 @@ -1 +1 @@ -From 8fb1d5eba05899fb2a4c46156546898fffe15917 Mon Sep 17 00:00:00 2001 +From 39733ffb65cc20ab5989ba07979523d2dd0bfebd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8fb1d5eba05899fb2a4c46156546898fffe15917 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index a564752a57..e95c6e5992 100644 +index 5621ff8c60..974a0fd142 100644 @@ -23 +24 @@ -@@ -671,18 +671,6 @@ mrvl_dev_start(struct rte_eth_dev *dev) +@@ -673,18 +673,6 @@ mrvl_dev_start(struct rte_eth_dev *dev)