dpaa_eth: fix build errorr in dpaa_fq_init
Subsystems (4)
PATCH 1/1 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.
---
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(-)
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +1 -1
@@ -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;
Signature · 1 line
2.29.2
Quoted 13 lines · Anders Roxell
When building
FSL_DPAA_ETHthe 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: Propagatenapi_idto XDP socket Rx path") added an extra argument to functionxdp_rxq_info_regand commitd57e57d0cd04("dpaa_eth: addXDP_TXsupport") didn't know about that extra argument.
Quoted 6 lines
Signed-off-by Anders Roxell <[email protected]>---
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.
Quoted 19 lines
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +1
-2@@ -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
Quoted 21 lines · On Thu, 3 Dec 2020 15:49:21 +0100 Björn Töpel wrote:
Quoted 13 lines · Anders Roxell
When building
FSL_DPAA_ETHthe 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: Propagatenapi_idto XDP socket Rx path") added an extra argument to functionxdp_rxq_info_regand commitd57e57d0cd04("dpaa_eth: addXDP_TXsupport") didn't know about that extra argument.Quoted 6 lines
Signed-off-by Anders Roxell <[email protected]>---
I think this issue is seen since both patches went in at the same time to bpf-next and net-next.
Quoted 5 lines
Thanks Anders!
Indeed, when bpf-next is pulled into net-next this needs to be applied.
Acked-by Björn Töpel <[email protected]>
Applied, thanks!
Looks like there is a mention of this function in an example in Documentation/ that may need updating, too.
Quoted 47 lines
-----Original Message-----
From: Anders Roxell <[email protected]>
Sent: 03 December 2020 16:44
To: Madalin Bucur <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Anders Roxell <[email protected]>
Subject: [PATCH]dpaa_eth: fix build errorr indpaa_fq_initWhen building
FSL_DPAA_ETHthe 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: Propagatenapi_idto XDP socket Rx path") added an extra argument to functionxdp_rxq_info_regand commitd57e57d0cd04("dpaa_eth: addXDP_TXsupport") didn't know about that extra argument.Signed-off-by Anders Roxell <[email protected]>---
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(-)drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +1
-1@@ -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);
Quoted 3 lines
return err;
--
2.29.2
The XDP support for DPAA 1 and the napi_id propagation were concurrently applied, thanks for addressing this.
Madalin