View | Details | Raw Unified | Return to bug 197143 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/wpi/if_wpivar.h (-3 / +3 lines)
Lines 213-220 Link Here
213
	void			(*sc_scan_curchan)(struct ieee80211_scan_state *,
213
	void			(*sc_scan_curchan)(struct ieee80211_scan_state *,
214
				    unsigned long);
214
				    unsigned long);
215
215
216
	struct wpi_rx_radiotap_header sc_rxtap;
216
	struct wpi_rx_radiotap_header	sc_rxtap;
217
	struct wpi_tx_radiotap_header sc_txtap;
217
	struct wpi_tx_radiotap_header	sc_txtap;
218
218
219
	/* Firmware image. */
219
	/* Firmware image. */
220
	const struct firmware	*fw_fp;
220
	const struct firmware	*fw_fp;
Lines 254-260 Link Here
254
	    MTX_NETWORK_LOCK, MTX_DEF)
254
	    MTX_NETWORK_LOCK, MTX_DEF)
255
#define WPI_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
255
#define WPI_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
256
#define WPI_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
256
#define WPI_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
257
#define WPI_LOCK_ASSERT(sc)	mtx_assert(&(sc)->sc_mtx, MA_OWNED)
257
#define WPI_LOCK_ASSERT(_sc)	mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
258
#define WPI_LOCK_DESTROY(_sc)	mtx_destroy(&(_sc)->sc_mtx)
258
#define WPI_LOCK_DESTROY(_sc)	mtx_destroy(&(_sc)->sc_mtx)
259
259
260
#define WPI_RXON_LOCK_INIT(_sc) \
260
#define WPI_RXON_LOCK_INIT(_sc) \

Return to bug 197143