diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8712/rtl871x_event.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/rtl871x_event.h')
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_event.h | 95 |
1 files changed, 95 insertions, 0 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_event.h b/drivers/staging/rtl8712/rtl871x_event.h new file mode 100644 index 0000000..d452293 --- /dev/null +++ b/drivers/staging/rtl8712/rtl871x_event.h @@ -0,0 +1,95 @@ +#ifndef _RTL871x_EVENT_H_ +#define _RTL871x_EVENT_H_ + +#include "osdep_service.h" + +#include "wlan_bssdef.h" +#include <linux/semaphore.h> +#include <linux/sem.h> + +/* + * Used to report a bss has been scanned +*/ +struct survey_event { + struct ndis_wlan_bssid_ex bss; +}; + +/* + * Used to report that the requested site survey has been done. + * bss_cnt indicates the number of bss that has been reported. +*/ +struct surveydone_event { + unsigned int bss_cnt; + +}; + +/* + * Used to report the link result of joinning the given bss + * join_res: + * -1: authentication fail + * -2: association fail + * > 0: TID +*/ +struct joinbss_event { + struct wlan_network network; +}; + +/* + * Used to report a given STA has joinned the created BSS. + * It is used in AP/Ad-HoC(M) mode. +*/ +struct stassoc_event { + unsigned char macaddr[6]; + unsigned char rsvd[2]; + int cam_id; +}; + +struct stadel_event { + unsigned char macaddr[6]; + unsigned char rsvd[2]; +}; + +struct addba_event { + unsigned int tid; +}; + +#define GEN_EVT_CODE(event) event ## _EVT_ + +struct fwevent { + u32 parmsize; + void (*event_callback)(struct _adapter *dev, u8 *pbuf); +}; + +#define C2HEVENT_SZ 32 +struct event_node{ + unsigned char *node; + unsigned char evt_code; + unsigned short evt_sz; + /*volatile*/ int *caller_ff_tail; + int caller_ff_sz; +}; + +struct c2hevent_queue { + /*volatile*/ int head; + /*volatile*/ int tail; + struct event_node nodes[C2HEVENT_SZ]; + unsigned char seq; +}; + +#define NETWORK_QUEUE_SZ 4 + +struct network_queue { + /*volatile*/ int head; + /*volatile*/ int tail; + struct wlan_bssid_ex networks[NETWORK_QUEUE_SZ]; +}; + +struct ADDBA_Req_Report_parm { + unsigned char MacAddress[ETH_ALEN]; + unsigned short StartSeqNum; + unsigned char tid; +}; +#include "rtl8712_event.h" + +#endif /* _WLANEVENT_H_ */ + |