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 02B98A2EEB for ; Wed, 11 Sep 2019 11:33:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EA0CD1E92B; Wed, 11 Sep 2019 11:33:44 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 45E171E92B; Wed, 11 Sep 2019 11:33:43 +0200 (CEST) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Sep 2019 02:33:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,489,1559545200"; d="scan'208";a="385644148" Received: from yexl-server.sh.intel.com (HELO localhost) ([10.67.117.5]) by fmsmga006.fm.intel.com with ESMTP; 11 Sep 2019 02:33:41 -0700 Date: Wed, 11 Sep 2019 17:31:25 +0800 From: Ye Xiaolong To: Xiao Zhang Cc: dev@dpdk.org, wenzhuo.lu@intel.com, stable@dpdk.org Message-ID: <20190911093125.GC45267@intel.com> References: <1568137255-10014-1-git-send-email-xiao.zhang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1568137255-10014-1-git-send-email-xiao.zhang@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-stable] [dpdk-dev] 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" On 09/11, Xiao Zhang wrote: >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 > Reviewed-by: Xiaolong Ye Applied to dpdk-next-net-intel with Kevin's tags.