From owner-svn-src-all@freebsd.org Wed Mar 22 21:32:46 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 443C8D117D7; Wed, 22 Mar 2017 21:32:46 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1C4D61F75; Wed, 22 Mar 2017 21:32:46 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MLWjSd026305; Wed, 22 Mar 2017 21:32:45 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MLWjPp026303; Wed, 22 Mar 2017 21:32:45 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703222132.v2MLWjPp026303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 22 Mar 2017 21:32:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315742 - in head: . share/man/man4 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 21:32:46 -0000 Author: ngie Date: Wed Mar 22 21:32:44 2017 New Revision: 315742 URL: https://svnweb.freebsd.org/changeset/base/315742 Log: Merge documentation for em(4) and igb(4) Document work done by mmacy/sbruno to merge the two drivers together and convert em(4) to the iflib framework. X-MFC with: r311849 Sponsored by: Dell EMC Isilon Deleted: head/share/man/man4/igb.4 Modified: head/ObsoleteFiles.inc head/share/man/man4/em.4 Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Mar 22 21:18:18 2017 (r315741) +++ head/ObsoleteFiles.inc Wed Mar 22 21:32:44 2017 (r315742) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20170322: garbage collect old references to igb(4) +OLD_FILES+=usr/share/man/man4/if_igb.4.gz +OLD_FILES+=usr/share/man/man4/igb.4.gz # 20170319: io_test requires zh_TW.Big5 locale. OLD_FILES+=usr/tests/lib/libc/locale/io_test # 20170319: remove nls for non supported Big5* locales Modified: head/share/man/man4/em.4 ============================================================================== --- head/share/man/man4/em.4 Wed Mar 22 21:18:18 2017 (r315741) +++ head/share/man/man4/em.4 Wed Mar 22 21:32:44 2017 (r315742) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 12, 2016 +.Dd March 22, 2017 .Dt EM 4 .Os .Sh NAME @@ -58,8 +58,15 @@ driver provides support for PCI Gigabit the Intel 82540, 82541ER, 82541PI, 82542, 82543, 82544, 82545, 82546, 82546EB, 82546GB, 82547, 82571, 81572, 82573, and 82574 Ethernet controller chips. -The driver supports Transmit/Receive checksum offload -and Jumbo Frames on all but 82542-based adapters. +.Pp +The +.Nm +driver also provides support for PCI Express Gigabit Ethernet adapters +based on the Intel 82575, 82576, 82580, i21x and i35x. +.Pp +The driver supports Transmit/Receive checksum offload and Jumbo Frames +on all but 82542-based adapters. +.Pp Furthermore it supports TCP segmentation offload (TSO) on all adapters but those based on the 82543, 82544 and 82547 controller chips. The identification LEDs of the adapters supported by the @@ -71,8 +78,8 @@ For further hardware information, see th .Pa README included with the driver. .Pp -For questions related to hardware requirements, -refer to the documentation supplied with your Intel PRO/1000 adapter. +For questions related to hardware requirements, refer to the +documentation supplied with your Intel PRO/1000 adapter. All hardware requirements listed apply to use with .Fx . .Pp @@ -82,7 +89,7 @@ Selecting an MTU larger than 1500 bytes utility configures the adapter to receive and transmit Jumbo Frames. The maximum MTU size for Jumbo Frames is 16114. .Pp -This driver version supports VLANs. +This driver supports hardware assisted VLANs. The .Nm driver supports the following media types: @@ -141,10 +148,21 @@ The .Nm driver supports Gigabit Ethernet adapters based on the Intel 82540, 82541ER, 82541PI, 82542, 82543, 82544, 82545, 82546, 82546EB, -82546GB, 82547, 82571, 82572, 82573, and 82574 controller chips: +82546GB, 82547, 82571, 82572, 82573, 82574, 82575, 82576, and 82580 +controller chips: .Pp .Bl -bullet -compact .It +Intel Gigabit ET Dual Port Server Adapter (82576) +.It +Intel Gigabit VT Quad Port Server Adapter (82575) +.It +Intel Single, Dual and Quad Gigabit Ethernet Controller (82580) +.It +Intel i210 and i211 Gigabit Ethernet Controller +.It +Intel i350 and i354 Gigabit Ethernet Controller +.It Intel PRO/1000 CT Network Connection (82547) .It Intel PRO/1000 F Server Adapter (82543) @@ -280,7 +298,6 @@ issue to .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , -.Xr igb 4 , .Xr led 4 , .Xr netintro 4 , .Xr ng_ether 4 , @@ -292,8 +309,16 @@ The .Nm device driver first appeared in .Fx 4.4 . +.Nm +was merged with the igb device driver and converted to the iflib framework in +.Fx 12.0 . .Sh AUTHORS +.An -nosplit The .Nm -driver was written by +driver was originally written by .An Intel Corporation Aq Mt freebsd@intel.com . +It was merged with igb driver and converted to the iflib framework by +.An Matthew Macy Aq Mt mmacy@nextbsd.org +and +.An Sean Bruno Aq Mt sbruno@FreeBSD.org .