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 432DEA2EEB for ; Tue, 10 Sep 2019 10:47:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 27F5F1EE03; Tue, 10 Sep 2019 10:47:22 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id DD9FB1EDE8; Tue, 10 Sep 2019 10:47:17 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Sep 2019 01:47:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,489,1559545200"; d="scan'208";a="178609995" Received: from npg-dpdk-zhangxiao.sh.intel.com ([10.67.110.190]) by orsmga008.jf.intel.com with ESMTP; 10 Sep 2019 01:47:15 -0700 From: Xiao Zhang To: dev@dpdk.org Cc: wenzhuo.lu@intel.com, Xiao Zhang , stable@dpdk.org Date: Wed, 11 Sep 2019 01:40:55 +0800 Message-Id: <1568137255-10014-1-git-send-email-xiao.zhang@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [dpdk-stable] net/e1000: fix wrong mac type checking 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" The mac types of i219 are e1000_pch_spt and e1000_pch_cnp, correct the checking code of mac type when flushing i219 descriptor rings. Fixes: 1fc9701238ed ("net/e1000: fix i219 hang on reset/close") Cc: stable@dpdk.org Signed-off-by: Xiao Zhang --- drivers/net/e1000/em_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index 20b5406..fd44924 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -739,7 +739,7 @@ eth_em_stop(struct rte_eth_dev *dev) e1000_reset_hw(hw); /* Flush desc rings for i219 */ - if (hw->mac.type >= e1000_pch_spt) + if (hw->mac.type == e1000_pch_spt || hw->mac.type == e1000_pch_cnp) em_flush_desc_rings(dev); if (hw->mac.type >= e1000_82544) -- 2.7.4