From owner-svn-src-head@FreeBSD.ORG Tue Apr 14 17:26:07 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8950B106564A; Tue, 14 Apr 2009 17:26:07 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: from wa-out-1112.google.com (wa-out-1112.google.com [209.85.146.176]) by mx1.freebsd.org (Postfix) with ESMTP id 467348FC0A; Tue, 14 Apr 2009 17:26:07 +0000 (UTC) (envelope-from jfvogel@gmail.com) Received: by wa-out-1112.google.com with SMTP id m38so1487773waf.27 for ; Tue, 14 Apr 2009 10:26:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=P0PHQhaqtN771kU9B3ff3Iep8jB0rYiqqx0zfgN0g20=; b=gecLRawOiHVt7OES67h0vilbYyirXFvmAzDXG31WOsoubthWUSAZunK8k5llktoYa6 yDYso/+h5QmERImysnUiz+uSXPbBHl/kOcNDDqnPULQsGF9j2C1J9GzyiPwMYsvZuSAt Wrtqh0U+ISJDGq46XlFRXjIPVzn2A6qNhqSfI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=qCncCxTdIAxlqPiI56rdyM2hZh3HiWv5/V/w7AlUbtjevN9nz44ERoTl9Oc/sTFAi7 OiU8mRhi2Hmxo2zXzdw1VppKVRRaLnD/UNlJX+KI3EFeTAjmT469ErxOeyE6buhojNGh cQSVZZZcadZrInjxUvZmyeXsz2FxHK3r/nSyE= MIME-Version: 1.0 Received: by 10.114.95.12 with SMTP id s12mr3773577wab.223.1239729966881; Tue, 14 Apr 2009 10:26:06 -0700 (PDT) In-Reply-To: <200904141714.n3EHEZqZ014386@svn.freebsd.org> References: <200904141714.n3EHEZqZ014386@svn.freebsd.org> Date: Tue, 14 Apr 2009 10:26:06 -0700 Message-ID: <2a41acea0904141026r10712a8fr356e35e33e0c1c9e@mail.gmail.com> From: Jack Vogel To: Jack F Vogel Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r191065 - head/sys/dev/e1000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 14 Apr 2009 17:26:08 -0000 LOL, er I meant Randall Stewert, must be thinking of old films, sorry Randall :) On Tue, Apr 14, 2009 at 10:14 AM, Jack F Vogel wrote: > Author: jfv > Date: Tue Apr 14 17:14:35 2009 > New Revision: 191065 > URL: http://svn.freebsd.org/changeset/base/191065 > > Log: > Thanks to Michael Tuexen and Randall Scott for providing a > few important bug fixes found while they were doing SCTP > development, and that I somehow lost during the scramble. > > Thanks guys!! > > Modified: > head/sys/dev/e1000/if_igb.c > > Modified: head/sys/dev/e1000/if_igb.c > > ============================================================================== > --- head/sys/dev/e1000/if_igb.c Tue Apr 14 16:48:49 2009 (r191064) > +++ head/sys/dev/e1000/if_igb.c Tue Apr 14 17:14:35 2009 (r191065) > @@ -94,7 +94,7 @@ int igb_display_debug_stats = 0; > /********************************************************************* > * Driver version: > *********************************************************************/ > -char igb_driver_version[] = "version - 1.5.2"; > +char igb_driver_version[] = "version - 1.5.3"; > > > /********************************************************************* > @@ -4002,7 +4002,7 @@ igb_rxeof(struct rx_ring *rxr, int count > accept_frame = 1; > hlen = plen = len_adj = 0; > sendmp = mh = mp = NULL; > - ptype = (u16)cur->wb.lower.lo_dword.data; > + ptype = (u16)(cur->wb.lower.lo_dword.data >> 4); > > /* Sync the buffers */ > bus_dmamap_sync(rxr->rxtag, rxr->rx_buffers[i].map, > @@ -4103,16 +4103,16 @@ igb_rxeof(struct rx_ring *rxr, int count > rxr->lmp = mh->m_next; > } > } else { > - /* Chain mbuf's together */ > - mh->m_flags &= ~M_PKTHDR; > - rxr->lmp->m_next = mh; > - rxr->lmp = rxr->lmp->m_next; > - rxr->fmp->m_pkthdr.len += mh->m_len; > /* Adjust for CRC frag */ > if (len_adj) { > rxr->lmp->m_len -= len_adj; > rxr->fmp->m_pkthdr.len -= len_adj; > } > + /* Chain mbuf's together */ > + mh->m_flags &= ~M_PKTHDR; > + rxr->lmp->m_next = mh; > + rxr->lmp = rxr->lmp->m_next; > + rxr->fmp->m_pkthdr.len += mh->m_len; > } > > if (eop) { > @@ -4256,7 +4256,7 @@ igb_rx_checksum(u32 staterr, struct mbuf > #endif > /* Did it pass? */ > if (!(errors & E1000_RXD_ERR_TCPE)) { > - mp->m_pkthdr.csum_flags = type; > + mp->m_pkthdr.csum_flags |= type; > if (!sctp) > mp->m_pkthdr.csum_data = htons(0xffff); > } >