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 D25D0A0A02 for ; Mon, 17 May 2021 18:17:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD08241102; Mon, 17 May 2021 18:17:45 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 39D1740041 for ; Mon, 17 May 2021 18:17:45 +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 1lifw9-00006T-1w; Mon, 17 May 2021 16:17:45 +0000 From: Christian Ehrhardt To: Robin Zhang Cc: Qi Zhang , dpdk stable Date: Mon, 17 May 2021 18:10:14 +0200 Message-Id: <20210517161039.3132619-185-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/iavf: 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/1170edacb349296e312fc0b149c35f4d4a9ecf31 Thanks. Christian Ehrhardt --- >From 1170edacb349296e312fc0b149c35f4d4a9ecf31 Mon Sep 17 00:00:00 2001 From: Robin Zhang Date: Wed, 28 Apr 2021 08:04:51 +0000 Subject: [PATCH] net/iavf: fix primary MAC type when starting port [ upstream commit 8f156d2b1af2cb096dba0df37e1c2a187be9292f ] 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: b335e7203475 ("net/iavf: fix lack of MAC type when set MAC address") Signed-off-by: Robin Zhang Acked-by: Qi Zhang --- drivers/net/iavf/iavf_vchnl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index d855582358..c9c5d18b4a 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -714,7 +714,9 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, 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.631791748 +0200 +++ 0185-net-iavf-fix-primary-MAC-type-when-starting-port.patch 2021-05-17 17:40:29.535812344 +0200 @@ -1 +1 @@ -From 8f156d2b1af2cb096dba0df37e1c2a187be9292f Mon Sep 17 00:00:00 2001 +From 1170edacb349296e312fc0b149c35f4d4a9ecf31 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8f156d2b1af2cb096dba0df37e1c2a187be9292f ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0026120cf4..5d57e8b541 100644 +index d855582358..c9c5d18b4a 100644 @@ -22 +23 @@ -@@ -1172,7 +1172,9 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add) +@@ -714,7 +714,9 @@ iavf_add_del_all_mac_addr(struct iavf_adapter *adapter, bool add)