head	1.8;
access;
symbols
	RELENG_7_4_0_RELEASE:1.6.2.2
	RELENG_7_4:1.6.2.2.0.8
	RELENG_7_4_BP:1.6.2.2
	RELENG_7_3_0_RELEASE:1.6.2.2
	RELENG_7_3:1.6.2.2.0.6
	RELENG_7_3_BP:1.6.2.2
	RELENG_7_2_0_RELEASE:1.6.2.2
	RELENG_7_2:1.6.2.2.0.4
	RELENG_7_2_BP:1.6.2.2
	RELENG_7_1_0_RELEASE:1.6.2.2
	RELENG_6_4_0_RELEASE:1.3.2.2.4.1
	RELENG_7_1:1.6.2.2.0.2
	RELENG_7_1_BP:1.6.2.2
	RELENG_6_4:1.3.2.2.0.4
	RELENG_6_4_BP:1.3.2.2
	RELENG_7_0_0_RELEASE:1.6
	RELENG_6_3_0_RELEASE:1.3.2.2
	RELENG_7_0:1.6.0.4
	RELENG_7_0_BP:1.6
	RELENG_6_3:1.3.2.2.0.2
	RELENG_6_3_BP:1.3.2.2
	RELENG_7:1.6.0.2
	RELENG_7_BP:1.6
	RELENG_6_2_0_RELEASE:1.3.2.1
	RELENG_6_2:1.3.2.1.0.2
	RELENG_6_2_BP:1.3.2.1
	RELENG_5_5_0_RELEASE:1.2.6.1
	RELENG_5_5:1.2.6.1.0.4
	RELENG_5_5_BP:1.2.6.1
	RELENG_6_1_0_RELEASE:1.3
	RELENG_6_1:1.3.0.6
	RELENG_6_1_BP:1.3
	RELENG_6_0_0_RELEASE:1.3
	RELENG_6_0:1.3.0.4
	RELENG_6_0_BP:1.3
	RELENG_6:1.3.0.2
	RELENG_6_BP:1.3
	RELENG_5_4_0_RELEASE:1.2.6.1
	RELENG_5_4:1.2.6.1.0.2
	RELENG_5_4_BP:1.2.6.1
	RELENG_4_11_0_RELEASE:1.1.2.2
	RELENG_4_11:1.1.2.2.0.6
	RELENG_4_11_BP:1.1.2.2
	RELENG_5_3_0_RELEASE:1.2
	RELENG_5_3:1.2.0.8
	RELENG_5_3_BP:1.2
	RELENG_5:1.2.0.6
	RELENG_5_BP:1.2
	RELENG_4_10_0_RELEASE:1.1.2.2
	RELENG_4_10:1.1.2.2.0.4
	RELENG_4_10_BP:1.1.2.2
	RELENG_5_2_1_RELEASE:1.2
	RELENG_5_2_0_RELEASE:1.2
	RELENG_5_2:1.2.0.4
	RELENG_5_2_BP:1.2
	RELENG_4_9_0_RELEASE:1.1.2.2
	RELENG_4_9:1.1.2.2.0.2
	RELENG_4_9_BP:1.1.2.2
	RELENG_5_1_0_RELEASE:1.2
	RELENG_5_1:1.2.0.2
	RELENG_5_1_BP:1.2
	RELENG_4_8_0_RELEASE:1.1.2.1
	RELENG_4_8:1.1.2.1.0.2
	RELENG_4_8_BP:1.1.2.1
	RELENG_4:1.1.0.2;
locks; strict;
comment	@# @;


1.8
date	2008.07.30.21.56.53;	author jfv;	state dead;
branches;
next	1.7;

1.7
date	2008.02.29.21.50.09;	author jfv;	state Exp;
branches;
next	1.6;

1.6
date	2007.05.04.00.00.11;	author jfv;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	2006.04.07.10.18.24;	author glebius;	state Exp;
branches;
next	1.4;

1.4
date	2006.04.06.17.09.02;	author glebius;	state Exp;
branches;
next	1.3;

1.3
date	2005.01.06.01.42.38;	author imp;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2003.03.21.21.47.30;	author pdeuskar;	state Exp;
branches
	1.2.6.1;
next	1.1;

1.1
date	2003.01.07.19.36.00;	author pdeuskar;	state Exp;
branches
	1.1.2.1;
next	;

1.6.2.1
date	2008.05.02.23.52.00;	author jfv;	state Exp;
branches;
next	1.6.2.2;

1.6.2.2
date	2008.08.11.18.33.10;	author jfv;	state dead;
branches;
next	;

1.3.2.1
date	2006.08.08.09.20.26;	author glebius;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2007.10.05.22.49.06;	author jfv;	state Exp;
branches
	1.3.2.2.4.1;
next	1.3.2.3;

1.3.2.3
date	2012.11.17.07.43.08;	author svnexp;	state Exp;
branches;
next	;

1.3.2.2.4.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.2.6.1
date	2005.01.30.00.59.38;	author imp;	state Exp;
branches;
next	;

1.1.2.1
date	2003.01.17.01.34.40;	author pdeuskar;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2003.04.04.18.39.28;	author pdeuskar;	state Exp;
branches;
next	1.1.2.3;

1.1.2.3
date	2006.09.05.19.48.09;	author jhb;	state Exp;
branches;
next	1.1.2.4;

1.1.2.4
date	2012.11.17.07.25.40;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.8
log
@SVN rev 181027 on 2008-07-30 21:56:53Z by jfv

Merge of the source for igb and em into dev/e1000, this
proved to be necessary to make the static drivers work
in EITHER/OR or BOTH configurations. Modules will still
build in sys/modules/igb or em as before.

This also updates the igb driver for support for the 82576
adapter, adds shared code fixes, and etc....

MFC after:	ASAP
@
text
@$FreeBSD: src/sys/dev/em/LICENSE,v 1.7 2008/02/29 21:50:09 jfv Exp $

  Copyright (c) 2001-2008, Intel Corporation 
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without 
  modification, are permitted provided that the following conditions are met:
  
   1. Redistributions of source code must retain the above copyright notice, 
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright 
      notice, this list of conditions and the following disclaimer in the 
      documentation and/or other materials provided with the distribution.
  
   3. Neither the name of the Intel Corporation nor the names of its 
      contributors may be used to endorse or promote products derived from 
      this software without specific prior written permission.
  
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.

@


1.7
log
@This change introduces a split to the Intel E1000 driver, now rather than
just em, there is an igb driver (this follows behavior with our Linux drivers).
All adapters up to the 82575 are supported in em, and new client/desktop support
will continue to be in that adapter.

The igb driver is for new server NICs like the 82575 and its followons.
Advanced features for virtualization and performance will be in this driver.

Also, both drivers now have shared code that is up to the latest we have
released. Some stylistic changes as well.

Enjoy :)
@
text
@d1 1
a1 1
$FreeBSD$
@


1.6
log
@Merge in the new driver (6.5.0) of Intel. This has a new
shared code infrastructure that is family specific and
modular. There is also support for our latest gigabit
nic, the 82575 that is MSI/X and multiqueue capable.

The new shared code changes some interfaces to the core
code but testing at Intel has been going on for months,
it is fairly stable.

I have attempted to be careful in retaining any fixes that
CURRENT had and we did not, I apologize in advance if any
thing gets clobbered, I'm sure I'll hear about it :)

Approved by pdeuskar
@
text
@d3 1
a3 1
  Copyright (c) 2001-2007, Intel Corporation 
@


1.6.2.1
log
@MFC of the em/igb split drivers from HEAD.
@
text
@d3 1
a3 1
  Copyright (c) 2001-2008, Intel Corporation 
@


1.6.2.2
log
@SVN rev 181597 on 2008-08-11 18:33:10Z by jfv

MFC of the em/igb driver reorg
@
text
@d1 1
a1 1
$FreeBSD: src/sys/dev/em/LICENSE,v 1.6.2.1 2008/05/02 23:52:00 jfv Exp $
@


1.5
log
@Restore accidentially removed rev. 1.3
@
text
@a1 3
/*-
Copyright (c) 2001-2005, Intel Corporation 
All rights reserved.
d3 28
a30 2
Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
a31 23
 1. Redistributions of source code must retain the above copyright notice, 
    this list of conditions and the following disclaimer.

 2. Redistributions in binary form must reproduce the above copyright 
    notice, this list of conditions and the following disclaimer in the 
    documentation and/or other materials provided with the distribution.

 3. Neither the name of the Intel Corporation nor the names of its 
    contributors may be used to endorse or promote products derived from 
    this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
@


1.4
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.
@
text
@d2 1
d31 1
@


1.3
log
@Start each of the license/copyright comments with /*-, minor shuffle of lines
@
text
@d2 1
a2 2
/*-
Copyright (c) 2001-2003, Intel Corporation 
a29 1
*/
@


1.3.2.1
log
@Sync with HEAD, merging vendor drivers updates 5.1.5, 6.0.5 by Jack Vogel.
@
text
@d3 1
a3 1
Copyright (c) 2001-2005, Intel Corporation 
@


1.3.2.2
log
@MFC of Intel driver version 6.6.6
This adds our new modular shared code, support for MSI/MSIX, hardware
support for newer adapters, and a variety of bug fixes.
@
text
@d3 1
a3 1
Copyright (c) 2001-2007, Intel Corporation 
@


1.3.2.3
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/6/sys/dev/em/LICENSE 172455 2007-10-05 22:49:08Z jfv $
@


1.3.2.2.4.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.2
log
@Added support for 82541 and 82547 based adapters.
 - These have Intel gigabit PHY
 - 82547 uses CSA interface

MFC after:	1 week
@
text
@d2 1
d31 1
@


1.2.6.1
log
@MFC: /*- and my license changes for sys/[a-d]*
@
text
@a1 1
/*-
a29 1
*/
@


1.1
log
@The README refers to a LICENSE file, so add that file too.
BTW the license is also embedded in the source files.

MFC after:	1 day
@
text
@d2 1
a2 1
Copyright (c) 2001-2002, Intel Corporation 
@


1.1.2.1
log
@MFC:
The README refers to a LICENSE file, so add that file too.
BTW the license is also embedded in the source files.
@
text
@d2 1
a2 1
Copyright (c) 2001-2003, Intel Corporation 
@


1.1.2.2
log
@MFC:
Add support for 82541 and 82547 based adapters
 - These have Intel gigabit PHY
 - 82547 uses CSA interface
Add support for DEVICE_POLLING
@
text
@@


1.1.2.3
log
@Sync up with most of the changes to RELENG_6 including using bus_dma,
new PCI IDs, lots of style changes, suspend/resume methods.  Things not
included include the INTR_FAST + taskqueue changes, link flapping
workarounds in em_ioctl(), and jumbo frame fixups for architectures that
require strict alignment.
@
text
@d2 1
a2 2
/*-
Copyright (c) 2001-2005, Intel Corporation 
a29 1
*/
@


1.1.2.4
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/4/sys/dev/em/LICENSE 162049 2006-09-05 19:48:10Z jhb $
@


