Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8188eu / include / rtw_event.h

diff --git a/drivers/staging/rtl8188eu/include/rtw_event.h b/drivers/staging/rtl8188eu/include/rtw_event.h
index 5c34e567d3417a2027439c369c441fb228cfdff9..df689483644be9eefbec5f1946139278357861db 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_event.h
+++ b/drivers/staging/rtl8188eu/include/rtw_event.h
@@ -18,7 +18,7 @@
 #include <osdep_service.h>
 
 #include <wlan_bssdef.h>
-#include <linux/semaphore.h>
+#include <linux/mutex.h>
 #include <linux/sem.h>
 
 /*
@@ -71,10 +71,6 @@ struct stadel_event {
        int mac_id;
 };
 
-struct addba_event {
-       unsigned int tid;
-};
-
 #define GEN_EVT_CODE(event)    event ## _EVT_
 
 struct fwevent {
@@ -84,21 +80,6 @@ struct fwevent {
 
 #define C2HEVENT_SZ                    32
 
-struct event_node {
-       unsigned char *node;
-       unsigned char evt_code;
-       unsigned short evt_sz;
-       int     *caller_ff_tail;
-       int     caller_ff_sz;
-};
-
-struct c2hevent_queue {
-       int     head;
-       int     tail;
-       struct  event_node      nodes[C2HEVENT_SZ];
-       unsigned char   seq;
-};
-
 #define NETWORK_QUEUE_SZ       4
 
 struct network_queue {