From owner-cvs-src@FreeBSD.ORG  Fri Aug 25 12:38:28 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0CB1316A4DD;
	Fri, 25 Aug 2006 12:38:28 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 93FD043D55;
	Fri, 25 Aug 2006 12:38:27 +0000 (GMT)
	(envelope-from glebius@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7PCcRMN054670;
	Fri, 25 Aug 2006 12:38:27 GMT
	(envelope-from glebius@repoman.freebsd.org)
Received: (from glebius@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7PCcRXF054669;
	Fri, 25 Aug 2006 12:38:27 GMT (envelope-from glebius)
Message-Id: <200608251238.k7PCcRXF054669@repoman.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 25 Aug 2006 12:38:27 +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 if_em_hw.c if_em_hw.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Aug 2006 12:38:28 -0000

glebius     2006-08-25 12:38:27 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/dev/em           if_em.c if_em.h if_em_hw.c if_em_hw.h 
  Log:
  Merge a bunch of changes from HEAD. The most significant are:
  
  - 6.1.4 driver merge
  - Fix RX path under mbuf shortage conditions
  - Fix TX path under mbuf shortage conditions
  
  Revision   Changes    Path
  1.65.2.18  +140 -85   src/sys/dev/em/if_em.c
  1.32.2.4   +1 -1      src/sys/dev/em/if_em.h
  1.16.2.3   +35 -32    src/sys/dev/em/if_em_hw.c
  1.15.2.4   +1 -0      src/sys/dev/em/if_em_hw.h