svn commit: r277084 - in head/sys: dev/ixl modules/ixl modules/ixlv

[Jack Vogel]

Opps, missing chunk, fix coming.

Jack


On Mon, Jan 12, 2015 at 11:47 AM, Bjoern A. Zeeb <bz at freebsd.org> wrote:

>
> > On 12 Jan 2015, at 18:43 , Jack F Vogel <jfv at FreeBSD.org> wrote:
> >
> > Author: jfv
> > Date: Mon Jan 12 18:43:34 2015
> > New Revision: 277084
> > URL: https://svnweb.freebsd.org/changeset/base/277084
> >
> > Log:
> >  Intel I40E driver updates:
> >       if_ixl to version 1.3.0, if_ixlv to version 1.2.0
> >       - Major change in both drivers is to add RSS support
> >       - In ixl fix some interface speed related issues, dual
> >         speed was not changing correctly, KR/X media was not
> >         displaying correctly (this has a workaround until a
> >         more robust media handling is in place)
> >       - Add a warning when using Dell NPAR and the speed is
> >         less than 10G
> >       - Wrap a queue hung message in IXL_DEBUG, as it is non-fatal,
> >         and without tuning can display excessively
> >
> >  MFC after: 1 week
> >
> > Modified:
> >  head/sys/dev/ixl/if_ixl.c
> >  head/sys/dev/ixl/if_ixlv.c
> >  head/sys/dev/ixl/ixl.h
> >  head/sys/dev/ixl/ixl_txrx.c
>
> There is no M_FLOWID in HEAD anymore.   Build failure.
>
> >
> ==============================================================================
> > --- head/sys/dev/ixl/ixl_txrx.c       Mon Jan 12 18:38:09 2015
> (r277083)
> > +++ head/sys/dev/ixl/ixl_txrx.c       Mon Jan 12 18:43:34 2015
> (r277084)
> > @@ -66,8 +66,8 @@ ixl_mq_start(struct ifnet *ifp, struct m
> >       struct tx_ring          *txr;
> >       int                     err, i;
> >
> > -     /* check if flowid is set */
> > -     if (M_HASHTYPE_GET(m) != M_HASHTYPE_NONE)
> > +     /* Which queue to use */
> > +     if ((m->m_flags & M_FLOWID) != 0)
> >               i = m->m_pkthdr.flowid % vsi->num_queues;
> >       else
> >               i = curcpu % vsi->num_queues;
> > @@ -1089,8 +1089,8 @@ int
> > ixl_init_rx_ring(struct ixl_queue *que)
> > {
> >       struct  rx_ring         *rxr = &que->rxr;
> > -     struct ixl_vsi          *vsi = que->vsi;
> > #if defined(INET6) || defined(INET)
> > +     struct ixl_vsi          *vsi = que->vsi;
> >       struct ifnet            *ifp = vsi->ifp;
> >       struct lro_ctrl         *lro = &rxr->lro;
> > #endif
> > @@ -1543,7 +1543,7 @@ ixl_rxeof(struct ixl_queue *que, int cou
> >                       if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
> >                               ixl_rx_checksum(sendmp, status, error,
> ptype);
> >                       sendmp->m_pkthdr.flowid = que->msix;
> > -                     M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE);
> > +                     sendmp->m_flags |= M_FLOWID;
> >               }
> > next_desc:
> >               bus_dmamap_sync(rxr->dma.tag, rxr->dma.map,
> >
>
> --
> Bjoern A. Zeeb                                  Charles Haddon Spurgeon:
> "Friendship is one of the sweetest joys of life.  Many might have failed
>  beneath the bitterness of their trial  had they not found a friend."
>
>