PERFORCE change 109172 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=109172

Change 109172 by jb at jb_freebsd8 on 2006/11/04 00:17:39

	Reset to match current.

Affected files ...

.. //depot/projects/dtrace/src/sys/dev/em/README#5 edit

Differences ...

==== //depot/projects/dtrace/src/sys/dev/em/README#5 (text+ko) ====

@@ -1,9 +1,8 @@
-//depot/projects/dtrace/src/sys/dev/em/README#2 - integrate change 100573 (text+ko)
-$FreeBSD: src/sys/dev/em/README,v 1.12 2006/04/06 17:09:02 glebius Exp $
+$FreeBSD: src/sys/dev/em/README,v 1.13 2006/08/03 09:20:11 glebius Exp $
 FreeBSD* Driver for the Intel(R) PRO/1000 Family of Adapters
 ============================================================
 
-January 4, 2006
+May 2, 2006
 
 
 Contents
@@ -23,8 +22,7 @@
 ========
 
 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
@@ -46,7 +44,8 @@
 
 
 NOTE: Mobile adapters are not fully supported.
-
+NOTE: The Intel(R) 82562v 10/100 Network Connection only provides 10/100
+support.
 
 Building and Installation
 =========================
@@ -93,14 +92,14 @@
 
         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
@@ -231,6 +230,13 @@
   - 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
   -----