Date: Mon, 12 Jan 2015 19:47:39 +0000 From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: Jack F Vogel <jfv@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r277084 - in head/sys: dev/ixl modules/ixl modules/ixlv Message-ID: <43BD685C-77C4-42C8-9143-4BD59916EDFB@FreeBSD.org> In-Reply-To: <201501121843.t0CIhYnW067569@svn.freebsd.org> References: <201501121843.t0CIhYnW067569@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 12 Jan 2015, at 18:43 , Jack F Vogel <jfv@FreeBSD.org> wrote: >=20 > Author: jfv > Date: Mon Jan 12 18:43:34 2015 > New Revision: 277084 > URL: https://svnweb.freebsd.org/changeset/base/277084 >=20 > 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 >=20 > MFC after: 1 week >=20 > 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. > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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; >=20 > - /* check if flowid is set */ > - if (M_HASHTYPE_GET(m) !=3D M_HASHTYPE_NONE) > + /* Which queue to use */ > + if ((m->m_flags & M_FLOWID) !=3D 0) > i =3D m->m_pkthdr.flowid % vsi->num_queues; > else > i =3D curcpu % vsi->num_queues; > @@ -1089,8 +1089,8 @@ int > ixl_init_rx_ring(struct ixl_queue *que) > { > struct rx_ring *rxr =3D &que->rxr; > - struct ixl_vsi *vsi =3D que->vsi; > #if defined(INET6) || defined(INET) > + struct ixl_vsi *vsi =3D que->vsi; > struct ifnet *ifp =3D vsi->ifp; > struct lro_ctrl *lro =3D &rxr->lro; > #endif > @@ -1543,7 +1543,7 @@ ixl_rxeof(struct ixl_queue *que, int cou > if ((ifp->if_capenable & IFCAP_RXCSUM) !=3D 0) > ixl_rx_checksum(sendmp, status, error, = ptype); > sendmp->m_pkthdr.flowid =3D que->msix; > - M_HASHTYPE_SET(sendmp, M_HASHTYPE_OPAQUE); > + sendmp->m_flags |=3D M_FLOWID; > } > next_desc: > bus_dmamap_sync(rxr->dma.tag, rxr->dma.map, >=20 =E2=80=94=20 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."
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?43BD685C-77C4-42C8-9143-4BD59916EDFB>