diff mbox series

dpaa_eth: fix build errorr in dpaa_fq_init

Message ID 20201203144343.790719-1-anders.roxell@linaro.org
State New
Headers show
Series dpaa_eth: fix build errorr in dpaa_fq_init | expand

Commit Message

Anders Roxell Dec. 3, 2020, 2:43 p.m. UTC 
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@linaro.org>

---

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(-)

-- 
2.29.2

Comments

Björn Töpel Dec. 3, 2020, 2:49 p.m. UTC | #1 
On Thu, 3 Dec 2020 at 15:46, Anders Roxell <anders.roxell@linaro.org> wrote:
>

> 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@linaro.org>

> ---

>

> I think this issue is seen since both patches went in at the same time

> to bpf-next and net-next.

>


Thanks Anders!

Indeed, when bpf-next is pulled into net-next this needs to be applied.

Acked-by: Björn Töpel <bjorn.topel@intel.com>


>  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

>
Madalin Bucur (OSS) Dec. 3, 2020, 3:51 p.m. UTC | #2 
> -----Original Message-----

> From: Anders Roxell <anders.roxell@linaro.org>

> Sent: 03 December 2020 16:44

> To: Madalin Bucur <madalin.bucur@nxp.com>; davem@davemloft.net;

> kuba@kernel.org; ast@kernel.org; daniel@iogearbox.net; hawk@kernel.org;

> john.fastabend@gmail.com

> Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org;

> bpf@vger.kernel.org; Anders Roxell <anders.roxell@linaro.org>

> 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@linaro.org>

> ---

> 

> 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
Jakub Kicinski Dec. 4, 2020, 6:27 p.m. UTC | #3 
On Thu, 3 Dec 2020 15:49:21 +0100 Björn Töpel wrote:
> On Thu, 3 Dec 2020 at 15:46, Anders Roxell <anders.roxell@linaro.org> wrote:

> >

> > 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@linaro.org>

> > ---

> >

> > I think this issue is seen since both patches went in at the same time

> > to bpf-next and net-next.

> >  

> 

> Thanks Anders!

> 

> Indeed, when bpf-next is pulled into net-next this needs to be applied.

> 

> Acked-by: Björn Töpel <bjorn.topel@intel.com>


Applied, thanks!

Looks like there is a mention of this function in an
example in Documentation/ that may need updating, too.
diff mbox series

Patch

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;