From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A108A0518 for ; Fri, 24 Jul 2020 14:11:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EE7891C20A; Fri, 24 Jul 2020 14:11:08 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 6837F1C243 for ; Fri, 24 Jul 2020 14:11:07 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id f18so8070082wml.3 for ; Fri, 24 Jul 2020 05:11:07 -0700 (PDT) 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=v8PPP175KdDuEm1dEoHQXiEF1Y3oALoLKtmLgt1+KYo=; b=Xee1mXpO3vfOaUd31UKLa+wLYG0OEB20UjFjUJFw/4L5Y3wi8X1wkQKrUBwze79A/v hy6dP+DVnSYtU1tjq9leREgsE8vakaCJH/lCSkNuygbYMzh+A5Ho++NizTVkPOM+QLMI VR4JOKUltdqtfE1Ln89ho9iDnRGlskmbaEqHgnaHDH6rM8BmyTXZAvc9gp8ifySeYeC9 nihNd1bxkihUXmskMpbWDQa9Z5P0T2bKvCPIC75G7axrxqX8DpVdoQqFllehR3bgEkSB r7EKhMh6l8l/1xFvzkdY24m+hJEuD90bom0L73RWli42qYMwMiG4abLz/LhijmbT+3yW BIdg== 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=v8PPP175KdDuEm1dEoHQXiEF1Y3oALoLKtmLgt1+KYo=; b=EyFlMc91m1Y4ktqt1HIOnOwZigpHJWag7yNJpV5m1mSaT41CmuAvcjtvtLKOzChW8W DEeZpgphQ7wTl7IAmY9WgVoqvi0vtmuIXjM1zYxN22pkVuT60X0uh6n5BZjueQ7n5RqD WLNQD9u53Mbx9DQg5S44CSCnT4E0BtkLmmjh4kdqHLIIDu4PIKpArtWSuFNfIqrvs51b v8dk9avwIEetf7GlwlZHCbMy/G2eXtMiVA68hHXT7aYbKtdkbj+Iktn7dNf4YiOYALSy ERjg1qvdUeZAk8jfPJ1/EIdZWt8OvBtygyoVkIURbm6aGItKXpPum5STgpbHIbmd57fS xw/w== X-Gm-Message-State: AOAM531Z05764fMf1hneMO/uUBDjLZ8Gupllu2/DZLyzRiUwEr1w648j BlfGYX4kWEMqao6TEBVTzE/ad9pMpDT/6g== X-Google-Smtp-Source: ABdhPJwlnNjYmVJuaBJJAolWDey4yRFuB09H95HRCIGCELR4PFiaL47g3iMq1pFqo6yhQPDH++hANA== X-Received: by 2002:a1c:a756:: with SMTP id q83mr8260034wme.168.1595592667130; Fri, 24 Jul 2020 05:11:07 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e23sm6792207wme.35.2020.07.24.05.11.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:11:06 -0700 (PDT) From: luca.boccassi@gmail.com To: Guinan Sun Cc: Wei Zhao , Qi Zhang , dpdk stable Date: Fri, 24 Jul 2020 13:00:03 +0100 Message-Id: <20200724120030.1863487-165-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: fix MAC control frame forward' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. 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. Thanks. Luca Boccassi --- >From 9fa2cc447cbf0120b0df99fabd52a7980c1cb9cf Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Sat, 23 May 2020 05:22:38 +0000 Subject: [PATCH] net/ixgbe: fix MAC control frame forward [ upstream commit 7b053b86d889acd7c3a02909774da08d3d90a4b0 ] mac_ctrl_frame_fwd shouldn't be cleared when port stop, otherwise it will be inconsistent with the actual status. This patch fixes the issue. Fixes: a524f550da6e ("net/ixgbe: fix flow control mode setting") Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao Acked-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_ethdev.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 9dcff9935..ecbac8f18 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2936,8 +2936,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) adapter->rss_reta_updated = 0; - adapter->mac_ctrl_frame_fwd = 0; - hw->adapter_stopped = true; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.927855698 +0100 +++ 0165-net-ixgbe-fix-MAC-control-frame-forward.patch 2020-07-24 12:53:48.555011453 +0100 @@ -1,14 +1,15 @@ -From 7b053b86d889acd7c3a02909774da08d3d90a4b0 Mon Sep 17 00:00:00 2001 +From 9fa2cc447cbf0120b0df99fabd52a7980c1cb9cf Mon Sep 17 00:00:00 2001 From: Guinan Sun Date: Sat, 23 May 2020 05:22:38 +0000 Subject: [PATCH] net/ixgbe: fix MAC control frame forward +[ upstream commit 7b053b86d889acd7c3a02909774da08d3d90a4b0 ] + mac_ctrl_frame_fwd shouldn't be cleared when port stop, otherwise it will be inconsistent with the actual status. This patch fixes the issue. Fixes: a524f550da6e ("net/ixgbe: fix flow control mode setting") -Cc: stable@dpdk.org Signed-off-by: Guinan Sun Reviewed-by: Wei Zhao @@ -18,10 +19,10 @@ 1 file changed, 2 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c -index 095f1bde5..74c3c6b5d 100644 +index 9dcff9935..ecbac8f18 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c -@@ -2926,8 +2926,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) +@@ -2936,8 +2936,6 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) adapter->rss_reta_updated = 0;