[dpdk-stable] [PATCH] net/i40e: fix compile error

[dpdk-stable] [PATCH] net/i40e: fix compile error

[Beilei Xing]

[ backported from upstream commit c00f307f850a888f887688e88cb13be7e6964bd7 ]

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 <beilei.xing@intel.com>
---
 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 = rte_mem_phy2mch(rz->memseg_id, rz->phys_addr);
 	rxq->rx_ring = (union i40e_rx_desc *)rz->addr;
 
-#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC
 	len = (uint16_t)(nb_desc + RTE_PMD_I40E_RX_MAX_BURST);
-#else
-	len = nb_desc;
-#endif
 
 	/* Allocate the software ring. */
 	rxq->sw_ring =
-- 
2.5.5

Re: [dpdk-stable] [PATCH] net/i40e: fix compile error

[Yuanhan Liu]

On Tue, May 16, 2017 at 02:32:12PM +0800, Beilei Xing wrote:
> [ backported from upstream commit c00f307f850a888f887688e88cb13be7e6964bd7 ]

Hmm, not quite sure why you have changed the title. The title was
"net/i40e: fix setup when bulk is disabled".

Applied to dpdk-stable, with the title changed back.

Thanks.

	--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 <beilei.xing@intel.com>
> ---
>  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 = rte_mem_phy2mch(rz->memseg_id, rz->phys_addr);
>  	rxq->rx_ring = (union i40e_rx_desc *)rz->addr;
>  
> -#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC
>  	len = (uint16_t)(nb_desc + RTE_PMD_I40E_RX_MAX_BURST);
> -#else
> -	len = nb_desc;
> -#endif
>  
>  	/* Allocate the software ring. */
>  	rxq->sw_ring =
> -- 
> 2.5.5

Re: [dpdk-stable] [PATCH] net/i40e: fix compile error

[Xing, Beilei]

> -----Original Message-----
> From: Yuanhan Liu [mailto:yuanhan.liu@linux.intel.com]
> Sent: Tuesday, May 16, 2017 6:16 PM
> To: Xing, Beilei <beilei.xing@intel.com>
> Cc: stable@dpdk.org
> Subject: Re: [dpdk-stable] [PATCH] net/i40e: fix compile error
> 
> On Tue, May 16, 2017 at 02:32:12PM +0800, Beilei Xing wrote:
> > [ backported from upstream commit
> > c00f307f850a888f887688e88cb13be7e6964bd7 ]
> 
> 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...

> 
> Applied to dpdk-stable, with the title changed back.
> 
> Thanks.
> 
> 	--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 <beilei.xing@intel.com>
> > ---
> >  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 = rte_mem_phy2mch(rz->memseg_id, rz-
> >phys_addr);
> >  	rxq->rx_ring = (union i40e_rx_desc *)rz->addr;
> >
> > -#ifdef RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC
> >  	len = (uint16_t)(nb_desc + RTE_PMD_I40E_RX_MAX_BURST); -#else
> > -	len = nb_desc;
> > -#endif
> >
> >  	/* Allocate the software ring. */
> >  	rxq->sw_ring =
> > --
> > 2.5.5