Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 4 Dec 2020 10:27:52 -0800
From:   Jakub Kicinski <kuba@kernel.org>
To:     =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com>
Cc:     Anders Roxell <anders.roxell@linaro.org>, madalin.bucur@nxp.com,
        David Miller <davem@davemloft.net>,
        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
Message-ID: <20201204102752.4bfac75d@kicinski-fedora-pc1c0hjn.DHCP.thefacebook.com>
In-Reply-To: <CAJ+HfNg97HtDciv_z8F6Gs5Yncuua2Gx27HLxCYBNmA9Bk1jxg@mail.gmail.com>
References: <20201203144343.790719-1-anders.roxell@linaro.org>
        <CAJ+HfNg97HtDciv_z8F6Gs5Yncuua2Gx27HLxCYBNmA9Bk1jxg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, 3 Dec 2020 15:49:21 +0100 Bj=C3=B6rn T=C3=B6pel wrote:
> On Thu, 3 Dec 2020 at 15:46, Anders Roxell <anders.roxell@linaro.org> wro=
te:
> >
> > When building FSL_DPAA_ETH the following build error shows up:
> >
> > /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c: In function =E2=80=
=98dpaa_fq_init=E2=80=99:
> > /tmp/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c:1135:9: error: too =
few arguments to function =E2=80=98xdp_rxq_info_reg=E2=80=99
> >  1135 |   err =3D 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.
> > =20
>=20
> Thanks Anders!
>=20
> Indeed, when bpf-next is pulled into net-next this needs to be applied.
>=20
> Acked-by: Bj=C3=B6rn T=C3=B6pel <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.