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

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

diff --git a/drivers/staging/rtl8188eu/include/rtw_xmit.h b/drivers/staging/rtl8188eu/include/rtw_xmit.h
index a0853bab3edb62ef257fa8dd6ec0623a00541617..cb49aca0adced0adda8e145c27b81914dc44324a 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_xmit.h
+++ b/drivers/staging/rtl8188eu/include/rtw_xmit.h
@@ -256,15 +256,8 @@ struct     hw_txqueue {
        int     ac_tag;
 };
 
-struct agg_pkt_info {
-       u16 offset;
-       u16 pkt_len;
-};
-
 struct xmit_priv {
        spinlock_t lock;
-       struct semaphore xmit_sema;
-       struct semaphore terminate_xmitthread_sema;
        struct __queue be_pending;
        struct __queue bk_pending;
        struct __queue vi_pending;
@@ -289,7 +282,6 @@ struct      xmit_priv {
        u8      wmm_para_seq[4];/* sequence for wmm ac parameter strength
                                 * from large to small. it's value is 0->vo,
                                 * 1->vi, 2->be, 3->bk. */
-       struct semaphore tx_retevt;/* all tx return event; */
        u8              txirp_cnt;/*  */
        struct tasklet_struct xmit_tasklet;
        /* per AC pending irp */