Re: [PATCH net-next v2 02/12] net: stmmac: replace the sph_disable field with a flag

Simon Horman
2023-06-23T21:05:05Z

On Fri, Jun 23, 2023 at 10:00:18PM +0200, Bartosz Golaszewski wrote:
> On Fri, Jun 23, 2023 at 9:22 PM Simon Horman <simon.horman@corigine.com> wrote:
> >
> > On Fri, Jun 23, 2023 at 12:08:35PM +0200, Bartosz Golaszewski wrote:
> > > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> > >
> > > Drop the boolean field of the plat_stmmacenet_data structure in favor of a
> > > simple bitfield flag.
> > >
> > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> >
> > ...
> >
> > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
> > > index ab9f876b6df7..70e91bbef2a6 100644
> > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
> > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
> > > @@ -459,7 +459,7 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
> > > plat->has_gmac4 = 1;
> > > plat->force_sf_dma_mode = 0;
> > > plat->tso_en = 1;
> > > - plat->sph_disable = 1;
> > > + data->flags |= STMMAC_FLAG_SPH_DISABLE;
> >
> > Hi Bartosz,
> >
> > I think something must have got mixed-up here.
> > An x86_64 allmodconfig reports that data is undeclared here.
> >
>
> Cr*p, I thought I build-tested everything...
>
> My bad, I'll resend a v3 after the merge window.

Sorry to have been the bearer of bad news :(