Add msk(4) info to the sk(4) manpage, and install links (from OpenBSD).

Also, add msk to DEVNAMES.

distrib/sets/lists/man/mi

@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.928 2006/09/07 14:22:08 itohy Exp $
+# $NetBSD: mi,v 1.929 2006/09/09 23:52:27 riz Exp $
 ./etc/mtree/set.man				man-sys-root
 ./usr/share/info/am-utils.info			man-amd-info		info
 ./usr/share/info/as.info			man-computil-info	bfd,info
@@ -1069,6 +1069,8 @@
 ./usr/share/man/cat4/mpt.0			man-sys-catman		.cat
 ./usr/share/man/cat4/mpu.0			man-sys-catman		.cat
 ./usr/share/man/cat4/mr.0			man-sys-catman		.cat
+./usr/share/man/cat4/msk.0			man-sys-catman		.cat
+./usr/share/man/cat4/mskc.0			man-sys-catman		.cat
 ./usr/share/man/cat4/mtd.0			man-sys-catman		.cat
 ./usr/share/man/cat4/mtio.0			man-sys-catman		.cat
 ./usr/share/man/cat4/multicast.0		man-sys-catman		.cat
@@ -3440,6 +3442,8 @@
 ./usr/share/man/man4/mpt.4			man-sys-man		.man
 ./usr/share/man/man4/mpu.4			man-sys-man		.man
 ./usr/share/man/man4/mr.4			man-sys-man		.man
+./usr/share/man/man4/msk.4			man-sys-man		.man
+./usr/share/man/man4/mskc.4			man-sys-man		.man
 ./usr/share/man/man4/mtd.4			man-sys-man		.man
 ./usr/share/man/man4/mtio.4			man-sys-man		.man
 ./usr/share/man/man4/multicast.4		man-sys-man		.man

share/man/man4/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.403 2006/09/07 14:22:08 itohy Exp $
+#	$NetBSD: Makefile,v 1.404 2006/09/09 23:52:27 riz Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 adc.4 adt7467c.4 adv.4 \
@@ -138,7 +138,7 @@ MLINKS+=scsi.4 atapi.4
 MLINKS+=scsi.4 atapibus.4
 MLINKS+=scsi.4 scsibus.4
 MLINKS+=si.4 sw.4
-MLINKS+=sk.4 skc.4
+MLINKS+=sk.4 skc.4 sk.4 msk.4 sk.4 mskc.4
 MLINKS+=sl.4 slip.4
 MLINKS+=speaker.4 spkr.4
 MLINKS+=tty.4 dty.4

share/man/man4/pci.4

@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.83 2006/03/16 10:27:50 wiz Exp $
+.\"	$NetBSD: pci.4,v 1.84 2006/09/09 23:52:27 riz Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 13, 2006
+.Dd September 9, 2006
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -259,6 +259,10 @@ Note, the
 driver supersedes this driver.
 .It lmc
 LAN Media Corp WAN interfaces.
+.It msk
+Marvell Yukon 2 based Gigabit
+.Tn Ethernet
+interfaces.
 .It ne
 NE2000-compatible
 .Tn Ethernet

share/man/man4/sk.4

@@ -1,4 +1,4 @@
-.\"	$NetBSD: sk.4,v 1.9 2006/03/28 18:32:49 riz Exp $
+.\"	$NetBSD: sk.4,v 1.10 2006/09/09 23:52:27 riz Exp $
 .\"
 .\" Copyright (c) 2003, The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -31,7 +31,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: sk.4,v 1.20 2003/08/17 00:59:58 nate Exp $
+.\"	$OpenBSD: sk.4,v 1.41 2006/08/16 22:01:56 kettenis Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -65,7 +65,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/man4.i386/sk.4,v 1.3 1999/08/28 00:20:29 peter Exp $
 .\"
-.Dd March 28, 2006
+.Dd September 9, 2006
 .Dt SK 4
 .Os
 .Sh NAME
@@ -75,6 +75,8 @@
 .Sh SYNOPSIS
 .Cd "skc* at pci? dev ? function ?"
 .Cd "sk* at skc?"
+.Cd "mskc* at pci? dev ? function ?"
+.Cd "msk* at skc?"
 .Sh DESCRIPTION
 The
 .Nm sk
@@ -112,6 +114,52 @@ Linksys EG1032v2 single-port, copper adapter
 Linksys EG1064v2 single-port, copper adapter
 .El
 .Pp
+The
+.Nm msk
+driver provides support for the Marvell Yukon-2 based Gigabit Ethernet
+adapters, including the following:
+.Pp
+.Bl -bullet -offset indent -compact
+.It
+Marvell Yukon 88E8035, copper adapter
+.It
+Marvell Yukon 88E8036, copper adapter
+.It
+Marvell Yukon 88E8038, copper adapter
+.It
+Marvell Yukon 88E8050, copper adapter
+.It
+Marvell Yukon 88E8052, copper adapter
+.It
+Marvell Yukon 88E8053, copper adapter
+.It
+SK-9E21 1000Base-T single port, copper adapter
+.It
+SK-9E22 1000Base-T dual port, copper adapter
+.It
+SK-9E81 1000Base-SX single port, multimode fiber adapter
+.It
+SK-9E82 1000Base-SX dual port, multimode fiber adapter
+.It
+SK-9E91 1000Base-LX single port, single mode fiber adapter
+.It
+SK-9E92 1000Base-LX dual port, single mode fiber adapter
+.It
+SK-9S21 1000Base-T single port, copper adapter
+.It
+SK-9S22 1000Base-T dual port, copper adapter
+.It
+SK-9S81 1000Base-SX single port, multimode fiber adapter
+.It
+SK-9S82 1000Base-SX dual port, multimode fiber adapter
+.It
+SK-9S91 1000Base-LX single port, single mode fiber adapter
+.It
+SK-9S92 1000Base-LX dual port, single mode fiber adapter
+.It
+SK-9E21D 1000Base-T single port, copper adapter
+.El
+.Pp
 The SysKonnect based adapters consist of two main components: the
 XaQti Corp. XMAC II Gigabit MAC
 .Pq Nm sk
@@ -221,11 +269,20 @@ support was added in
 .Nx
 support was added in
 .Nx 2.0 .
+.Pp
+The
+.Nm msk
+driver first appeared in
+.Ox 4.0 ,
+and was ported to
+.Nx 4.0 .
 .Sh AUTHORS
 The
 .Nm
 driver was written by
 .An Bill Paul Aq wpaul@ctr.columbia.edu .
+Support for the Marvell Yukon-2 was added by
+.An Mark Kettenis Aq kettenis@openbsd.org .
 .Sh BUGS
 This driver is
 .Em experimental .

sys/dev/DEVNAMES

@@ -1,4 +1,4 @@
-#	$NetBSD: DEVNAMES,v 1.215 2006/09/07 14:22:07 itohy Exp $
+#	$NetBSD: DEVNAMES,v 1.216 2006/09/09 23:52:27 riz Exp $
 #
 # This file contains all used device names and defined attributes in
 # alphabetical order. New devices added to the system somewhere should first
@@ -854,6 +854,7 @@ msc			amiga
 msc			amigappc
 mscp			MI		Attribute
 mscpbus			MI
+msk			MI
 msiiep			sparc
 msiop			mvme68k		Attribute
 mspcic			sparc