Merge in new driver from Intel, version 6.0.5. It adds support for

80003 NICs and NICs found on ICH8 mobos, and improves support for
already known chips.

Details:
  - if_em.c. Merged manually, viewing diff between new vendor
    driver and previous one. This was an easy task, because
    most changes between 5.1.5 and 6.0.5 are bugfixes taken
    from FreeBSD.
  - 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 restored
    revision 1.15.
  - if_em_osdep.h. Added new required macros from vendor file
    and add a hack against define namespace mangling in
    if_em_hw.h. Intel made another hack, but I prefer mine.

1 files changed, 13 insertions, 6 deletions

diff --git a/sys/dev/em/README b/sys/dev/em/README
index 0dd9c36..e001377 100644
--- a/sys/dev/em/README
+++ b/sys/dev/em/README
@@ -2,7 +2,7 @@ $FreeBSD$
 FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters
 ============================================================
 
-January 4, 2006
+May 2, 2006
 
 
 Contents
@@ -22,8 +22,7 @@ Overview
 ========
 
 This file describes the FreeBSD* driver for the Intel(R) PRO/1000 Family of
-Adapters. This driver has been developed for use with FreeBSD, Release 4.11
-and greater and Release 5.4.
+Adapters. This driver has been developed for use with FreeBSD, Release 6.x.
 
 For questions related to hardware requirements, refer to the documentation
 supplied with your Intel PRO/1000 adapter. All hardware requirements listed
@@ -45,7 +44,8 @@ http://downloadfinder.intel.com/scripts-df-external/support_intel.aspx
 
 
 NOTE: Mobile adapters are not fully supported.
-
+NOTE: The Intel(R) 82562v 10/100 Network Connection only provides 10/100
+support.
 
 Building and Installation
 =========================
@@ -92,14 +92,14 @@ name of the driver tar file.
 
         cp Makefile.kernel /usr/src/sys/modules/em/Makefile
 
-   Edit the /usr/src/sys/conf/files.i386 file, and add the following lines only if
+   Edit the /usr/src/sys/conf/files file, and add the following lines only if
    they don't already exist:
 
         dev/em/if_em.c optional em
 
         dev/em/if_em_hw.c optional em
 
-   Remove the following lines from the /usr/src/sys/conf/files.i386 file,
+   Remove the following lines from the /usr/src/sys/conf/files file,
    if they exist:
 
         dev/em/if_em_fxhw.c optional em
@@ -230,6 +230,13 @@ Identifying Your Adapter section.
   - Using Jumbo Frames at 10 or 100 Mbps may result in poor performance or
     loss of link.
 
+  - The following adapters do not support Jumbo Frames:
+    Intel(R) 82562V 10/100 Network Connection
+    Intel(R) 82566DM Gigabit Network Connection
+    Intel(R) 82566DC Gigabit Network Connection
+    Intel(R) 82566MM Gigabit Network Connection
+    Intel(R) 82566MC Gigabit Network Connection
+
 
   VLANs
   -----