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 29017A04B1 for ; Fri, 28 Aug 2020 12:13:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1B2901C115; Fri, 28 Aug 2020 12:13:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 3990E1C11F for ; Fri, 28 Aug 2020 12:13:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hmnC+0j2vVp3gSqhm2Jl0FcbXqBdI3fbSVkv2nOhAfc=; b=VOQJehG8lOK/C8cXFWqkqk4oBnz7mS+JL6oZzcWDiHkv4ajtD1QbML4wleh1IOXbTdHHi7 Xt0O20/Vw2/JH4g3JUvYtxG5D2l4G3C/hFbN2/NoYpqGU2qvVbLWuitbq5u5B876Cr68KY +/zC9u3t26QiO76rMO7zltH/+dnv5lk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-56-lot42Dw3MgyPz30wgRSuEA-1; Fri, 28 Aug 2020 06:13:45 -0400 X-MC-Unique: lot42Dw3MgyPz30wgRSuEA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B39831DDE8; Fri, 28 Aug 2020 10:13:44 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F80019D7C; Fri, 28 Aug 2020 10:13:43 +0000 (UTC) From: Kevin Traynor To: Guinan Sun Cc: Wei Zhao , Qi Zhang , dpdk stable Date: Fri, 28 Aug 2020 11:12:34 +0100 Message-Id: <20200828101308.223767-8-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: fix MAC control frame forward' has been queued to LTS release 18.11.10 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 LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/02/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/a603d49d91b478515bcdaf8145bee16dfaa1b0cb Thanks. Kevin. --- >From a603d49d91b478515bcdaf8145bee16dfaa1b0cb 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 01cedb45e8..c1170cedb7 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2967,6 +2967,4 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) adapter->rss_reta_updated = 0; - - adapter->mac_ctrl_frame_fwd = 0; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-28 11:03:26.171015194 +0100 +++ 0008-net-ixgbe-fix-MAC-control-frame-forward.patch 2020-08-28 11:03:25.924955466 +0100 @@ -1 +1 @@ -From 7b053b86d889acd7c3a02909774da08d3d90a4b0 Mon Sep 17 00:00:00 2001 +From a603d49d91b478515bcdaf8145bee16dfaa1b0cb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7b053b86d889acd7c3a02909774da08d3d90a4b0 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 095f1bde57..74c3c6b5db 100644 +index 01cedb45e8..c1170cedb7 100644 @@ -24,2 +25 @@ -@@ -2927,6 +2927,4 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) - adapter->rss_reta_updated = 0; +@@ -2967,6 +2967,4 @@ ixgbe_dev_stop(struct rte_eth_dev *dev) @@ -27 +27 @@ -- adapter->mac_ctrl_frame_fwd = 0; + adapter->rss_reta_updated = 0; @@ -29 +29 @@ - hw->adapter_stopped = true; +- adapter->mac_ctrl_frame_fwd = 0; @@ -30,0 +31 @@ +