From owner-cvs-src@FreeBSD.ORG  Thu Apr  6 19:09:50 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 320BF16A404;
	Thu,  6 Apr 2006 19:09:50 +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 96F1E4544B;
	Thu,  6 Apr 2006 17:09:03 +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 k36H93XB060527;
	Thu, 6 Apr 2006 17:09:03 GMT
	(envelope-from glebius@repoman.freebsd.org)
Received: (from glebius@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k36H936s060526;
	Thu, 6 Apr 2006 17:09:03 GMT (envelope-from glebius)
Message-Id: <200604061709.k36H936s060526@repoman.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 6 Apr 2006 17:09:03 +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 LICENSE README if_em.c 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: Thu, 06 Apr 2006 19:09:51 -0000

glebius     2006-04-06 17:09:03 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/em           LICENSE README if_em.c if_em_hw.c 
                         if_em_hw.h 
  Log:
  Merge in new driver from Intel, version 5.1.5. Adds support for some
  new chips and improves support for already supported ones.
  
  Some details, important for future merges:
    - if_em.c merged manually, viewing diff between new vendor
      driver and previous one.
    - if_em_hw.h dropped in from vendor, and then restored revisions
      1.16, 1.17, 1.18.
    - if_em_hw.c dropped in from vendor, and then two liner change made,
      that restores support for two rare chips.
  
  Revision  Changes     Path
  1.4       +1 -3       src/sys/dev/em/LICENSE
  1.12      +61 -22     src/sys/dev/em/README
  1.115     +62 -9      src/sys/dev/em/if_em.c
  1.18      +1018 -269  src/sys/dev/em/if_em_hw.c
  1.20      +333 -25    src/sys/dev/em/if_em_hw.h