Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / drivers / staging / winbond / mlme_s.h

diff --git a/drivers/staging/winbond/mlme_s.h b/drivers/staging/winbond/mlme_s.h
index 58094f61c032dfa17b0ec4eac1a529b6785835cf..ea12684a2b1daf7ead126e15aa732e3d380652fa 100644 (file)
--- a/drivers/staging/winbond/mlme_s.h
+++ b/drivers/staging/winbond/mlme_s.h
@@ -1,3 +1,12 @@
+#ifndef __WINBOND_MLME_H
+#define __WINBOND_MLME_H
+
+#include <linux/types.h>
+#include <linux/spinlock.h>
+
+#include "mac_structures.h"
+#include "mds_s.h"
+
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //     Mlme.h
 //             Define the related definitions of MLME module
@@ -125,12 +134,12 @@
 typedef struct _MLME_FRAME
 {
        //NDIS_PACKET           MLME_Packet;
-       PCHAR                   pMMPDU;
+       s8 *                    pMMPDU;
        u16                     len;
        u8                      DataType;
        u8                      IsInUsed;
 
-       OS_SPIN_LOCK    MLMESpinLock;
+       spinlock_t      MLMESpinLock;
 
     u8         TxMMPDU[MAX_NUM_TX_MMPDU][MAX_MMPDU_SIZE];
        u8              TxMMPDUInUse[ (MAX_NUM_TX_MMPDU+3) & ~0x03 ];
@@ -192,4 +201,4 @@ typedef struct _RXDATA
 
 }__attribute__ ((packed)) RXDATA, *psRXDATA;
 
-
+#endif