From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id F222C1B4AA for ; Thu, 29 Nov 2018 14:23:08 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F1333084217; Thu, 29 Nov 2018 13:23:08 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0D731019626; Thu, 29 Nov 2018 13:23:06 +0000 (UTC) From: Kevin Traynor To: Xiaolong Ye Cc: Qi Zhang , dpdk stable Date: Thu, 29 Nov 2018 13:20:42 +0000 Message-Id: <20181129132128.7609-42-ktraynor@redhat.com> In-Reply-To: <20181129132128.7609-1-ktraynor@redhat.com> References: <20181129132128.7609-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 29 Nov 2018 13:23:08 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ixgbe: fix maximum wait time in comment' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Thu, 29 Nov 2018 13:23:09 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 12/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 49cdfbf63089661a2fbbcfe4d581aeb324d84518 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Thu, 15 Nov 2018 15:20:05 +0800 Subject: [PATCH] net/ixgbe: fix maximum wait time in comment [ upstream commit 73247f1ced303c16987bb366d38a2d8a0fc40db4 ] As the code has changed the max wait time to 1000ms, the comment should be changed accordingly. Fixes: 64f1c8539c8c ("net/ixgbe: wait longer for link after fiber MAC setup") Signed-off-by: Xiaolong Ye Acked-by: Qi Zhang --- drivers/net/ixgbe/base/ixgbe_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c index 2fb0a072c..bfdcb2ac2 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -5294,5 +5294,5 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, /* Wait for the controller to acquire link. Per IEEE 802.3ap, - * Section 73.10.2, we may have to wait up to 500ms if KR is + * Section 73.10.2, we may have to wait up to 1000ms if KR is * attempted. 82599 uses the same timing for 10g SFI. */ -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 13:11:36.111991504 +0000 +++ 0041-net-ixgbe-fix-maximum-wait-time-in-comment.patch 2018-11-29 13:11:34.000000000 +0000 @@ -1,13 +1,14 @@ -From 73247f1ced303c16987bb366d38a2d8a0fc40db4 Mon Sep 17 00:00:00 2001 +From 49cdfbf63089661a2fbbcfe4d581aeb324d84518 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Thu, 15 Nov 2018 15:20:05 +0800 Subject: [PATCH] net/ixgbe: fix maximum wait time in comment +[ upstream commit 73247f1ced303c16987bb366d38a2d8a0fc40db4 ] + As the code has changed the max wait time to 1000ms, the comment should be changed accordingly. Fixes: 64f1c8539c8c ("net/ixgbe: wait longer for link after fiber MAC setup") -Cc: stable@dpdk.org Signed-off-by: Xiaolong Ye Acked-by: Qi Zhang @@ -16,10 +17,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c -index 21f973e5e..fb50719fb 100644 +index 2fb0a072c..bfdcb2ac2 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c -@@ -5260,5 +5260,5 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, +@@ -5294,5 +5294,5 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, /* Wait for the controller to acquire link. Per IEEE 802.3ap, - * Section 73.10.2, we may have to wait up to 500ms if KR is