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 256BFA0524 for ; Fri, 5 Feb 2021 12:39:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18CE94067B; Fri, 5 Feb 2021 12:39:01 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 573754067B for ; Fri, 5 Feb 2021 12:38:59 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id l12so7362602wry.2 for ; Fri, 05 Feb 2021 03:38:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AfeZZjl0os/Mj3QJOuejr7enLcYQx/FTb74IK5HfCs0=; b=iDDqTrr5dxSRNsHPlfOkRNAiNcpptdhHJoNeBDxq6hoo2KlXrjkrVVTxdxv0+f0F7Y eDkUeW7pg6wGQh8FItV7dMaixvcBgc2X2bQxOELlilCQlGOXx3Omdp7ZErbXz+ORndh5 1RphMFjI/sTG/zIf/rlPkJrZXPYKaBAot5/NTziPx/ukDhHnnPQQIt3xICEOjiajnM51 1gnlBM7N11yJeHbZg+Ny8ptetpRaep3eomkbIz7OdUaJpaAU5/5WYLQIsvW9Q4RHFD2o NvQLIvdq7RWgieYyV/Wws2lC6vN8PtgSRRnDEpkAgVy1oR6qx9VYaPwkvKvHs/iaG8M5 FtjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AfeZZjl0os/Mj3QJOuejr7enLcYQx/FTb74IK5HfCs0=; b=bn9hpIAK8qbJyNbqr4yjdFB2n4Q0uVPsqMSSABG/B+NQVAirxkjVJ1n+M3k854QK5O yFyp/u58Vm1AUGQanuKQ2uEjQ31SX6tlUVgL/xuTLQjk6UDKg/S8jSS6K3o/2mpn9EjP j9MrPqpvd71Z2BJpX6WLNyeCxuJCBFyFswpeuq+Vdy2frkd383wX+7W93MW7AdMdoVmO 6ZdqrYo1zgAODerxSN8c0E0ZLfj1VWJyjHSeEU4eI5ViT2njjqcpkSFX5Zf85bg592vO m0stjEeV9M1jfHlUjGarPlk+n5YCrzL5pEDXu+OjwkmHHeB5Zzzml6hqkyxW201WhBsY ZkEg== X-Gm-Message-State: AOAM5300Aaa4KtVQyMHrnL0J/5+GeODRSt4CUYRCXueRxSOFjUdiVDhR N96YPgTzorLAeJr3b1UcPTE= X-Google-Smtp-Source: ABdhPJxHaXMFcPiRyOeFo/t6ZspFA3tPIP1fOTF9141BJHO4syWF+LA/o6P3L4671L8SQiMz/RgyIA== X-Received: by 2002:a5d:4402:: with SMTP id z2mr4502268wrq.265.1612525139126; Fri, 05 Feb 2021 03:38:59 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i15sm7840877wmq.26.2021.02.05.03.38.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:38:58 -0800 (PST) From: luca.boccassi@gmail.com To: Liron Himi Cc: dpdk stable Date: Fri, 5 Feb 2021 11:19:02 +0000 Message-Id: <20210205111920.1272063-256-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mvpp2: remove VLAN flush' has been queued to stable release 20.11.1 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 20.11.1 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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/581176b3fde1c0eed502ec3a0e3a244e46461457 Thanks. Luca Boccassi --- >From 581176b3fde1c0eed502ec3a0e3a244e46461457 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 bfe496ff74..0c338c0c00 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -671,18 +671,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.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.450313142 +0000 +++ 0256-net-mvpp2-remove-VLAN-flush.patch 2021-02-05 11:18:29.274700022 +0000 @@ -1 +1 @@ -From 8fb1d5eba05899fb2a4c46156546898fffe15917 Mon Sep 17 00:00:00 2001 +From 581176b3fde1c0eed502ec3a0e3a244e46461457 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 bfe496ff74..0c338c0c00 100644