PERFORCE change 139637 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=139637

Change 139637 by sam at sam_ebb on 2008/04/09 05:55:32

	o roll wlan_scan_sta into the wlan module/device; with ap
	  mode scanning already integrated there's little reason to not
	  bundle this stuff (if someone wants a stripped down system
	  we'll need to do more careful splitting and revisit the
	  need to demand-load modules)
	o cleanup some files cruft in the vacinity

Affected files ...

.. //depot/projects/vap/sys/conf/files#29 edit
.. //depot/projects/vap/sys/modules/Makefile#18 edit
.. //depot/projects/vap/sys/modules/wlan/Makefile#8 edit
.. //depot/projects/vap/sys/modules/wlan_scan_sta/Makefile#4 delete

Differences ...

==== //depot/projects/vap/sys/conf/files#29 (text+ko) ====

@@ -1688,13 +1688,13 @@
 net/zlib.c			optional crypto | geom_uzip | ipsec | \
 					 mxge | ppp_deflate | netgraph_deflate
 net80211/ieee80211.c		optional wlan
-net80211/ieee80211_acl.c	optional wlan wlan_acl
+net80211/ieee80211_acl.c	optional wlan_acl
 net80211/ieee80211_adhoc.c	optional wlan
-net80211/ieee80211_amrr.c	optional wlan wlan_amrr
+net80211/ieee80211_amrr.c	optional wlan_amrr
 net80211/ieee80211_crypto.c	optional wlan
-net80211/ieee80211_crypto_ccmp.c optional wlan wlan_ccmp
+net80211/ieee80211_crypto_ccmp.c optional wlan_ccmp
 net80211/ieee80211_crypto_none.c optional wlan
-net80211/ieee80211_crypto_tkip.c optional wlan wlan_tkip
+net80211/ieee80211_crypto_tkip.c optional wlan_tkip
 net80211/ieee80211_crypto_wep.c	optional wlan_wep
 net80211/ieee80211_ddb.c	optional wlan ddb
 net80211/ieee80211_dfs.c	optional wlan
@@ -1710,12 +1710,12 @@
 net80211/ieee80211_power.c	optional wlan
 net80211/ieee80211_proto.c	optional wlan
 net80211/ieee80211_regdomain.c	optional wlan
-net80211/ieee80211_rssadapt.c	optional wlan wlan_rssadapt
+net80211/ieee80211_rssadapt.c	optional wlan_rssadapt
 net80211/ieee80211_scan.c	optional wlan
-net80211/ieee80211_scan_sta.c	optional wlan wlan_scan_sta
+net80211/ieee80211_scan_sta.c	optional wlan
 net80211/ieee80211_sta.c	optional wlan
 net80211/ieee80211_wds.c	optional wlan
-net80211/ieee80211_xauth.c	optional wlan wlan_xauth
+net80211/ieee80211_xauth.c	optional wlan_xauth
 netatalk/aarp.c			optional netatalk
 netatalk/at_control.c		optional netatalk
 netatalk/at_proto.c		optional netatalk

==== //depot/projects/vap/sys/modules/Makefile#18 (text+ko) ====

@@ -314,7 +314,6 @@
 	wlan_amrr \
 	wlan_ccmp \
 	wlan_rssadapt \
-	wlan_scan_sta \
 	wlan_tkip \
 	wlan_wep \
 	wlan_xauth \

==== //depot/projects/vap/sys/modules/wlan/Makefile#8 (text+ko) ====

@@ -6,8 +6,8 @@
 SRCS=	ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \
 	ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \
 	ieee80211_node.c ieee80211_output.c ieee80211_phy.c ieee80211_power.c \
-	ieee80211_proto.c ieee80211_scan.c ieee80211_regdomain.c \
-	ieee80211_ht.c \
+	ieee80211_proto.c ieee80211_scan.c ieee80211_scan_sta.c \
+	ieee80211_regdomain.c ieee80211_ht.c \
 	ieee80211_adhoc.c ieee80211_hostap.c ieee80211_monitor.c \
 	ieee80211_sta.c ieee80211_wds.c
 SRCS+=	bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h