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 4B4C6A0A02 for ; Mon, 17 May 2021 18:17:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3F7FE40041; Mon, 17 May 2021 18:17:57 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id BBF2040041 for ; Mon, 17 May 2021 18:17:55 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifwJ-00007W-Ho; Mon, 17 May 2021 16:17:55 +0000 From: Christian Ehrhardt To: Robin Zhang Cc: Qi Zhang , dpdk stable Date: Mon, 17 May 2021 18:10:15 +0200 Message-Id: <20210517161039.3132619-186-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/i40e: fix primary MAC type when starting port' has been queued to stable release 19.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/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/377f44b7d9f83085612f979f9d7051e8bafbc7ca Thanks. Christian Ehrhardt --- >From 377f44b7d9f83085612f979f9d7051e8bafbc7ca Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Wed, 28 Apr 2021 08:04:52 +0000 Subject: [PATCH] net/i40e: fix primary MAC type when starting port [ upstream commit 2e468c03b0a4095988ec788a62669abf8e6f4908 ] When start port, all MAC addresses will be set. We should set the MAC type of default MAC address as VIRTCHNL_ETHER_ADDR_PRIMARY. Fixes: 3f604ddf33cf ("net/i40e: fix lack of MAC type when set MAC address") Signed-off-by: Robin Zhang Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev_vf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 49b5ead859..7902a27b32 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -2055,7 +2055,9 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add) continue; rte_memcpy(list->list[j].addr, addr->addr_bytes, sizeof(addr->addr_bytes)); - list->list[j].type = VIRTCHNL_ETHER_ADDR_EXTRA; + list->list[j].type = (j == 0 ? + VIRTCHNL_ETHER_ADDR_PRIMARY : + VIRTCHNL_ETHER_ADDR_EXTRA); PMD_DRV_LOG(DEBUG, "add/rm mac:%x:%x:%x:%x:%x:%x", addr->addr_bytes[0], addr->addr_bytes[1], addr->addr_bytes[2], addr->addr_bytes[3], -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.671073351 +0200 +++ 0186-net-i40e-fix-primary-MAC-type-when-starting-port.patch 2021-05-17 17:40:29.535812344 +0200 @@ -1 +1 @@ -From 2e468c03b0a4095988ec788a62669abf8e6f4908 Mon Sep 17 00:00:00 2001 +From 377f44b7d9f83085612f979f9d7051e8bafbc7ca Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2e468c03b0a4095988ec788a62669abf8e6f4908 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 156ad9ab96..ad80aa1e29 100644 +index 49b5ead859..7902a27b32 100644 @@ -22 +23 @@ -@@ -2128,7 +2128,9 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add) +@@ -2055,7 +2055,9 @@ i40evf_add_del_all_mac_addr(struct rte_eth_dev *dev, bool add)