From owner-cvs-src@FreeBSD.ORG  Sat Aug 27 18:02:16 2005
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 0AB5616A41F;
	Sat, 27 Aug 2005 18:02:16 +0000 (GMT)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D393443D45;
	Sat, 27 Aug 2005 18:02:15 +0000 (GMT)
	(envelope-from marius@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7RI2FIr075055;
	Sat, 27 Aug 2005 18:02:15 GMT
	(envelope-from marius@repoman.freebsd.org)
Received: (from marius@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7RI2FYn075054;
	Sat, 27 Aug 2005 18:02:15 GMT (envelope-from marius)
Message-Id: <200508271802.j7RI2FYn075054@repoman.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 27 Aug 2005 18:02:15 +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/gem if_gem.c
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: Sat, 27 Aug 2005 18:02:16 -0000

marius      2005-08-27 18:02:15 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/dev/gem          if_gem.c 
  Log:
  MFC:    1.30
  
  - Wrap the handler and associated code for collecting completed RX
    descriptors that are still marked owned in #ifdef GEM_RINT_TIMEOUT
    instead of #if 0 for convenience.
  - Remove stale code and comment about relying on the preset XIF config.
  - In case of a watchdog timeout call the init function instead of just
    the start function so the chip is properly reset.
  
  Merge from hme(4):
  - Convert to use bus_dmamap_load_mbuf_sg() for loading RX buffers.
  - Protect from a duplicate mbuf free panic in case the DMA engine hangs.
  
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.29.2.3  +23 -31    src/sys/dev/gem/if_gem.c