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 D4B261B50A for ; Fri, 30 Nov 2018 00:15:30 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:21:20 +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 wATNCW8g032075; Fri, 30 Nov 2018 01:15:25 +0200 From: Yongseok Koh To: Yunjian Wang Cc: Qi Zhang , dpdk stable Date: Thu, 29 Nov 2018 15:11:36 -0800 Message-Id: <20181129231202.30436-102-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/e1000/base: fix uninitialized variable' 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:31 -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 3a4ad0a6836591c211ef4bd541b2ba9a51b1f962 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 6 Nov 2018 15:57:01 +0800 Subject: [PATCH] net/e1000/base: fix uninitialized variable [ upstream commit ba46f5e60f03fdc357e5fcbc370eb2812c3120ff ] This patch fixes the variable 'phy_word' may be used uninitialized. Fixes: 5b6439cf03a4 ("e1000/base: support different EEARBC for i210") Signed-off-by: Yunjian Wang Acked-by: Qi Zhang --- drivers/net/e1000/base/e1000_i210.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/e1000/base/e1000_i210.c b/drivers/net/e1000/base/e1000_i210.c index 277331c42..c2abb43fb 100644 --- a/drivers/net/e1000/base/e1000_i210.c +++ b/drivers/net/e1000/base/e1000_i210.c @@ -941,6 +941,7 @@ STATIC s32 e1000_pll_workaround_i210(struct e1000_hw *hw) if (ret_val != E1000_SUCCESS) nvm_word = E1000_INVM_DEFAULT_AL; tmp_nvm = nvm_word | E1000_INVM_PLL_WO_VAL; + phy_word = E1000_PHY_PLL_UNCONF; for (i = 0; i < E1000_MAX_PLL_TRIES; i++) { /* check current state directly from internal PHY */ e1000_read_phy_reg_gs40g(hw, (E1000_PHY_PLL_FREQ_PAGE | -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:49.669222602 -0800 +++ 0102-net-e1000-base-fix-uninitialized-variable.patch 2018-11-29 15:01:45.267965000 -0800 @@ -1,12 +1,13 @@ -From ba46f5e60f03fdc357e5fcbc370eb2812c3120ff Mon Sep 17 00:00:00 2001 +From 3a4ad0a6836591c211ef4bd541b2ba9a51b1f962 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Tue, 6 Nov 2018 15:57:01 +0800 Subject: [PATCH] net/e1000/base: fix uninitialized variable +[ upstream commit ba46f5e60f03fdc357e5fcbc370eb2812c3120ff ] + This patch fixes the variable 'phy_word' may be used uninitialized. Fixes: 5b6439cf03a4 ("e1000/base: support different EEARBC for i210") -Cc: stable@dpdk.org Signed-off-by: Yunjian Wang Acked-by: Qi Zhang