summaryrefslogtreecommitdiff
path: root/share/man
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2001-04-14 20:04:15 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2001-04-14 20:04:15 +0000
commita2bbdf1339886fe063e3fc0e2542f2fddc9ea44f (patch)
tree56b501d1ae88a227cba4bb1a17532c9c04450a9b /share/man
parent53274b7d4b6315d0b663296610d943a5ce546454 (diff)
document updated behaviour, i think
Diffstat (limited to 'share/man')
-rw-r--r--share/man/man4/sk.418
-rw-r--r--share/man/man4/wx.429
2 files changed, 40 insertions, 7 deletions
diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4
index d0dfe816d81..01c4488efa1 100644
--- a/share/man/man4/sk.4
+++ b/share/man/man4/sk.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sk.4,v 1.7 2001/03/01 16:11:19 aaron Exp $
+.\" $OpenBSD: sk.4,v 1.8 2001/04/14 20:04:14 deraadt Exp $
.\"
.\" Copyright (c) 1997, 1998, 1999
.\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -96,9 +96,23 @@ the autoselected mode by adding media options to the appropriate
.Pa /etc/hostname.skX
file.
.It Cm media No 1000baseSX Cm mediaopt No full-duplex
-Set 1000Mbps (Gigabit Ethernet) operation and force full-duplex mode.
+Set 1000Mbps (Gigabit Ethernet) operation on fiber and force full-duplex mode.
.It Cm media No 1000baseSX Cm mediaopt No half-duplex
+Set 1000Mbps (Gigabit Ethernet) operation on fiber and force full-duplex mode.
+.It Cm media No 1000baseT Cm mediaopt
Set 1000Mbps (Gigabit Ethernet) operation and force full-duplex mode.
+.It Cm media No 100baseTX Cm mediaopt No full-duplex
+Set 100Mbps (Fast Ethernet) operation and force full-duplex mode.
+.It Cm media No 100baseTX Cm mediaopt No half-duplex
+Set 100Mbps (Fast Ethernet) operation and force half-duplex mode.
+.It Cm media No 10baseT Cm mediaopt No full-duplex
+Set 10baseT (UTP) operation and force full-duplex mode.
+.It Cm media No 10baseT Cm mediaopt No half-duplex
+Set 10baseT (UTP) operation and force half-duplex mode.
+.It Cm media No 10base5
+Set 10base5 (thick-net) operation (half-duplex only).
+.It Cm media No 10base2
+Set 10base2 (thin-net) operation (half-duplex only).
.El
.Pp
For more information on configuring this device, see
diff --git a/share/man/man4/wx.4 b/share/man/man4/wx.4
index 290556b0270..e7cf52fa2e6 100644
--- a/share/man/man4/wx.4
+++ b/share/man/man4/wx.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wx.4,v 1.6 2001/03/01 16:11:20 aaron Exp $
+.\" $OpenBSD: wx.4,v 1.7 2001/04/14 20:04:14 deraadt Exp $
.\"
.\" Copyright (c) 2000
.\" Traakan Software. All rights reserved.
@@ -39,17 +39,36 @@ The
.Nm wx
driver provides support for Intel Gigabit Ethernet PCI cards based on the
.Tn i82452
-chipset such as the Intel Pro/1000 Gigabit Server Adapter.
+chipset such as the Intel Pro/1000, PRO1000F, and PRO1000T
+Gigabit Server Adapter.
.Pp
-The following media types and options (as given to
+Various models support the following media types and options (as given to
.Xr ifconfig 8 )
are supported:
.Pp
.Bl -tag -width XXX -offset indent
+.It Cm media No autoselect
+Enable autoselection of media type and options.
+Note that this media type is only available with
+adapters that have external PHYs or built-in autonegotiation logic.
.It Cm media No 1000baseSX Cm mediaopt No full-duplex
-Set 1000Mbps (Gigabit Ethernet) operation and force full-duplex mode.
+Set 1000Mbps (Gigabit Ethernet) operation on fiber and force full-duplex mode.
.It Cm media No 1000baseSX
-Set 1000Mpbs (Gigabit Ethernet) operation.
+Set 1000Mpbs (Gigabit Ethernet) operation on fiber.
+.It Cm media No 1000baseTX
+Set 1000Mbps (Gigabit Ethernet) operation on copper.
+.It Cm media No 100baseTX Cm mediaopt No full-duplex
+Set 100Mbps (Fast Ethernet) operation and force full-duplex mode.
+.It Cm media No 100baseTX Cm mediaopt No half-duplex
+Set 100Mbps (Fast Ethernet) operation and force half-duplex mode.
+.It Cm media No 10baseT Cm mediaopt No full-duplex
+Set 10baseT (UTP) operation and force full-duplex mode.
+.It Cm media No 10baseT Cm mediaopt No half-duplex
+Set 10baseT (UTP) operation and force half-duplex mode.
+.It Cm media No 10base5
+Set 10base5 (thick-net) operation (half-duplex only).
+.It Cm media No 10base2
+Set 10base2 (thin-net) operation (half-duplex only).
.El
.Pp
For more information on configuring this device, see