The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5f375fdbdfdb8ca48cf668069d4259dc7d48e4a6
commit 5f375fdbdfdb8ca48cf668069d4259dc7d48e4a6 Author: Alexander Ziaee <concussi...@runbox.com> AuthorDate: 2024-03-20 17:15:51 +0000 Commit: Mitchell Horne <mho...@freebsd.org> CommitDate: 2024-04-18 18:16:56 +0000 em.4: add interfaces to name section Improving first-glance comprehension that this manual page applies to igb/lem interfaces provided by the em(4) driver. While here, tag SPDX, link the framework, and shuffle a sentence to fix linter warning. Co-authored-by: mhorne Reviewed by: mhorne MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/1134 (cherry picked from commit 501f7e7bf847c66e3869b533805e76897e4685b9) --- share/man/man4/em.4 | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/share/man/man4/em.4 b/share/man/man4/em.4 index 13bbfbf148bc..0e9c08560545 100644 --- a/share/man/man4/em.4 +++ b/share/man/man4/em.4 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 2001-2003, Intel Corporation .\" All rights reserved. .\" @@ -29,11 +32,13 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd August 3, 2023 +.Dd March 20, 2024 .Dt EM 4 .Os .Sh NAME -.Nm em +.Nm em , +.Nm lem , +.Nm igb .Nd "Intel(R) PRO/1000 Gigabit Ethernet adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, @@ -72,9 +77,9 @@ Controller Hub (ICH) and Platform Controller Hub (PCH) including Intel The .Nm driver provides support for PCI Express Gigabit Ethernet adapters -based on the Intel 82575, 82576, 82580, i210, i211, and i35x. These -appear as -.Cm igb +based on the Intel 82575, 82576, 82580, i210, i211, and i35x. +These appear as +.Nm igb interfaces to maintain compatibility with existing infrastructure. .Pp The driver supports Transmit/Receive checksum offload and Jumbo Frames @@ -319,7 +324,12 @@ The device driver first appeared in .Fx 4.4 . .Nm -was merged with the lem and igb device driver and converted to the iflib +was merged with the +.Nm lem +and +.Nm igb +device drivers and converted to the +.Xr iflib 4 framework in .Fx 12.0 . .Sh AUTHORS @@ -328,7 +338,11 @@ The .Nm driver was originally written by .An Intel Corporation Aq Mt free...@intel.com . -It was merged with igb driver and converted to the iflib framework by +It was merged with the +.Nm igb +driver and converted to the +.Xr iflib 4 +framework by .An Matthew Macy Aq Mt mm...@mattmacy.io and .An Sean Bruno Aq Mt sbr...@freebsd.org .