RE: [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init

[Madalin Bucur (OSS)]

> -----Original Message-----
> From: Anders Roxell <anders.roxell@xxxxxxxxxx>
> Sent: 03 December 2020 16:44
> To: Madalin Bucur <madalin.bucur@xxxxxxx>; davem@xxxxxxxxxxxxx;
> kuba@xxxxxxxxxx; ast@xxxxxxxxxx; daniel@xxxxxxxxxxxxx; hawk@xxxxxxxxxx;
> john.fastabend@xxxxxxxxx
> Cc: netdev@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx;
> bpf@xxxxxxxxxxxxxxx; Anders Roxell <anders.roxell@xxxxxxxxxx>
> Subject: [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init
> 
> When building FSL_DPAA_ETH the following build error shows up:
> 
> /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c: In function
> ‘dpaa_fq_init’:
> /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:1135:9: error: too few
> arguments to function ‘xdp_rxq_info_reg’
>  1135 |   err = xdp_rxq_info_reg(&dpaa_fq->xdp_rxq, dpaa_fq->net_dev,
>       |         ^~~~~~~~~~~~~~~~
> 
> Commit b02e5a0ebb17 ("xsk: Propagate napi_id to XDP socket Rx path")
> added an extra argument to function xdp_rxq_info_reg and commit
> d57e57d0cd04 ("dpaa_eth: add XDP_TX support") didn't know about that
> extra argument.
> 
> Signed-off-by: Anders Roxell <anders.roxell@xxxxxxxxxx>
> ---
> 
> I think this issue is seen since both patches went in at the same time
> to bpf-next and net-next.
> 
>  drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> index 947b3d2f9c7e..6cc8c4e078de 100644
> --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
> @@ -1133,7 +1133,7 @@ static int dpaa_fq_init(struct dpaa_fq *dpaa_fq,
> bool td_enable)
>  	if (dpaa_fq->fq_type == FQ_TYPE_RX_DEFAULT ||
>  	    dpaa_fq->fq_type == FQ_TYPE_RX_PCD) {
>  		err = xdp_rxq_info_reg(&dpaa_fq->xdp_rxq, dpaa_fq->net_dev,
> -				       dpaa_fq->fqid);
> +				       dpaa_fq->fqid, 0);
>  		if (err) {
>  			dev_err(dev, "xdp_rxq_info_reg() = %d\n", err);
>  			return err;
> --
> 2.29.2

The XDP support for DPAA 1 and the napi_id propagation were concurrently
applied, thanks for addressing this.

Madalin