1 files changed, 25 insertions, 27 deletions

diff --git a/sys/dev/ipw/if_ipwvar.h b/sys/dev/ipw/if_ipwvar.h
index f6ec999..de35019 100644
--- a/sys/dev/ipw/if_ipwvar.h
+++ b/sys/dev/ipw/if_ipwvar.h
@@ -76,30 +76,40 @@ struct ipw_tx_radiotap_header {
 	((1 << IEEE80211_RADIOTAP_FLAGS) |				\
 	 (1 << IEEE80211_RADIOTAP_CHANNEL))
 
+struct ipw_vap {
+	struct ieee80211vap	vap;
+	struct task		assoc_task;
+	struct task		disassoc_task;
+	struct task		assoc_success_task;
+	struct task		assoc_failed_task;
+	struct task		scandone_task;
+
+	int			(*newstate)(struct ieee80211vap *,
+				    enum ieee80211_state, int);
+};
+#define	IPW_VAP(vap)	((struct ipw_vap *)(vap))
+
 struct ipw_softc {
 	struct ifnet			*sc_ifp;
-	struct ieee80211com		sc_ic;
-	int				(*sc_newstate)(struct ieee80211com *,
-					    enum ieee80211_state, int);
 	device_t			sc_dev;
 
 	struct mtx			sc_mtx;
 	struct task			sc_init_task;
 	struct task			sc_scan_task;
 	struct task			sc_chan_task;
-	struct task			sc_assoc_task;
-	struct task			sc_disassoc_task;
+	struct task			sc_bmiss_task;
 	struct callout			sc_wdtimer;	/* watchdog timer */
 
 	uint32_t			flags;
-#define IPW_FLAG_FW_INITED		(1 << 0)
-#define IPW_FLAG_INIT_LOCKED		(1 << 1)
-#define IPW_FLAG_HAS_RADIO_SWITCH	(1 << 2)
-#define	IPW_FLAG_HACK			(1 << 3)
-#define	IPW_FLAG_SCANNING		(1 << 4)
-#define	IPW_FLAG_ENABLED		(1 << 5)
-#define	IPW_FLAG_BUSY			(1 << 6)
-#define	IPW_FLAG_ASSOCIATED		(1 << 7)
+#define IPW_FLAG_FW_INITED		0x0001
+#define IPW_FLAG_INIT_LOCKED		0x0002
+#define IPW_FLAG_HAS_RADIO_SWITCH	0x0004
+#define	IPW_FLAG_HACK			0x0008
+#define	IPW_FLAG_SCANNING		0x0010
+#define	IPW_FLAG_ENABLED		0x0020
+#define	IPW_FLAG_BUSY			0x0040
+#define	IPW_FLAG_ASSOCIATING		0x0080
+#define	IPW_FLAG_ASSOCIATED		0x0100
 
 	int				irq_rid;
 	int				mem_rid;
@@ -152,22 +162,10 @@ struct ipw_softc {
 	uint32_t			rxcur;
 	int				txfree;
 
-	int				dwelltime;
-
-	struct bpf_if			*sc_drvbpf;
-
-	union {
-		struct ipw_rx_radiotap_header th;
-		uint8_t	pad[64];
-	} sc_rxtapu;
-#define sc_rxtap	sc_rxtapu.th
+	struct ipw_rx_radiotap_header	sc_rxtap;
 	int				sc_rxtap_len;
 
-	union {
-		struct ipw_tx_radiotap_header th;
-		uint8_t	pad[64];
-	} sc_txtapu;
-#define sc_txtap	sc_txtapu.th
+	struct ipw_tx_radiotap_header	sc_txtap;
 	int				sc_txtap_len;
 };