From owner-cvs-all@FreeBSD.ORG  Fri Dec  7 01:06:43 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 1C9D316A480;
	Fri,  7 Dec 2007 01:06:43 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EA27813C455;
	Fri,  7 Dec 2007 01:06:42 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB716g4C012105;
	Fri, 7 Dec 2007 01:06:42 GMT (envelope-from jfv@repoman.freebsd.org)
Received: (from jfv@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB716guH012104;
	Fri, 7 Dec 2007 01:06:42 GMT (envelope-from jfv)
Message-Id: <200712070106.lB716guH012104@repoman.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Fri, 7 Dec 2007 01:06:42 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: 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:06:43 -0000

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