Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / drivers / staging / winbond / mlmetxrx.c

diff --git a/drivers/staging/winbond/mlmetxrx.c b/drivers/staging/winbond/mlmetxrx.c
index dcd8a11..7425a23 100644 (file)
--- a/drivers/staging/winbond/mlmetxrx.c
+++ b/drivers/staging/winbond/mlmetxrx.c
@@ -19,32 +19,6 @@
 
 #include "mds_f.h"
 
-/* ============================================================================= */
-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 */
-{
-       if (adapter->sMlmeFrame.IsInUsed != PACKET_FREE_TO_USE) {
-               adapter->sMlmeFrame.wNumTxMMPDUDiscarded++;
-               return false;
-       }
-       adapter->sMlmeFrame.IsInUsed = PACKET_COME_FROM_MLME;
-
-       /* Keep information for sending */
-       adapter->sMlmeFrame.pMMPDU = pMMPDU;
-       adapter->sMlmeFrame.DataType = DataType;
-       /* len must be the last setting due to QUERY_SIZE_SECOND of Mds */
-       adapter->sMlmeFrame.len = len;
-       adapter->sMlmeFrame.wNumTxMMPDU++;
-
-       /* H/W will enter power save by set the register. S/W don't send null frame
-       with PWRMgt bit enbled to enter power save now. */
-
-       /* Transmit NDIS packet */
-       Mds_Tx(adapter);
-       return true;
-}
-
 void MLME_GetNextPacket(struct wbsoft_priv *adapter, struct wb35_descriptor *desc)
 {
        desc->InternalUsed = desc->buffer_start_index + desc->buffer_number;
@@ -76,15 +50,10 @@ static void MLMEfreeMMPDUBuffer(struct wbsoft_priv *adapter, s8 *pData)
 void
 MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID, unsigned char SendOK)
 {
-       MLME_TXCALLBACK TxCallback;
-
     /* Reclaim the data buffer */
        adapter->sMlmeFrame.len = 0;
        MLMEfreeMMPDUBuffer(adapter, adapter->sMlmeFrame.pMMPDU);
 
-
-       TxCallback.bResult = MLME_SUCCESS;
-
        /* Return resource */
        adapter->sMlmeFrame.IsInUsed = PACKET_FREE_TO_USE;
 }