Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / winbond / mlmetxrx.c

diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
deleted file mode 100644 (file)
index 7425a23..0000000
--- a/drivers/staging/winbond/mlmetxrx.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ============================================================================
-  Module Name:
-    MLMETxRx.C
-
-  Description:
-    The interface between MDS (MAC Data Service) and MLME.
-
-  Revision History:
-  --------------------------------------------------------------------------
-               200209      UN20 Jennifer Xu
-               Initial Release
-               20021108    PD43 Austin Liu
-               20030117    PD43 Austin Liu
-               Deleted MLMEReturnPacket and MLMEProcThread()
-
-  Copyright (c) 1996-2002 Winbond Electronics Corp. All Rights Reserved.
-============================================================================ */
-#include "sysdef.h"
-
-#include "mds_f.h"
-
-void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *desc)
-{
-       desc->InternalUsed = desc->buffer_start_index + desc->buffer_number;
-       desc->InternalUsed %= MAX_DESCRIPTOR_BUFFER_INDEX;
-       desc->buffer_address[desc->InternalUsed] = adapter->sMlmeFrame.pMMPDU;
-       desc->buffer_size[desc->InternalUsed] = adapter->sMlmeFrame.len;
-       desc->buffer_total_size += adapter->sMlmeFrame.len;
-       desc->buffer_number++;
-       desc->Type = adapter->sMlmeFrame.DataType;
-}
-
-static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
-{
-       int i;
-
-       /* Reclaim the data buffer */
-       for (i = 0; i < MAX_NUM_TX_MMPDU; i++) {
-               if (pData == (s8 *)&(adapter->sMlmeFrame.TxMMPDU[i]))
-                       break;
-       }
-       if (adapter->sMlmeFrame.TxMMPDUInUse[i])
-               adapter->sMlmeFrame.TxMMPDUInUse[i] = false;
-       else  {
-               /* Something wrong
-                PD43 Add debug code here??? */
-       }
-}
-
-void
-MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, unsigned char SendOK)
-{
-    /* Reclaim the data buffer */
-       adapter->sMlmeFrame.len = 0;
-       MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);
-
-       /* Return resource */
-       adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
-}
-
-
-