From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id AE73629D9 for ; Tue, 16 May 2017 12:28:51 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 May 2017 03:28:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,349,1491289200"; d="scan'208";a="87358029" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga002.jf.intel.com with ESMTP; 16 May 2017 03:28:49 -0700 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 16 May 2017 03:28:49 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx115.amr.corp.intel.com (10.18.116.19) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 16 May 2017 03:28:49 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.193]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.224]) with mapi id 14.03.0319.002; Tue, 16 May 2017 18:28:46 +0800 From: "Xing, Beilei" To: Yuanhan Liu CC: "stable@dpdk.org" Thread-Topic: [dpdk-stable] [PATCH] net/i40e: fix compile error Thread-Index: AQHSzi4ir+YhvX8/qEyX2hnTXfUZ/6H2wW7A Date: Tue, 16 May 2017 10:28:45 +0000 Message-ID: <94479800C636CB44BD422CB454846E0131FAEAC5@SHSMSX101.ccr.corp.intel.com> References: <1494916332-44423-1-git-send-email-beilei.xing@intel.com> <20170516101623.GG3102@yliu-dev.sh.intel.com> In-Reply-To: <20170516101623.GG3102@yliu-dev.sh.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-stable] [PATCH] net/i40e: fix compile error 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: Tue, 16 May 2017 10:28:52 -0000 > -----Original Message----- > From: Yuanhan Liu [mailto:yuanhan.liu@linux.intel.com] > Sent: Tuesday, May 16, 2017 6:16 PM > To: Xing, Beilei > Cc: stable@dpdk.org > Subject: Re: [dpdk-stable] [PATCH] net/i40e: fix compile error >=20 > On Tue, May 16, 2017 at 02:32:12PM +0800, Beilei Xing wrote: > > [ backported from upstream commit > > c00f307f850a888f887688e88cb13be7e6964bd7 ] >=20 > Hmm, not quite sure why you have changed the title. The title was > "net/i40e: fix setup when bulk is disabled". Thanks for the correction, I used the wrong title... >=20 > Applied to dpdk-stable, with the title changed back. >=20 > Thanks. >=20 > --yliu > > > > Testpmd failed to start when > > CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > > is disabled, the root cause is the length of sw_ring and queue are > > incorrect with the above configuration. > > > > Fixes: 0be295312966 ("net/i40e: fix compile error") > > > > Signed-off-by: Beilei Xing > > --- > > drivers/net/i40e/i40e_rxtx.c | 4 ---- > > 1 file changed, 4 deletions(-) > > > > diff --git a/drivers/net/i40e/i40e_rxtx.c > > b/drivers/net/i40e/i40e_rxtx.c index 1a007d6..602e40c 100644 > > --- a/drivers/net/i40e/i40e_rxtx.c > > +++ b/drivers/net/i40e/i40e_rxtx.c > > @@ -1728,11 +1728,7 @@ i40e_dev_rx_queue_setup(struct rte_eth_dev > *dev, > > rxq->rx_ring_phys_addr =3D rte_mem_phy2mch(rz->memseg_id, rz- > >phys_addr); > > rxq->rx_ring =3D (union i40e_rx_desc *)rz->addr; > > > > -#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC > > len =3D (uint16_t)(nb_desc + RTE_PMD_I40E_RX_MAX_BURST); -#else > > - len =3D nb_desc; > > -#endif > > > > /* Allocate the software ring. */ > > rxq->sw_ring =3D > > -- > > 2.5.5