Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / drivers / staging / winbond / mlmetxrx.c

diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
index ee80aed7f0b8f3dea5740f969a551c63cb06dba8..07802afd2b874b02bf8f270bc057c7f6844d52d8 100644 (file)
--- a/drivers/staging/winbond/mlmetxrx.c
+++ b/drivers/staging/winbond/mlmetxrx.c
@@ -19,61 +19,8 @@
 
 #include "mds_f.h"
 
-void MLMEResetTxRx(struct wb35_adapter * adapter)
-{
-       s32     i;
-
-       // Reset the interface between MDS and MLME
-       for (i = 0; i < MAX_NUM_TX_MMPDU; i++)
-               adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
-       for (i = 0; i < MAX_NUM_RX_MMPDU; i++)
-               adapter->sMlmeFrame.SaveRxBufSlotInUse[i] = false;
-
-       adapter->sMlmeFrame.wNumRxMMPDUInMLME   = 0;
-       adapter->sMlmeFrame.wNumRxMMPDUDiscarded = 0;
-       adapter->sMlmeFrame.wNumRxMMPDU          = 0;
-       adapter->sMlmeFrame.wNumTxMMPDUDiscarded = 0;
-       adapter->sMlmeFrame.wNumTxMMPDU          = 0;
-       adapter->sLocalPara.boCCAbusy    = false;
-       adapter->sLocalPara.iPowerSaveMode     = PWR_ACTIVE;     // Power active
-}
-
-//=============================================================================
-//     Function:
-//    MLMEGetMMPDUBuffer()
-//
-//     Description:
-//    Return the pointer to an available data buffer with
-//    the size MAX_MMPDU_SIZE for a MMPDU.
-//
-//  Arguments:
-//    adapter   - pointer to the miniport adapter context.
-//
-//     Return value:
-//    NULL     : No available data buffer available
-//    Otherwise: Pointer to the data buffer
-//=============================================================================
-
-/* FIXME: Should this just be replaced with kmalloc() and kfree()? */
-u8 *MLMEGetMMPDUBuffer(struct wb35_adapter * adapter)
-{
-       s32 i;
-       u8 *returnVal;
-
-       for (i = 0; i< MAX_NUM_TX_MMPDU; i++) {
-               if (adapter->sMlmeFrame.TxMMPDUInUse[i] == false)
-                       break;
-       }
-       if (i >= MAX_NUM_TX_MMPDU) return NULL;
-
-       returnVal = (u8 *)&(adapter->sMlmeFrame.TxMMPDU[i]);
-       adapter->sMlmeFrame.TxMMPDUInUse[i] = true;
-
-       return returnVal;
-}
-
 //=============================================================================
-u8 MLMESendFrame(struct wb35_adapter * adapter, u8 *pMMPDU, u16 len, u8 DataType)
+u8 MLMESendFrame(struct wbsoft_priv * adapter, u8 *pMMPDU, u16 len, u8 DataType)
 /*     DataType : FRAME_TYPE_802_11_MANAGEMENT, FRAME_TYPE_802_11_MANAGEMENT_CHALLENGE,
                                FRAME_TYPE_802_11_DATA */
 {
@@ -98,7 +45,7 @@ u8 MLMESendFrame(struct wb35_adapter * adapter, u8 *pMMPDU, u16 len, u8 DataType
        return true;
 }
 
-void MLME_GetNextPacket(struct wb35_adapter *adapter, PDESCRIPTOR desc)
+void MLME_GetNextPacket(struct wbsoft_priv *adapter, PDESCRIPTOR desc)
 {
        desc->InternalUsed = desc->buffer_start_index + desc->buffer_number;
        desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX;
@@ -109,7 +56,7 @@ void MLME_GetNextPacket(struct wb35_adapter *adapter, PDESCRIPTOR desc)
        desc->Type = adapter->sMlmeFrame.DataType;
 }
 
-void MLMEfreeMMPDUBuffer(struct wb35_adapter * adapter, s8 *pData)
+static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
 {
        int i;
 
@@ -127,7 +74,7 @@ void MLMEfreeMMPDUBuffer(struct wb35_adapter * adapter, s8 *pData)
 }
 
 void
-MLME_SendComplete(struct wb35_adapter * adapter, u8 PacketID, unsigned char SendOK)
+MLME_SendComplete(struct wbsoft_priv * adapter, u8 PacketID, unsigned char SendOK)
 {
        MLME_TXCALLBACK TxCallback;