From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id DA173322C for ; Mon, 19 Nov 2018 13:26:10 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id y139so5108378wmc.5 for ; Mon, 19 Nov 2018 04:26:10 -0800 (PST) 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=6yOABFCryAECtxfE4crB1SOPOuBuU8bUnd1/mky7eYs=; b=fbV/UvmNGy67Tj3nu0YgJL52tNkGgNFPLT9IM0ubDMilu2U9C9OW5GIK5dX1lNBBUm CiMsUNCDj5PRV44MtmpPQRjGz9R5pwKuF4yS/GpI+ekZGLU4NUcbbZ6G/Oy1+ojvOi4a STosKwDSumSm6DCXhJCUzvIPzwTs90vHHYLzNVfNis0s0xB6PbCqkLVWEoBD9mB7A//2 1A3OVBcAU0NVoLIOvGidinAYnjUSlqrJ3PuZAStWPQrlJSfiOmB/Ypl3wmPTcMrK89xk mpWxSEgcuRUEJTitNXCVzC0eJPpHmZb/mc4mHELCOHF4f9n/6Ps7wZ97K7ZMFjFbHcfu MJuA== X-Gm-Message-State: AGRZ1gLGSJDA4Igjf2Zk4JAAK+uNYSHacmQKasFnCqOAoboMaBagp+Y0 AM8WFrbqgKZapcVj0mCGt7I= X-Google-Smtp-Source: AFSGD/V1BOxHNbCs7iGjWLnd9FXFvsQLSkSJL4WME50rRACou5PoIbPmLgj8NPkDIj2qgazEU5D2ZQ== X-Received: by 2002:a1c:85d2:: with SMTP id h201mr6538222wmd.151.1542630370412; Mon, 19 Nov 2018 04:26:10 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id v189-v6sm30209695wmd.40.2018.11.19.04.26.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Nov 2018 04:26:09 -0800 (PST) From: Luca Boccassi To: Xiaolong Ye Cc: Qi Zhang , dpdk stable Date: Mon, 19 Nov 2018 12:25:34 +0000 Message-Id: <20181119122538.14207-17-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119122538.14207-1-bluca@debian.org> References: <20181108180111.25873-1-bluca@debian.org> <20181119122538.14207-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: fix maximum wait time in comment' has been queued to LTS release 16.11.9 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: Mon, 19 Nov 2018 12:26:11 -0000 Hi, FYI, your patch has been queued to LTS release 16.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 11/21/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. Luca Boccassi --- >>From ffb90576976ad97d4bbbec36bda8066e870287fa 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 662bff467..ac4ef8ab5 100644 --- a/drivers/net/ixgbe/base/ixgbe_common.c +++ b/drivers/net/ixgbe/base/ixgbe_common.c @@ -5095,7 +5095,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.19.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-19 12:15:18.465732576 +0000 +++ 0017-net-ixgbe-fix-maximum-wait-time-in-comment.patch 2018-11-19 12:15:18.119611432 +0000 @@ -1,13 +1,14 @@ -From 73247f1ced303c16987bb366d38a2d8a0fc40db4 Mon Sep 17 00:00:00 2001 +From ffb90576976ad97d4bbbec36bda8066e870287fa 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 662bff467..ac4ef8ab5 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, +@@ -5095,7 +5095,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,