svn commit: r353658 - head/sys/dev/ixl

[Eric Joyner]

Does r353661 fix it? I didn't catch "adapter" being used, probably due to
committing patches for the other drivers that do use "adapter".

On Wed, Oct 16, 2019 at 10:57 AM O. Hartmann <ohartmann at walstatt.org> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Am Wed, 16 Oct 2019 17:19:17 +0000 (UTC)
> Eric Joyner <erj at FreeBSD.org> schrieb:
>
> > Author: erj
> > Date: Wed Oct 16 17:19:17 2019
> > New Revision: 353658
> > URL: https://svnweb.freebsd.org/changeset/base/353658
> >
> > Log:
> >   ixl: report whether device received pause frames
> >
> >   From Jake:
> >   When updating the device statistics, report whether or not we have
> >   received any pause frames to the iflib stack. This allows the iflib
> >   stack to avoid generating a Tx hang message while the device is paused.
> >
> >   Signed-off-by: Jacob Keller <jacob.e.keller at intel.com>
> >
> >   Submitted by:       Jacob Keller <jacob.e.keller at intel.com>
> >   Reviewed by:        gallatin@
> >   Sponsored by:       Intel Corporation
> >   Differential Revision:      https://reviews.freebsd.org/D21870
> >
> > Modified:
> >   head/sys/dev/ixl/ixl_pf_main.c
> >
> > Modified: head/sys/dev/ixl/ixl_pf_main.c
> >
> ==============================================================================
> > --- head/sys/dev/ixl/ixl_pf_main.c    Wed Oct 16 17:16:32 2019
> (r353657)
> > +++ head/sys/dev/ixl/ixl_pf_main.c    Wed Oct 16 17:19:17 2019
> (r353658)
> > @@ -2592,6 +2592,7 @@ ixl_update_stats_counters(struct ixl_pf *pf)
> >       struct i40e_hw  *hw = &pf->hw;
> >       struct ixl_vsi  *vsi = &pf->vsi;
> >       struct ixl_vf   *vf;
> > +     u64 prev_link_xoff_rx = pf->stats.link_xoff_rx;
> >
> >       struct i40e_hw_port_stats *nsd = &pf->stats;
> >       struct i40e_hw_port_stats *osd = &pf->stats_offsets;
> > @@ -2676,6 +2677,13 @@ ixl_update_stats_counters(struct ixl_pf *pf)
> >       ixl_stat_update32(hw, I40E_GLPRT_LXOFFTXC(hw->port),
> >                          pf->stat_offsets_loaded,
> >                          &osd->link_xoff_tx, &nsd->link_xoff_tx);
> > +
> > +     /*
> > +      * For watchdog management we need to know if we have been paused
> > +      * during the last interval, so capture that here.
> > +      */
> > +     if (pf->stats.link_xoff_rx != prev_link_xoff_rx)
> > +             adapter->shared->isc_pause_frames = 1;
> >
> >       /* Packet size stats rx */
> >       ixl_stat_update48(hw, I40E_GLPRT_PRC64H(hw->port),
> > _______________________________________________
> > svn-src-head at freebsd.org mailing list
> > https://lists.freebsd.org/mailman/listinfo/svn-src-head
> > To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"
>
> This commit renders buildkernel to fail:
>
> [...]
> - --- ixl_pf_main.o ---
> /usr/src/sys/dev/ixl/ixl_pf_main.c:2686:3: error: use of undeclared
> identifier 'adapter'
>                 adapter->shared->isc_pause_frames = 1;
>
>
> - --
> O. Hartmann
>
> Ich widerspreche der Nutzung oder Übermittlung meiner Daten für
> Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG).
> -----BEGIN PGP SIGNATURE-----
>
> iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCXadW3wAKCRA4N1ZZPba5
> R3dtAP9HZKlb9tPUVxUJvM+5TsLS77I/4wGFKhAv8BvOQrWatwD+JIznJtN5S1lw
> C0dXiqrWuv/WYi01X4zWnGUOS0DoMgs=
> =ErFZ
> -----END PGP SIGNATURE-----
>