From owner-cvs-src-old@FreeBSD.ORG  Tue Jan 25 22:55:58 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D71E21065672
	for <cvs-src-old@freebsd.org>; Tue, 25 Jan 2011 22:55:58 +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 AB7218FC18
	for <cvs-src-old@freebsd.org>; Tue, 25 Jan 2011 22:55:58 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p0PMtwof071895
	for <cvs-src-old@freebsd.org>; Tue, 25 Jan 2011 22:55:58 GMT
	(envelope-from jfv@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p0PMtwJR071894
	for cvs-src-old@freebsd.org; Tue, 25 Jan 2011 22:55:58 GMT
	(envelope-from jfv@repoman.freebsd.org)
Message-Id: <201101252255.p0PMtwJR071894@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	jfv@repoman.freebsd.org using -f
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Tue, 25 Jan 2011 22:55:50 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: RELENG_7_4
Subject: cvs commit: src/sys/dev/e1000 if_em.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jan 2011 22:55:58 -0000

jfv         2011-01-25 22:55:50 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7_4)
    sys/dev/e1000        if_em.c 
  Log:
  SVN rev 217862 on 2011-01-25 22:55:50Z by jfv
  
  MFC stable/7 r217723
  
          - Pieces of the failure path in em_xmit got
            mangled, correct it.
          - local_timer had a leftover TX_UNLOCK without
            a matching TX_LOCK in the error path, remove it.
  
  Approved by: re (bz)
  
  Revision      Changes    Path
  1.1.2.16.2.2  +11 -3     src/sys/dev/e1000/if_em.c