Merge branch 'master' into for-linus

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

diff --git a/drivers/staging/winbond/mlmetxrx_f.h b/drivers/staging/winbond/mlmetxrx_f.h
index 5f108d87f6e22e7744007d3de80403a0024d6854..6c04e3e03e3116b3a41c808b65bd8ccd901f4b37 100644 (file)
--- a/drivers/staging/winbond/mlmetxrx_f.h
+++ b/drivers/staging/winbond/mlmetxrx_f.h
@@ -8,45 +8,18 @@
 #ifndef _MLMETXRX_H
 #define _MLMETXRX_H
 
-void
-MLMEProcThread(
-     struct wb35_adapter *    adapter
-       );
-
-void MLMEResetTxRx( struct wb35_adapter * adapter);
-
-u8 *
-MLMEGetMMPDUBuffer(
-     struct wb35_adapter *    adapter
-   );
-
-void MLMEfreeMMPDUBuffer( struct wb35_adapter * adapter,  s8 * pData);
+#include "core.h"
 
-void MLME_GetNextPacket(  struct wb35_adapter * adapter,  PDESCRIPTOR pDes );
-u8 MLMESendFrame( struct wb35_adapter * adapter,
-                                       u8      *pMMPDU,
-                                       u16     len,
-                                        u8     DataType);
+void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *pDes);
+u8 MLMESendFrame(struct wbsoft_priv *adapter,
+                u8 * pMMPDU, u16 len, u8 DataType);
 
 void
-MLME_SendComplete(  struct wb35_adapter * adapter,  u8 PacketID,  unsigned char SendOK );
+MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID,
+                 unsigned char SendOK);
 
-void
-MLMERcvFrame(
-     struct wb35_adapter *    adapter,
-     PRXBUFFER        pRxBufferArray,
-     u8            NumOfBuffer,
-     u8            ReturnSlotIndex
-       );
-
-void
-MLMEReturnPacket(
-     struct wb35_adapter *    adapter,
-     u8 *          pRxBufer
-   );
 #ifdef _IBSS_BEACON_SEQ_STICK_
-s8 SendBCNullData(struct wb35_adapter * adapter, u16 wIdx);
+s8 SendBCNullData(struct wbsoft_priv *adapter, u16 wIdx);
 #endif
 
 #endif
-