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 78501A2EEB for ; Tue, 10 Sep 2019 11:17:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 689511EF53; Tue, 10 Sep 2019 11:17:24 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A0F001EF31; Tue, 10 Sep 2019 11:17:21 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D4F183066FA7; Tue, 10 Sep 2019 09:17:20 +0000 (UTC) Received: from [10.36.118.30] (unknown [10.36.118.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9F256012C; Tue, 10 Sep 2019 09:17:19 +0000 (UTC) To: Xiao Zhang , dev@dpdk.org Cc: wenzhuo.lu@intel.com, stable@dpdk.org References: <1568137255-10014-1-git-send-email-xiao.zhang@intel.com> From: Kevin Traynor Message-ID: <0200a7e0-559d-ea01-cc1b-a6df08918ec8@redhat.com> Date: Tue, 10 Sep 2019 10:17:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <1568137255-10014-1-git-send-email-xiao.zhang@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 10 Sep 2019 09:17:20 +0000 (UTC) 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 10/09/2019 18:40, 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 Reported-by: Kevin Traynor Acked-by: Kevin Traynor > --- > 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) >