Index: stable/10/share/man/man4/cdce.4 =================================================================== --- stable/10/share/man/man4/cdce.4 (revision 277750) +++ stable/10/share/man/man4/cdce.4 (revision 277751) @@ -1,155 +1,156 @@ .\" Copyright (c) 2004 Daniel Hartmeier .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" .\" - Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" - Redistributions in binary form must reproduce the above .\" copyright notice, this list of conditions and the following .\" disclaimer in the documentation and/or other materials provided .\" with the distribution. .\" .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS .\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT .\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS .\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE .\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER .\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $NetBSD: cdce.4,v 1.4 2004/12/08 18:35:56 peter Exp $ .\" $FreeBSD$ .\" -.Dd September 17, 2005 +.Dd September 25, 2014 .Dt CDCE 4 .Os .Sh NAME .Nm cdce .Nd "USB Communication Device Class Ethernet driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device uhci" .Cd "device ohci" .Cd "device usb" .Cd "device cdce" .Ed .Pp Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent if_cdce_load="YES" .Ed .Sh DESCRIPTION The .Nm driver provides support for USB Host-to-Host (aka USB-to-USB) and USB-to-Ethernet bridges based on the USB Communication Device Class (CDC) and Ethernet subclass. .Pp The USB bridge appears as a regular network interface on both sides, transporting Ethernet frames. .Pp For more information on configuring this device, see .Xr ifconfig 8 . .Pp USB 1.x bridges support speeds of up to 12Mbps, and USB 2.0 speeds of up to 480Mbps. .Pp Packets are received and transmitted over separate USB bulk transfer endpoints. .Pp The .Nm driver does not support different media types or options. .Sh HARDWARE The following devices are supported by the .Nm driver: .Pp .Bl -bullet -compact .It Prolific PL-2501 Host-to-Host Bridge Controller .It Sharp Zaurus PDA .It Terayon TJ-715 DOCSIS Cable Modem .El .Sh DIAGNOSTICS .Bl -diag .It "cdce%d: no union descriptor" The driver could not fetch an interface descriptor from the USB device. For a manually added USB vendor/product, the CDCE_NO_UNION flag can be tried to work around the missing descriptor. .It "cdce%d: no data interface" .It "cdce%d: could not read endpoint descriptor" .It "cdce%d: unexpected endpoint" .It "cdce%d: could not find data bulk in/out" For a manually added USB vendor/product, these errors indicate that the bridge is not compatible with the driver. .It "cdce%d: watchdog timeout" A packet was queued for transmission and a transmit command was issued, however the device failed to acknowledge the transmission before a timeout expired. .It "cdce%d: no memory for rx list -- packet dropped!" Memory allocation through MGETHDR or MCLGET failed, the system is running low on mbufs. .It "cdce%d: abort/close rx/tx pipe failed" .It "cdce%d: rx/tx list init failed" .It "cdce%d: open rx/tx pipe failed" .It "cdce%d: usb error on rx/tx" .El .Sh SEE ALSO .Xr arp 4 , .Xr intro 4 , +.Xr ipheth 4 , .Xr netintro 4 , +.Xr urndis 4 , .Xr usb 4 , -.\" .Xr hostname.if 5 , .Xr ifconfig 8 .Rs .%T "Universal Serial Bus Class Definitions for Communication Devices" .%U http://www.usb.org/developers/devclass_docs/usbcdc11.pdf .Re .Rs .%T "Data sheet Prolific PL-2501 Host-to-Host Bridge/Network Controller" .%U http://tech.prolific.com.tw/visitor/fcabdl.asp?fid=20679530 .Re .Sh HISTORY The .Nm device driver first appeared in .Ox 3.6 , .Nx 3.0 and .Fx 6.0 . .Sh AUTHORS .An -nosplit The .Nm driver was written by .An Craig Boston Aq craig@tobuj.gank.org based on the .Xr aue 4 driver written by .An Bill Paul Aq wpaul@windriver.com and ported to .Ox by .An Daniel Hartmeier Aq dhartmei@openbsd.org . .Sh CAVEATS Many USB devices notoriously fail to report their class and interfaces correctly. Undetected products might work flawlessly when their vendor and product IDs are added to the driver manually. Index: stable/10/share/man/man4/urndis.4 =================================================================== --- stable/10/share/man/man4/urndis.4 (revision 277750) +++ stable/10/share/man/man4/urndis.4 (revision 277751) @@ -1,97 +1,99 @@ .\" Copyright (c) 2010 Michael Knudsen .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" .\" - Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" - Redistributions in binary form must reproduce the above .\" copyright notice, this list of conditions and the following .\" disclaimer in the documentation and/or other materials provided .\" with the distribution. .\" .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS .\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT .\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS .\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE .\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, .\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER .\" CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: urndis.4,v 1.15 2013/07/16 16:05:49 schwarze Exp $ .\" .\" $FreeBSD$ .\" -.Dd April 21, 2014 +.Dd September 25, 2014 .Dt URNDIS 4 .Os .Sh NAME .Nm urndis .Nd USB Remote NDIS Ethernet device .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device ehci" .Cd "device uhci" .Cd "device ohci" .Cd "device xhci" .Cd "device usb" .Cd "device urndis" .Ed .Pp Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent if_urndis_load="YES" .Ed .Sh DESCRIPTION The .Nm driver provides Ethernet access over Remote NDIS (RNDIS), allowing mobile devices such as phones and tablets to provide network access. It is often referred to as USB tethering, and in most cases must be explicitly enabled on the device. .Pp .Nm should work with any USB RNDIS devices, such as those commonly found on Android devices. It does not support different media types or options. For more information on configuring this device, see .Xr ifconfig 8 . .Sh SEE ALSO .Xr arp 4 , +.Xr cdce 4 , +.Xr ipheth 4 , .Xr netintro 4 , .Xr usb 4 , .Xr ifconfig 8 .Sh HISTORY The .Nm device driver first appeared in .Ox 4.7 . The first .Fx release to include it was .Fx 9.3 . .Sh AUTHORS .An -nosplit The .Nm driver was written by .An Jonathan Armani Aq Mt armani@openbsd.org , .An Michael Knudsen Aq Mt mk@openbsd.org , and .An Fabien Romano Aq Mt fabien@openbsd.org . It was ported to .Fx by .An Hans Petter Selasky Aq Mt hps@FreeBSD.org . Index: stable/10 =================================================================== --- stable/10 (revision 277750) +++ stable/10 (revision 277751) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r272107