[PATCH 8/8] vmxnet3: Fix merge error in initialization for rxDataRing feature

[Andrew Rybchenko]

On 5/3/22 07:22, Pankaj Gupta wrote:
> Fix merge error in initialization for rxDataRing feature.

Is it a bug fix? If so, it requires corresponding "Fixes:" tag and Cc to
stable at dpdk.org in order to be backported to stable releases.

> 
> Tested, using testpmd, for different hardware version on ESXi 7.0 Update 2.
> 
> Signed-off-by: Pankaj Gupta <pagupta at vmware.com>
> ---
>   drivers/net/vmxnet3/vmxnet3_ethdev.c | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
> index 9955f121f6..6ced76ae2a 100644
> --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
> +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
> @@ -876,6 +876,11 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
>   		rqd->conf.rxRingSize[1]   = rxq->cmd_ring[1].size;
>   		rqd->conf.compRingSize    = rxq->comp_ring.size;
>   
> +		if (VMXNET3_VERSION_GE_3(hw)) {
> +			rqd->conf.rxDataRingBasePA = rxq->data_ring.basePA;
> +			rqd->conf.rxDataRingDescSize = rxq->data_desc_size;
> +		}
> +
>   		if (hw->intr.lsc_only)
>   			rqd->conf.intrIdx = 1;
>   		else