Four fixes from NetBSD:

1) Properly detect the Symbol based cards (The 3Com Airconnect and their
   ilk) and only reset them *ONCE* ever.  This appears to make them work,
   but more testing is needed.  The tests that would wedge up my machine
   completely now appear to work, but I have not real access points
   handy.
2) Report both the Station firmware and the Primary firmware on Prism
   based cards.  On Lucent based cards, only report the station firmware
   since that's all it supports.  On symbol cards, report the symbol
   specific firmware name as its station firmware.
3) Better Prism 2.5 and 3 family names.  We really need to go table
   driven for this.
4) Workaround for bugs in Intersil's firmware is only needed for at most
   0.8.2 and earlier, since 0.8.3 and later appear to work.

Obtained from: NetBSD

1 files changed, 8 insertions, 3 deletions

diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h
index 655b623..876c613 100644
--- a/sys/dev/wi/if_wivar.h
+++ b/sys/dev/wi/if_wivar.h
@@ -111,7 +111,14 @@ struct wi_softc	{
 	bus_space_handle_t	wi_bmemhandle;
 	bus_space_tag_t		wi_bmemtag;
 	void *			wi_intrhand;
-	int			wi_io_addr;    
+	int			sc_firmware_type;
+#define	WI_LUCENT	0
+#define	WI_INTERSIL	1
+#define	WI_SYMBOL	2
+	int			sc_pri_firmware_ver;	/* Primary firmware */
+	int			sc_sta_firmware_ver;	/* Station firmware */
+	int			sc_enabled;
+	int			wi_io_addr;
 	int			wi_tx_data_id;
 	int			wi_tx_mgmt_id;
 	int			wi_gone;
@@ -149,8 +156,6 @@ struct wi_softc	{
 #endif
 	struct callout_handle	wi_stat_ch;
 	struct mtx		wi_mtx;
-	int			wi_prism2;
-	int			wi_firmware_ver;
 	int			wi_nic_type;
 	int			wi_bus_type;	/* Bus attachment type */
 	struct {