From owner-svn-src-head@FreeBSD.ORG Mon Jan 12 20:07:13 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 546ABC42; Mon, 12 Jan 2015 20:07:13 +0000 (UTC) Received: from mail-wg0-x230.google.com (mail-wg0-x230.google.com [IPv6:2a00:1450:400c:c00::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EAC99639; Mon, 12 Jan 2015 20:07:12 +0000 (UTC) Received: by mail-wg0-f48.google.com with SMTP id l2so21421980wgh.7; Mon, 12 Jan 2015 12:07:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=RoTFgHtq2M/CIjgUh6AOuz5+ii5OxJ8Grkrf76QgnHo=; b=aKcXrgsi+Z/t8Xst6RSQ3S4ouujd/C4BRt1HPvBPlIYBZno8E0eStHBnRtPopVcOI5 eM/YIAl7nBZTYioiEiiMmnFHzbfwZPg1+/2c44sNBBmD0cRW0JOYqAhaUDCNXsZx1cWl cYzds4kDpd+1YxzYNnCaPuoIL5SWjK2wU2aRDgpgK5CgPBW2eJw7rU0bMRqQ6lSD7SEA RI4PgwBY31CE2flonxsQyQ0ranH3F/IVf3r4VxkQphXmMKJxerTsOoeNMFTJUH2BBfbm YkTuhKKDrcAZP5yk96wxTfdJHzjjjbH6p6BDwby8vBi0e84QUbX6O51DiGh8lkHvYzFl Jrsw== MIME-Version: 1.0 X-Received: by 10.194.19.131 with SMTP id f3mr30935673wje.46.1421093231359; Mon, 12 Jan 2015 12:07:11 -0800 (PST) Received: by 10.194.101.106 with HTTP; Mon, 12 Jan 2015 12:07:11 -0800 (PST) In-Reply-To: <43BD685C-77C4-42C8-9143-4BD59916EDFB@FreeBSD.org> References: <201501121843.t0CIhYnW067569@svn.freebsd.org> <43BD685C-77C4-42C8-9143-4BD59916EDFB@FreeBSD.org> Date: Mon, 12 Jan 2015 12:07:11 -0800 Message-ID: Subject: Re: svn commit: r277084 - in head/sys: dev/ixl modules/ixl modules/ixlv From: Jack Vogel To: "Bjoern A. Zeeb" Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: Jack F Vogel , "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2015 20:07:13 -0000 Opps, missing chunk, fix coming. Jack On Mon, Jan 12, 2015 at 11:47 AM, Bjoern A. Zeeb wrote: > > > On 12 Jan 2015, at 18:43 , Jack F Vogel 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." > >