From 1d97534a3f4fe7aef1fcd2100537e77276c44597 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 18 Jul 2010 18:24:45 +0200 Subject: [PATCH] iwi(4): Hook it into the build again and enable it everywhere else. --- Makefile_upgrade.inc | 3 --- share/man/man4/Makefile | 2 +- share/man/man4/wlan.4 | 2 +- share/man/man9/ieee80211_node.9 | 18 +++++++++--------- sys/config/LINT | 2 +- sys/dev/netif/Makefile | 4 ++-- sys/dev/netif/iwi/Makefile | 4 +--- usr.sbin/802_11/hostapd/hostapd.8 | 2 +- .../802_11/wpa_supplicant/wpa_supplicant.8 | 2 +- 9 files changed, 17 insertions(+), 22 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 44008dde40..6599b6c1e8 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1364,9 +1364,6 @@ TO_REMOVE+=/usr/share/man/man4/acx.4.gz TO_REMOVE+=/boot/modules/if_bwi.ko TO_REMOVE+=/usr/share/man/cat4/bwi.4.gz TO_REMOVE+=/usr/share/man/man4/bwi.4.gz -TO_REMOVE+=/boot/modules/if_iwi.ko -TO_REMOVE+=/usr/share/man/cat4/iwi.4.gz -TO_REMOVE+=/usr/share/man/man4/iwi.4.gz TO_REMOVE+=/boot/modules/if_iwl.ko TO_REMOVE+=/usr/share/man/cat4/iwl.4.gz TO_REMOVE+=/usr/share/man/man4/iwl.4.gz diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 7b64c3ba68..dd067eaa3c 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -118,6 +118,7 @@ MAN= aac.4 \ isp.4 \ ispfw.4 \ it.4 \ + iwi.4 \ jme.4 \ joy.4 \ kate.4 \ @@ -348,7 +349,6 @@ MAN= aac.4 \ # XXX re-add when adjusted to the new 802.11 framework #MAN+= acx.4 \ # bwi.4 \ -# iwi.4 \ # iwl.4 \ # rtw.4 \ # rum.4 \ diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4 index fa707b0d67..1d8f62e7ef 100644 --- a/share/man/man4/wlan.4 +++ b/share/man/man4/wlan.4 @@ -234,7 +234,7 @@ may not interoperate. .Xr ath 4 , .\".Xr bwi 4 , .\".Xr ipw 4 , -.\".Xr iwi 4 , +.Xr iwi 4 , .\".Xr iwl 4 , .\".Xr iwn 4 , .\".Xr malo 4 , diff --git a/share/man/man9/ieee80211_node.9 b/share/man/man9/ieee80211_node.9 index 5761a68424..515b2b916f 100644 --- a/share/man/man9/ieee80211_node.9 +++ b/share/man/man9/ieee80211_node.9 @@ -167,15 +167,15 @@ The driver method must allocate a structure that is an extension of the .Vt ieee80211_node structure. -.\"For example the -.\".Xr iwi 4 -.\"driver defines a private node structure as: -.\".Bd -literal -offset indent -.\"struct iwi_node { -.\" struct ieee80211_node in_node; -.\" int in_station; -.\"}; -.\".Ed +For example the +.Xr iwi 4 +driver defines a private node structure as: +.Bd -literal -offset indent +struct iwi_node { + struct ieee80211_node in_node; + int in_station; +}; +.Ed .Pp and then provides a private allocation routine that does this: .Bd -literal -offset indent diff --git a/sys/config/LINT b/sys/config/LINT index c5ee8cb650..ca2acedb7d 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -1449,7 +1449,7 @@ options ATH_DIAGAPI # diagnostic interface to the HAL options ATH_RXBUF=80 # number of RX buffers to allocate options ATH_TXBUF=400 # number of TX buffers to allocate #device iwl # Intel PRO/Wireless 2100 -#device iwi # Intel PRO/Wireless 2200BG/2915ABG +device iwi # Intel PRO/Wireless 2200BG/2915ABG device wi # WaveLAN/IEEE, PRISM-II, Spectrum24 802.11DS #device rtw # RealTek 8180 #device acx # TI ACX100/ACX111. diff --git a/sys/dev/netif/Makefile b/sys/dev/netif/Makefile index 247e6a8197..0b82df8b57 100644 --- a/sys/dev/netif/Makefile +++ b/sys/dev/netif/Makefile @@ -3,11 +3,11 @@ SUBDIR= an age alc ale ar ath aue axe bce bfe bge \ cue dc ed em ep et fwe \ - fxp jme kue lge lnc mii_layer my msk mxge nfe nge pcn ral re \ + fxp iwi jme kue lge lnc mii_layer my msk mxge nfe nge pcn ral re \ rl rue sbni sbsh sf sis sk sln sr ste stge ti tl tx txp \ vge vr vx wb wi wpi xe xl ig_hal emx ae # XXX need to be updated to the new net80211 stack -# SUBDIR= acx bwi iwi iwl rtw rum ural +# SUBDIR= acx bwi iwl rtw rum ural .include diff --git a/sys/dev/netif/iwi/Makefile b/sys/dev/netif/iwi/Makefile index 4c924ba4d0..d71c746a90 100644 --- a/sys/dev/netif/iwi/Makefile +++ b/sys/dev/netif/iwi/Makefile @@ -1,5 +1,3 @@ -# $DragonFly: src/sys/dev/netif/iwi/Makefile,v 1.3 2005/06/27 11:28:54 corecode Exp $ -# KMOD = if_iwi SRCS = if_iwi.c \ device_if.h \ @@ -7,7 +5,7 @@ SRCS = if_iwi.c \ pci_if.h \ opt_inet.h -#WARNS?=6 +SUBDIR = fw .if !defined(BUILDING_WITH_KERNEL) opt_inet.h: diff --git a/usr.sbin/802_11/hostapd/hostapd.8 b/usr.sbin/802_11/hostapd/hostapd.8 index 4378a3b247..aba35571d3 100644 --- a/usr.sbin/802_11/hostapd/hostapd.8 +++ b/usr.sbin/802_11/hostapd/hostapd.8 @@ -110,7 +110,7 @@ Store PID in .Sh SEE ALSO .Xr ath 4 , .\".Xr ipw 4 , -.\".Xr iwi 4 , +.Xr iwi 4 , .Xr ral 4 , .\".Xr ural 4 , .Xr wi 4 , diff --git a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 index 3d66e2b150..712efa029e 100644 --- a/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 +++ b/usr.sbin/802_11/wpa_supplicant/wpa_supplicant.8 @@ -127,7 +127,7 @@ Display the license for this program on the terminal and exit. .Xr an 4 , .Xr ath 4 , .\".Xr ipw 4 , -.\".Xr iwi 4 , +.Xr iwi 4 , .Xr ral 4 , .\".Xr rum 4 , .\".Xr ural 4 , -- 2.41.0