Add a generic NANOSPEED wi card.

Submitted by: matt peterson

While I'm here, kill the flags 0x10000 on all the prism based cards.
Both stable and current figure this out on their own and we've had at
least one releases where this is the case.

1 files changed, 20 insertions, 16 deletions

diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index cbabfff..cb0cbef 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -1755,10 +1755,8 @@ card "PCMCIA SCSI2 CARD" "01"
 ########## wi ##########
 
 # 3com 3crwe737A AirConnect Wireless LAN PC Card
-# Results are mixed for this card.  Running under windows once supposedly
-# makes it work forever.
 card "3Com" "3CRWE737A AirConnect Wireless LAN PC Card"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1770,7 +1768,7 @@ card "Accton" "IEEE802.11 PC Card Adapter"
 
 # Addtron AWP-100
 card "Addtron" "AWP-100 Wireless PCMCIA"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1800,13 +1798,13 @@ card "BreezeNET" "PC-DS.11"
 
 # Buffalo WLI-CF-S11G
 card "BUFFALO" "WLI-CF-S11G"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Melco Airconnect 3.3V version
 card "BUFFALO" "WLI-PCM-S11"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1849,19 +1847,19 @@ card "corega K.K." "Wireless LAN PCC-11"
 
 # Corega KK Wireless LAN PCCA-11
 card "corega K.K." "Wireless LAN PCCA-11"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Corega KK Wireless LAN PCCB-11
 card "corega_K.K." "Wireless_LAN_PCCB-11"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # D Link DWL-650 11Mbps WLAN Card
 card "D" "Link DWL-650 11Mbps WLAN Card"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1897,13 +1895,13 @@ card "Geowave" "GW-NS11S"
 
 # Linksys Instant Wireless WPC11
 card "/Instant Wireless */" " Network PC CARD"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # Intel PRO/Wireless 2011 LAN PC Card
 card "Intel" "PRO/Wireless 2011 LAN PC Card"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1922,7 +1920,7 @@ card "INTERSIL" "HFA384x/IEEE"
 
 # IO Data WN-B11/PCM
 card "IO DATA" "WNB11PCM"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1946,6 +1944,12 @@ card "MELCO" "WLI-PCM-L11"
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
+# nanospeed card of some flavor.
+card "NANOSPEED" "HFA384x/IEEE"
+	config	auto "wi" ?
+	insert	/etc/pccard_ether $device start
+	remove	/etc/pccard_ether $device stop
+
 # NCR WaveLAN/IEEE
 card "NCR" "WaveLAN/IEEE"
 	config	auto "wi" ?
@@ -1972,7 +1976,7 @@ card "NEC Corporation" "Wireless PC Card"
 
 # Netgear MA401
 card "NETGEAR MA401 Wireless PC" "Card"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -1997,13 +2001,13 @@ card "PROXIM" "Harmony 802.11b/LAN PC CARD"
 
 # Proxim RangeLAN-DS (OEM of Zcommax - Prism2 card)
 card "PROXIM" "RangeLAN-DS/LAN PC CARD"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
 # SMC's SMC2632W (also matches the 3.3V SMC2602W)
 card "SMC" "SMC2632W"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
@@ -2021,7 +2025,7 @@ card "TDK" "LAK-CD011WL for Wireless LAN"
 
 # Linksys Instant Wireless WPC11 v2.5
 card "The Linksys Group, Inc." "Instant Wireless Network PC Card"
-	config	auto "wi" ? 0x10000
+	config	auto "wi" ?
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop