Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / winbond / core.h

diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
index b87d6c07600f6f270dea6f4145a1e3ad0668f99a..2b87a0007319514fab692a40bb420dacd5ab3098 100644 (file)
--- a/drivers/staging/winbond/core.h
+++ b/drivers/staging/winbond/core.h
@@ -2,39 +2,60 @@
 #define __WINBOND_CORE_H
 
 #include <linux/wireless.h>
+#include <linux/types.h>
 
-#include "mlme_s.h"
 #include "wbhal_s.h"
 #include "mto.h"
 
+#include "mac_structures.h"
+#include "mds_s.h"
+
+#define MAX_NUM_TX_MMPDU               2
+#define MAX_MMPDU_SIZE                 1512
+#define MAX_NUM_RX_MMPDU               6
+
+struct mlme_frame {
+       s8              *pMMPDU;
+       u16             len;
+       u8              DataType;
+       u8              IsInUsed;
+
+       u8              TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE];
+       u8              TxMMPDUInUse[(MAX_NUM_TX_MMPDU + 3) & ~0x03];
+
+       u16             wNumTxMMPDU;
+       u16             wNumTxMMPDUDiscarded;
+
+       u8              RxMMPDU[MAX_NUM_RX_MMPDU][MAX_MMPDU_SIZE];
+       u8              SaveRxBufSlotInUse[(MAX_NUM_RX_MMPDU + 3) & ~0x03];
+
+       u16             wNumRxMMPDU;
+       u16             wNumRxMMPDUDiscarded;
+
+       u16             wNumRxMMPDUInMLME;      /* Number of the Rx MMPDU */
+       u16             reserved_1;             /*  in MLME. */
+                                               /*  excluding the discarded */
+};
+
 #define WBLINUX_PACKET_ARRAY_SIZE (ETHERNET_TX_DESCRIPTORS*4)
 
 #define WB_MAX_LINK_NAME_LEN 40
 
 struct wbsoft_priv {
-       u32 adapterIndex;       /* 20060703.4 Add for using padapterContext
-                                                       global adapter point */
-
        struct wb_local_para sLocalPara;        /* Myself connected
                                                        parameters */
 
-       MLME_FRAME sMlmeFrame;  /* connect to peerSTA parameters */
+       struct mlme_frame sMlmeFrame;   /* connect to peerSTA parameters */
 
        struct wb35_mto_params sMtoPara;        /* MTO_struct ... */
        struct hw_data sHwData; /*For HAL */
        struct wb35_mds Mds;
 
-       spinlock_t SpinLock;
-
        atomic_t ThreadCount;
 
        u32 RxByteCount;
        u32 TxByteCount;
 
-       struct sk_buff *packet_return;
-       s32 netif_state_stop;   /* 1: stop  0: normal */
-       struct iw_statistics iw_stats;
-
        u8 LinkName[WB_MAX_LINK_NAME_LEN];
 
        bool enabled;