Merge branch 'omap-pool'

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

diff --git a/drivers/staging/winbond/mds.c b/drivers/staging/winbond/mds.c
index e431406e25a6f1fce31060e5096d2f50c92facce..c7af09257e6f2a5dcdd41c4e9bff7e1783910355 100644 (file)
--- a/drivers/staging/winbond/mds.c
+++ b/drivers/staging/winbond/mds.c
@@ -1,9 +1,7 @@
-#include "ds_tkip.h"
-#include "gl_80211.h"
 #include "mds_f.h"
 #include "mlmetxrx_f.h"
-#include "mto_f.h"
-#include "os_common.h"
+#include "mto.h"
+#include "sysdef.h"
 #include "wbhal_f.h"
 #include "wblinux_f.h"
 
@@ -374,7 +372,7 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, PDESCRIPTOR pDes, u8 *T
 
        pDes->TxRate = ctmp1;
        #ifdef _PE_TX_DUMP_
-       WBDEBUG(("Tx rate =%x\n", ctmp1));
+       printk("Tx rate =%x\n", ctmp1);
        #endif
 
        pT01->T01_modulation_type = (ctmp1%3) ? 0 : 1;
@@ -418,14 +416,14 @@ static void Mds_HeaderCopy(struct wbsoft_priv * adapter, PDESCRIPTOR pDes, u8 *T
 void
 Mds_Tx(struct wbsoft_priv * adapter)
 {
-       phw_data_t      pHwData = &adapter->sHwData;
+       struct hw_data *        pHwData = &adapter->sHwData;
        PMDS            pMds = &adapter->Mds;
        DESCRIPTOR      TxDes;
        PDESCRIPTOR     pTxDes = &TxDes;
        u8              *XmitBufAddress;
        u16             XmitBufSize, PacketSize, stmp, CurrentSize, FragmentThreshold;
        u8              FillIndex, TxDesIndex, FragmentCount, FillCount;
-       unsigned char   BufferFilled = false, MICAdd = 0;
+       unsigned char   BufferFilled = false;
 
 
        if (pMds->TxPause)
@@ -442,7 +440,7 @@ Mds_Tx(struct wbsoft_priv * adapter)
                FillIndex = pMds->TxFillIndex;
                if (pMds->TxOwner[FillIndex]) { // Is owned by software 0:Yes 1:No
 #ifdef _PE_TX_DUMP_
-                       WBDEBUG(("[Mds_Tx] Tx Owner is H/W.\n"));
+                       printk("[Mds_Tx] Tx Owner is H/W.\n");
 #endif
                        break;
                }
@@ -488,7 +486,7 @@ Mds_Tx(struct wbsoft_priv * adapter)
                        // For speed up Key setting
                        if (pTxDes->EapFix) {
 #ifdef _PE_TX_DUMP_
-                               WBDEBUG(("35: EPA 4th frame detected. Size = %d\n", PacketSize));
+                               printk("35: EPA 4th frame detected. Size = %d\n", PacketSize);
 #endif
                                pHwData->IsKeyPreSet = 1;
                        }
@@ -499,12 +497,6 @@ Mds_Tx(struct wbsoft_priv * adapter)
                        // Set RTS/CTS and Normal duration field into buffer
                        Mds_DurationSet(adapter, pTxDes, XmitBufAddress);
 
-                       //
-                       // Calculation MIC from buffer which maybe fragment, then fill into temporary address 8 byte
-                       // 931130.5.e
-                       if (MICAdd)
-                               Mds_MicFill( adapter, pTxDes, XmitBufAddress );
-
                        //Shift to the next address
                        XmitBufSize += CurrentSize;
                        XmitBufAddress += CurrentSize;
@@ -561,7 +553,7 @@ void
 Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02)
 {
        PMDS    pMds = &adapter->Mds;
-       phw_data_t      pHwData = &adapter->sHwData;
+       struct hw_data *        pHwData = &adapter->sHwData;
        u8      PacketId = (u8)pT02->T02_Tx_PktID;
        unsigned char   SendOK = true;
        u8      RetryCount, TxRate;
@@ -585,7 +577,7 @@ Mds_SendComplete(struct wbsoft_priv * adapter, PT02_DESCRIPTOR pT02)
                                else
                                        pHwData->tx_retry_count[7] += RetryCount;
                                #ifdef _PE_STATE_DUMP_
-                               WBDEBUG(("dto_tx_retry_count =%d\n", pHwData->dto_tx_retry_count));
+                               printk("dto_tx_retry_count =%d\n", pHwData->dto_tx_retry_count);
                                #endif
                                MTO_SetTxCount(adapter, TxRate, RetryCount);
                        }