From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 2BDE91B518 for ; Fri, 30 Nov 2018 00:15:51 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:21:43 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW8t032075; Fri, 30 Nov 2018 01:15:48 +0200 From: Yongseok Koh To: Xiaolong Ye Cc: Qi Zhang , dpdk stable Date: Thu, 29 Nov 2018 15:11:49 -0800 Message-Id: <20181129231202.30436-115-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net/ixgbe: fix maximum wait time in comment' has been queued to LTS release 17.11.5 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 23:15:51 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 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/01/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. Yongseok --- >>From 17e1987fc95d5e700af60555a09e009d1b2ca1bc 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 4fd954116..4076dd562 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -5147,7 +5147,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, ixgbe_flap_tx_laser(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. */ for (i = 0; i < 10; i++) { -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:50.236625451 -0800 +++ 0115-net-ixgbe-fix-maximum-wait-time-in-comment.patch 2018-11-29 15:01:45.307957000 -0800 @@ -1,13 +1,14 @@ -From 73247f1ced303c16987bb366d38a2d8a0fc40db4 Mon Sep 17 00:00:00 2001 +From 17e1987fc95d5e700af60555a09e009d1b2ca1bc 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 4fd954116..4076dd562 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c -@@ -5259,7 +5259,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, +@@ -5147,7 +5147,7 @@ s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw, ixgbe_flap_tx_laser(hw); /* Wait for the controller to acquire link. Per IEEE 802.3ap,