From: Sascha Wildner Date: Sat, 24 Apr 2010 14:11:31 +0000 (+0200) Subject: Adjust a bit more for the 802.11 upgrade. X-Git-Tag: v2.7.3~51 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/4097c65c82a013d8c8e6086d6d617d5c96de510f Adjust a bit more for the 802.11 upgrade. --- diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index f58b4385fc..d32c7d8f8a 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1238,3 +1238,6 @@ TO_REMOVE+=/usr/share/man/man4/ural.4.gz TO_REMOVE+=/boot/modules/ndis.ko TO_REMOVE+=/usr/share/man/cat4/ndis.4.gz TO_REMOVE+=/usr/share/man/man4/ndis.4.gz +TO_REMOVE+=/usr/sbin/ndiscvt +TO_REMOVE+=/usr/share/man/cat8/ndiscvt.8.gz +TO_REMOVE+=/usr/share/man/man8/ndiscvt.8.gz diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index b7b8453b74..5d2c733dd0 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1134,7 +1134,7 @@ Channels identified as .Ql 11a Turbo may be used only for Atheros' Static Turbo mode (specified with -. Cm mediaopt turbo ) . +.Cm mediaopt turbo ) . Channels marked with a .Ql * have a regulatory constraint that they be passively scanned. diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4 index f66a5732cb..1d50bfa724 100644 --- a/share/man/man4/usb.4 +++ b/share/man/man4/usb.4 @@ -87,12 +87,12 @@ RealTek RTL8150 Ethernet driver .El .Ss Wireless network interfaces .Bl -tag -width ".Xr snd_uaudio 4" -offset indent -compact -.It Xr rum 4 -Ralink Technology RT2501USB/RT2601USB IEEE 802.11 driver +.\".It Xr rum 4 +.\"Ralink Technology RT2501USB/RT2601USB IEEE 802.11 driver .It Xr ubt 4 Bluetooth adapters -.It Xr ural 4 -Ralink Technology RT2500USB IEEE 802.11 driver +.\".It Xr ural 4 +.\"Ralink Technology RT2500USB IEEE 802.11 driver .El .Ss Serial and parallel interfaces .Bl -tag -width ".Xr snd_uaudio 4" -offset indent -compact diff --git a/share/man/man4/wlan_ratectl.4 b/share/man/man4/wlan_ratectl.4 deleted file mode 100644 index 59abfb0807..0000000000 --- a/share/man/man4/wlan_ratectl.4 +++ /dev/null @@ -1,102 +0,0 @@ -.\" -.\" Copyright (c) 2007 -.\" The DragonFly Project. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. 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. -.\" 3. Neither the name of The DragonFly Project nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific, prior written permission. -.\" -.\" 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. -.\" -.\" $DragonFly: src/share/man/man4/wlan_ratectl.4,v 1.2 2007/10/14 09:43:20 swildner Exp $ -.\" -.Dd June 16, 2007 -.Dt WLAN_RATECTL 4 -.Os -.Sh NAME -.Nm wlan_ratectl_amrr , -.Nm wlan_ratectl_onoe , -.Nm wlan_ratectl_sample -.Nd rate adaptation support for 802.11 devices -.Sh SYNOPSIS -.Cd "device wlan_ratectl_amrr" -.Cd "device wlan_ratectl_onoe" -.Cd "device wlan_ratectl_sample" -.Sh DESCRIPTION -.Dx -supports several TX rate control algorithms for use with 802.11 devices via the -.Nm wlan_ratectl -modules: -.Bl -tag -width ".Sy sample" -offset indent -.It Sy amrr -Adaptive Multi Rate Retry -.It Sy onoe -Atsushi Onoe's algorithm -.It Sy sample -John C. Bicket's SampleRate algorithm -.El -.Pp -The following devices support TX rate control: -.Xr acx 4 , -.Xr bwi 4 , -.Xr ral 4 , -.Xr rtw 4 , -.Xr rum 4 -and -.Xr ural 4 . -See the individual drivers' manual pages for more information on which -algorithms are supported. -.Pp -To select a TX rate control algorithm, use the -.Cm ratectl -parameter of -.Xr ifconfig 8 . -.Sh SEE ALSO -.Xr acx 4 , -.Xr bwi 4 , -.Xr ral 4 , -.Xr rtw 4 , -.Xr rum 4 , -.Xr ural 4 , -.Xr wlan 4 , -.Xr ifconfig 8 -.Sh STANDARDS -The following papers have more information on the algorithms: -.Bl -tag -width "SampleRate" -.It AMRR -.Pa http://hal.inria.fr/inria-00070784/en/ -.It SampleRate -.Pa http://www.pdos.lcs.mit.edu/papers/jbicket-ms.pdf -.El -.Sh HISTORY -The -.Nm wlan_ratectl_amrr -and -.Nm wlan_ratectl_onoe -modules first appeared in -.Dx 1.7 . -The -.Nm wlan_ratectl_sample -module first appeared in -.Dx 1.9 . diff --git a/usr.sbin/802_11/hostapd/hostapd.8 b/usr.sbin/802_11/hostapd/hostapd.8 index deed6ae2ae..4378a3b247 100644 --- a/usr.sbin/802_11/hostapd/hostapd.8 +++ b/usr.sbin/802_11/hostapd/hostapd.8 @@ -109,10 +109,10 @@ Store PID in .El .Sh SEE ALSO .Xr ath 4 , -.Xr ipw 4 , -.Xr iwi 4 , +.\".Xr ipw 4 , +.\".Xr iwi 4 , .Xr ral 4 , -.Xr ural 4 , +.\".Xr ural 4 , .Xr wi 4 , .Xr hostapd.conf 5 , .Xr hostapd_cli 8 , diff --git a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 index fb89507184..81a46df087 100644 --- a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 +++ b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 @@ -126,15 +126,15 @@ Display the license for this program on the terminal and exit. .Sh SEE ALSO .Xr an 4 , .Xr ath 4 , -.Xr ipw 4 , -.Xr iwi 4 , +.\".Xr ipw 4 , +.\".Xr iwi 4 , .Xr ral 4 , -.Xr rum 4 , -.Xr ural 4 , +.\".Xr rum 4 , +.\".Xr ural 4 , .Xr wi 4 , .Xr wlan 4 , -.Xr wpi 4 , -.Xr zyd 4 , +.\".Xr wpi 4 , +.\".Xr zyd 4 , .Xr wpa_supplicant.conf 5 , .Xr devd 8 , .Xr ifconfig 8 , diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 091eb33a89..dc874d6d69 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -67,7 +67,6 @@ SUBDIR= 802_11 \ mrouted \ mtest \ mtree \ - ndiscvt \ ndp \ newsyslog \ ngctl \ @@ -140,6 +139,9 @@ SUBDIR= 802_11 \ ypset \ zic +# XXX re-add when adjusted to the new 802.11 framework +#MAN+= ndiscvt \ + .if !defined(NO_IPFILTER) SUBDIR+=ipftest \ ipresend \