1c1
< /* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 178676 2008-04-29 21:36:17Z sam $ */
---
> /* $FreeBSD: head/sys/dev/iwn/if_iwnvar.h 191746 2009-05-02 15:14:18Z thompsa $ */
183,206d182
< /* command queue related variables */
< #define IWN_SCAN_START (1<<0)
< #define IWN_SCAN_CURCHAN (1<<1)
< #define IWN_SCAN_STOP (1<<2)
< #define IWN_SET_CHAN (1<<3)
< #define IWN_AUTH (1<<4)
< #define IWN_SCAN_NEXT (1<<5)
< #define IWN_RUN (1<<6)
< #define IWN_RADIO_ENABLE (1<<7)
< #define IWN_RADIO_DISABLE (1<<8)
< #define IWN_REINIT (1<<9)
< #define IWN_CMD_MAXOPS 10
< /* command queuing request type */
< #define IWN_QUEUE_NORMAL 0
< #define IWN_QUEUE_CLEAR 1
< int sc_cmd[IWN_CMD_MAXOPS];
< int sc_cmd_arg[IWN_CMD_MAXOPS];
< int sc_cmd_cur; /* current queued scan task */
< int sc_cmd_next; /* last queued scan task */
< struct mtx sc_cmdlock;
<
< /* Task queues used to control the driver */
< struct taskqueue *sc_tq; /* Main command task queue */
<
208,209c184,186
< struct task sc_ops_task; /* deferred ops */
< struct task sc_bmiss_task; /* beacon miss */
---
> struct task sc_reinit_task;
> struct task sc_radioon_task;
> struct task sc_radiooff_task;
237,242d213
< #define IWN_CMD_LOCK_INIT(_sc) \
< mtx_init(&(_sc)->sc_cmdlock, device_get_nameunit((_sc)->sc_dev), \
< NULL, MTX_DEF);
< #define IWN_CMD_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_cmdlock)
< #define IWN_CMD_LOCK(_sc) mtx_lock(&(_sc)->sc_cmdlock)
< #define IWN_CMD_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_cmdlock)