From owner-cvs-src@FreeBSD.ORG  Tue Oct 31 15:01:33 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 982F716A412;
	Tue, 31 Oct 2006 15:01:33 +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 42AAB43DF0;
	Tue, 31 Oct 2006 15:00:15 +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 k9VF0Fl6024156;
	Tue, 31 Oct 2006 15:00:15 GMT
	(envelope-from glebius@repoman.freebsd.org)
Received: (from glebius@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9VF0Ftd024155;
	Tue, 31 Oct 2006 15:00:15 GMT (envelope-from glebius)
Message-Id: <200610311500.k9VF0Ftd024155@repoman.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 31 Oct 2006 15:00:14 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/dev/em if_em.c if_em.h if_em_hw.c if_em_hw.h
 if_em_osdep.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: Tue, 31 Oct 2006 15:01:33 -0000

glebius     2006-10-31 15:00:14 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/em           if_em.c if_em.h if_em_hw.c if_em_hw.h 
                         if_em_osdep.h 
  Log:
  Merge new vendor release - 6.2.9.
  
  Details:
  o if_em.c changes:
    - Added several new PCI ids.
    - Check em_check_phy_reset_block() before doing SIOCSIFMEDIA ioctl.
    - Don't touch TARC registers, they are now handled in shared
      code in if_em_hw.c.
    - Move RDH and RDT setting to the end of
      em_initialize_receive_unit().
    - Declare em_read_pcie_cap_reg(), now empty.
  o if_em_hw.c dropped in from vendor, then restored rev. 1.15.
  o if_em_hw.h dropped in from vendor, then modified:
    - Added RX overrun interrupt flag to interrupt enable mask.
    - Remove declarations of em_io_read(), em_io_write().
  
  Approved by:    jfv
  
  Revision  Changes    Path
  1.157     +34 -27    src/sys/dev/em/if_em.c
  1.53      +19 -8     src/sys/dev/em/if_em.h
  1.25      +573 -523  src/sys/dev/em/if_em_hw.c
  1.25      +121 -170  src/sys/dev/em/if_em_hw.h
  1.21      +4 -4      src/sys/dev/em/if_em_osdep.h