linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Björn Töpel" <bjorn.topel@gmail.com>
To: Anders Roxell <anders.roxell@linaro.org>
Cc: madalin.bucur@nxp.com, David Miller <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Jesper Dangaard Brouer <hawk@kernel.org>,
	John Fastabend <john.fastabend@gmail.com>,
	Netdev <netdev@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>, bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init
Date: Thu, 3 Dec 2020 15:49:21 +0100	[thread overview]
Message-ID: <CAJ+HfNg97HtDciv_z8F6Gs5Yncuua2Gx27HLxCYBNmA9Bk1jxg@mail.gmail.com> (raw)
In-Reply-To: <20201203144343.790719-1-anders.roxell@linaro.org>

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
>

  reply	other threads:[~2020-12-03 14:50 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-03 14:43 Anders Roxell
2020-12-03 14:49 ` Björn Töpel [this message]
2020-12-04 18:27   ` Jakub Kicinski
2020-12-03 15:51 ` Madalin Bucur (OSS)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAJ+HfNg97HtDciv_z8F6Gs5Yncuua2Gx27HLxCYBNmA9Bk1jxg@mail.gmail.com \
    --to=bjorn.topel@gmail.com \
    --cc=anders.roxell@linaro.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=hawk@kernel.org \
    --cc=john.fastabend@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=madalin.bucur@nxp.com \
    --cc=netdev@vger.kernel.org \
    --subject='Re: [PATCH] dpaa_eth: fix build errorr in dpaa_fq_init' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).