From owner-cvs-all@FreeBSD.ORG  Fri Dec  7 01:10:51 2007
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC57216A419
	for <cvs-all@freebsd.org>; Fri,  7 Dec 2007 01:10:51 +0000 (UTC)
	(envelope-from jfvogel@gmail.com)
Received: from mu-out-0910.google.com (mu-out-0910.google.com [209.85.134.188])
	by mx1.freebsd.org (Postfix) with ESMTP id 3FAF313C45A
	for <cvs-all@freebsd.org>; Fri,  7 Dec 2007 01:10:51 +0000 (UTC)
	(envelope-from jfvogel@gmail.com)
Received: by mu-out-0910.google.com with SMTP id i10so136586mue
	for <cvs-all@freebsd.org>; Thu, 06 Dec 2007 17:10:49 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	bh=6+SrSBTYnW127Xcfa8XygA1Dbf3LjztMpOSrz/80GcA=;
	b=SldT9RI27ZWgY8/uK7q9xpGDIKUxajbCKpVqdeIZlwC1TwGg8rC+odwsYDZKd4kTjivRlo8KH3VV1f0bQmlHaMTz8QF8kIu3QxIqK1vi+1g/wJaET7xjckuUtGXqtnYmQLbFvAL/HT/CEvL7NENiF/bS+jV2W5LWbybVEynonVM=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=RmElAEOh8yi3wPHHOGy6XYdQn6uA8kmyA74/MYR440OWqWU1q7mT5pWL2fjV6OCt4oB9bt9rAd0bSBM73qmjG77ewFGVdq6mPy14/xRm5I6B10dUaet0785Z8Qw0tMRbPmuJacgljfIjG2B2Jk0tgmv6W4N0bY2nzb9bQ4wzBjg=
Received: by 10.86.84.5 with SMTP id h5mr1605911fgb.1196989849635;
	Thu, 06 Dec 2007 17:10:49 -0800 (PST)
Received: by 10.86.97.10 with HTTP; Thu, 6 Dec 2007 17:10:49 -0800 (PST)
Message-ID: <2a41acea0712061710w22a5a2et7236af6a826a2548@mail.gmail.com>
Date: Thu, 6 Dec 2007 17:10:49 -0800
From: "Jack Vogel" <jfvogel@gmail.com>
To: "Jack F Vogel" <jfv@freebsd.org>
In-Reply-To: <200712070106.lB716guH012104@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <200712070106.lB716guH012104@repoman.freebsd.org>
Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org
Subject: Re: cvs commit: src/sys/dev/em if_em.c if_em.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Dec 2007 01:10:51 -0000

On Dec 6, 2007 5:06 PM, Jack F Vogel <jfv@freebsd.org> wrote:
> jfv         2007-12-07 01:06:42 UTC
>
>   FreeBSD src repository
>
>   Modified files:        (Branch: RELENG_6)
>     sys/dev/em           if_em.c if_em.h
>   Log:
>   MFC of a few important fixes done in RELENG_7 to 6
>     - WITNESS lock problem due to naming of multi locks
>     - Race in em_stop if you don't hold the TX lock
>     - Bug in TSO code when you have fowarding and different
>       MSS sizes (this more for completeness since TSO is not
>       enabled in 6.3)
>
>   Essentially syncs the two drivers up to version 6.7.3
>
>   Approved by:re
>
>   Revision   Changes    Path
>   1.65.2.29  +56 -63    src/sys/dev/em/if_em.c
>   1.32.2.9   +4 -4      src/sys/dev/em/if_em.h
>

Oh yes, and back out the watchdog hack since Scott checked in the
real fix in the interrupt code...

Enjoy,

Jack