From owner-cvs-src@FreeBSD.ORG  Sat Oct 22 22:07:21 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 19A0016A41F;
	Sat, 22 Oct 2005 22:07:21 +0000 (GMT)
	(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 DB26D43D48;
	Sat, 22 Oct 2005 22:07:20 +0000 (GMT)
	(envelope-from glebius@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 j9MM7KKe041744;
	Sat, 22 Oct 2005 22:07:20 GMT
	(envelope-from glebius@repoman.freebsd.org)
Received: (from glebius@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9MM7KRc041743;
	Sat, 22 Oct 2005 22:07:20 GMT (envelope-from glebius)
Message-Id: <200510222207.j9MM7KRc041743@repoman.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sat, 22 Oct 2005 22:07:20 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6_0
Cc: 
Subject: cvs commit: src/sys/dev/em if_em.c if_em.h 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: Sat, 22 Oct 2005 22:07:21 -0000

glebius     2005-10-22 22:07:20 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6_0)
    sys/dev/em           if_em.c if_em.h if_em_hw.h 
  Log:
  Sync with HEAD. Revisions merged:
  
    - rev. 1.76. Removed FreeBSD 4.x code.
    - rev. 1.77, 1.79. Together with rev. 1.71 (already merged) this
      fixes problems when some code is executed in driver when
      em_process_receive_interrupts() drops lock. This can occur
      at runtime, when polling(4) mode is changed to interrupt driver
      or vise versa, but more likely this can happen when administrator
      issues some ifconfig commands.
    - rev. 1.78. In em_process_receive_interrupts(), call bus_dmamap_sync()
      for the descriptors set each time we modify one descriptor, instead
      of doing it only at the function exit.
    - rev. 1.80. Loop in em_intr() until interrupt cause register is clear,
      don't mask overrun interrupt.
    - rev. 1.81. Several locking and other fixes.
  
  See particular revision logs for more detailed information.
  
  Approved by:    re
  
  Revision      Changes    Path
  1.65.2.5.2.1  +72 -157   src/sys/dev/em/if_em.c
  1.32.4.1      +1 -12     src/sys/dev/em/if_em.h
  1.15.4.1      +1 -0      src/sys/dev/em/if_em_hw.h