Commit 51b6d9c2 authored by Jim Lieb's avatar Jim Lieb Committed by Greg Kroah-Hartman
Browse files

Staging: vt665x: Remove umem.h Part 1 



Remove references to umem.h macros and refer directly to memcpy
functions.  Delete the include file.

Signed-off-by: default avatarJim Lieb <lieb@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a7ad322a

drivers/staging/vt6655/IEEE11h.c

+7 −8
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
 */



#include "ttype.h"

#include "umem.h"

#include "tmacro.h"

#include "tether.h"

#include "IEEE11h.h"
@@ -104,7 +103,7 @@ static BOOL s_bRxMSRReq(PSMgmtObject pMgmt, PWLAN_FRAME_MSRREQ pMSRReq, UINT uLe 
    BOOL    bResult = TRUE;



    if (uLength <= WLAN_A3FR_MAXLEN) {

        MEMvCopy(pMgmt->abyCurrentMSRReq, pMSRReq, uLength);

        memcpy(pMgmt->abyCurrentMSRReq, pMSRReq, uLength);

    }

    uNumOfEIDs = ((uLength - offsetof(WLAN_FRAME_MSRREQ, sMSRReqEIDs))/ (sizeof(WLAN_IE_MEASURE_REQ)));

    pMgmt->pCurrMeasureEIDRep = &(((PWLAN_FRAME_MSRREP) (pMgmt->abyCurrentMSRRep))->sMSRRepEIDs[0]);
@@ -133,9 +132,9 @@ static BOOL s_bRxTPCReq(PSMgmtObject pMgmt, PWLAN_FRAME_TPCREQ pTPCReq, BYTE byR 
                                    WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_ACTION)

                                );



    MEMvCopy( pFrame->Header.abyAddr1, pTPCReq->Header.abyAddr2, WLAN_ADDR_LEN);

    MEMvCopy( pFrame->Header.abyAddr2, CARDpGetCurrentAddress(pMgmt->pAdapter), WLAN_ADDR_LEN);

    MEMvCopy( pFrame->Header.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);

    memcpy( pFrame->Header.abyAddr1, pTPCReq->Header.abyAddr2, WLAN_ADDR_LEN);

    memcpy( pFrame->Header.abyAddr2, CARDpGetCurrentAddress(pMgmt->pAdapter), WLAN_ADDR_LEN);

    memcpy( pFrame->Header.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);



    pFrame->byCategory = 0;

    pFrame->byAction = 3;
@@ -283,9 +282,9 @@ BOOL IEEE11hbMSRRepTx ( 
                                    WLAN_SET_FC_FSTYPE(WLAN_FSTYPE_ACTION)

                                );



    MEMvCopy( pMSRRep->Header.abyAddr1, ((PWLAN_FRAME_MSRREQ) (pMgmt->abyCurrentMSRReq))->Header.abyAddr2, WLAN_ADDR_LEN);

    MEMvCopy( pMSRRep->Header.abyAddr2, CARDpGetCurrentAddress(pMgmt->pAdapter), WLAN_ADDR_LEN);

    MEMvCopy( pMSRRep->Header.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);

    memcpy( pMSRRep->Header.abyAddr1, ((PWLAN_FRAME_MSRREQ) (pMgmt->abyCurrentMSRReq))->Header.abyAddr2, WLAN_ADDR_LEN);

    memcpy( pMSRRep->Header.abyAddr2, CARDpGetCurrentAddress(pMgmt->pAdapter), WLAN_ADDR_LEN);

    memcpy( pMSRRep->Header.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);



    pMSRRep->byCategory = 0;

    pMSRRep->byAction = 1;

drivers/staging/vt6655/aes_ccmp.c

+11 −12
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
 *

 */



#include "umem.h"

#include "device.h"

#include "80211hdr.h"
@@ -278,7 +277,7 @@ int ii,jj,kk; 
    pbyPayload = pbyIV + 8; //IV-length



    abyNonce[0]  = 0x00; //now is 0, if Qos here will be priority

    MEMvCopy(&(abyNonce[1]), pMACHeader->abyAddr2, U_ETHER_ADDR_LEN);

    memcpy(&(abyNonce[1]), pMACHeader->abyAddr2, U_ETHER_ADDR_LEN);

    abyNonce[7]  = pbyIV[7];

    abyNonce[8]  = pbyIV[6];

    abyNonce[9]  = pbyIV[5];
@@ -288,7 +287,7 @@ int ii,jj,kk; 


    //MIC_IV

    MIC_IV[0] = 0x59;

    MEMvCopy(&(MIC_IV[1]), &(abyNonce[0]), 13);

    memcpy(&(MIC_IV[1]), &(abyNonce[0]), 13);

    MIC_IV[14] = (BYTE)(wPayloadSize >> 8);

    MIC_IV[15] = (BYTE)(wPayloadSize & 0xff);
@@ -300,16 +299,16 @@ int ii,jj,kk; 
    byTmp = (BYTE)(pMACHeader->wFrameCtl >> 8);

    byTmp &= 0x87;

    MIC_HDR1[3] = byTmp | 0x40;

    MEMvCopy(&(MIC_HDR1[4]), pMACHeader->abyAddr1, U_ETHER_ADDR_LEN);

    MEMvCopy(&(MIC_HDR1[10]), pMACHeader->abyAddr2, U_ETHER_ADDR_LEN);

    memcpy(&(MIC_HDR1[4]), pMACHeader->abyAddr1, U_ETHER_ADDR_LEN);

    memcpy(&(MIC_HDR1[10]), pMACHeader->abyAddr2, U_ETHER_ADDR_LEN);



    //MIC_HDR2

    MEMvCopy(&(MIC_HDR2[0]), pMACHeader->abyAddr3, U_ETHER_ADDR_LEN);

    memcpy(&(MIC_HDR2[0]), pMACHeader->abyAddr3, U_ETHER_ADDR_LEN);

    byTmp = (BYTE)(pMACHeader->wSeqCtl & 0xff);

    MIC_HDR2[6] = byTmp & 0x0f;

    MIC_HDR2[7] = 0;

    if ( bA4 ) {

        MEMvCopy(&(MIC_HDR2[8]), pMACHeader->abyAddr4, U_ETHER_ADDR_LEN);

        memcpy(&(MIC_HDR2[8]), pMACHeader->abyAddr4, U_ETHER_ADDR_LEN);

    } else {

        MIC_HDR2[8]  = 0x00;

        MIC_HDR2[9]  = 0x00;
@@ -334,7 +333,7 @@ int ii,jj,kk; 


    wCnt = 1;

    abyCTRPLD[0] = 0x01;

    MEMvCopy(&(abyCTRPLD[1]), &(abyNonce[0]), 13);

    memcpy(&(abyCTRPLD[1]), &(abyNonce[0]), 13);



    for(jj=wPayloadSize; jj>16; jj=jj-16) {
@@ -351,13 +350,13 @@ int ii,jj,kk; 
        }

        AESv128(pbyRxKey,abyTmp,abyMIC);



        MEMvCopy(pbyPayload, abyPlainText, 16);

        memcpy(pbyPayload, abyPlainText, 16);

        wCnt++;

        pbyPayload += 16;

    } //for wPayloadSize



    //last payload

    MEMvCopy(&(abyLastCipher[0]), pbyPayload, jj);

    memcpy(&(abyLastCipher[0]), pbyPayload, jj);

    for ( ii=jj; ii<16; ii++ ) {

        abyLastCipher[ii] = 0x00;

    }
@@ -369,7 +368,7 @@ int ii,jj,kk; 
    for ( kk=0; kk<16; kk++ ) {

        abyPlainText[kk] = abyTmp[kk] ^ abyLastCipher[kk];

    }

    MEMvCopy(pbyPayload, abyPlainText, jj);

    memcpy(pbyPayload, abyPlainText, jj);

    pbyPayload += jj;



    //for MIC calculation
@@ -394,7 +393,7 @@ int ii,jj,kk; 
    //=>above is the dec-MIC from packet

    //--------------------------------------------



    if ( MEMEqualMemory(abyMIC,abyTmp,8) ) {

    if ( !memcmp(abyMIC,abyTmp,8) ) {

        return TRUE;

    } else {

        return FALSE;

drivers/staging/vt6655/baseband.c

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
#include "mac.h"

#include "baseband.h"

#include "srom.h"

#include "umem.h"

#include "rf.h"



/*---------------------  Static Definitions -------------------------*/

drivers/staging/vt6655/bssdb.c

+6 −7
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#include "card.h"

#include "mac.h"

#include "wpa2.h"

#include "umem.h"

#include "iowpa.h"



//#define	PLICE_DEBUG
@@ -167,7 +166,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; 
                if (IS_ETH_ADDRESS_EQUAL(pCurrBSS->abyBSSID, pbyBSSID)) {

                    if (pSSID != NULL) {

                        // compare ssid

                        if (MEMEqualMemory(pSSID->abySSID,

                        if ( !memcmp(pSSID->abySSID,

                            ((PWLAN_IE_SSID)pCurrBSS->abySSID)->abySSID,

                            pSSID->len)) {

                            if ((pMgmt->eConfigMode == WMAC_CONFIG_AUTO) ||
@@ -200,7 +199,7 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; 


                if (pSSID != NULL) {

                    // matched SSID

                    if (!MEMEqualMemory(pSSID->abySSID,

                    if (! !memcmp(pSSID->abySSID,

                        ((PWLAN_IE_SSID)pCurrBSS->abySSID)->abySSID,

                        pSSID->len) ||

                        (pSSID->len != ((PWLAN_IE_SSID)pCurrBSS->abySSID)->len)) {
@@ -259,8 +258,8 @@ if(pDevice->bLinkPass==FALSE) pCurrBSS->bSelected = FALSE; 
/*

                        if (pDevice->bRoaming == FALSE)  {

	//       Einsn Add @20070907

			ZERO_MEMORY(pbyDesireSSID, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);

			MEMvCopy(pbyDesireSSID,pCurrBSS->abySSID,WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1) ;

			memset(pbyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);

			memcpy(pbyDesireSSID,pCurrBSS->abySSID,WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1) ;

                                                }*/



            return(pSelect);
@@ -502,7 +501,7 @@ BSSbInsertToBSSList ( 
            }

        }

        if ((bIs802_1x == TRUE) && (pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len) &&

            (MEMEqualMemory(pSSID->abySSID, ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySSID, pSSID->len))) {

            ( !memcmp(pSSID->abySSID, ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySSID, pSSID->len))) {



            bAdd_PMKID_Candidate((HANDLE)pDevice, pBSSList->abyBSSID, &pBSSList->sRSNCapObj);
@@ -568,7 +567,7 @@ BSSbInsertToBSSList ( 
    pBSSList->uIELength = uIELength;

    if (pBSSList->uIELength > WLAN_BEACON_FR_MAXLEN)

        pBSSList->uIELength = WLAN_BEACON_FR_MAXLEN;

    MEMvCopy(pBSSList->abyIEs, pbyIEs, pBSSList->uIELength);

    memcpy(pBSSList->abyIEs, pbyIEs, pBSSList->uIELength);



    return TRUE;

}

drivers/staging/vt6655/card.c

+5 −6
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
#include "key.h"

#include "rc4.h"

#include "country.h"

#include "umem.h"



/*---------------------  Static Definitions -------------------------*/
@@ -1304,7 +1303,7 @@ BOOL CARDbSetBSSID(PVOID pDeviceHandler, PBYTE pbyBSSID, CARD_OP_MODE eOPMode) 
    PSDevice    pDevice = (PSDevice) pDeviceHandler;



    MACvWriteBSSIDAddress(pDevice->PortOffset, pbyBSSID);

    MEMvCopy(pDevice->abyBSSID, pbyBSSID, WLAN_BSSID_LEN);

    memcpy(pDevice->abyBSSID, pbyBSSID, WLAN_BSSID_LEN);

    if (eOPMode == OP_MODE_ADHOC) {

        MACvRegBitsOn(pDevice->PortOffset, MAC_REG_HOSTCR, HOSTCR_ADHOC);

    } else {
@@ -1566,7 +1565,7 @@ CARDbAdd_PMKID_Candidate ( 


    if (pDevice->gsPMKIDCandidate.NumCandidates >= MAX_PMKIDLIST) {

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vFlush_PMKID_Candidate: 3\n");

        ZERO_MEMORY(&pDevice->gsPMKIDCandidate, sizeof(SPMKIDCandidateEvent));

        memset(&pDevice->gsPMKIDCandidate, 0, sizeof(SPMKIDCandidateEvent));

    }



    for (ii = 0; ii < 6; ii++) {
@@ -1578,7 +1577,7 @@ CARDbAdd_PMKID_Candidate ( 
    // Update Old Candidate

    for (ii = 0; ii < pDevice->gsPMKIDCandidate.NumCandidates; ii++) {

        pCandidateList = &pDevice->gsPMKIDCandidate.CandidateList[ii];

        if (MEMEqualMemory(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN)) {

        if ( !memcmp(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN)) {

            if ((bRSNCapExist == TRUE) && (wRSNCap & BIT0)) {

                pCandidateList->Flags |= NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED;

            } else {
@@ -1595,7 +1594,7 @@ CARDbAdd_PMKID_Candidate ( 
    } else {

        pCandidateList->Flags &= ~(NDIS_802_11_PMKID_CANDIDATE_PREAUTH_ENABLED);

    }

    MEMvCopy(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN);

    memcpy(pCandidateList->BSSID, pbyBSSID, U_ETHER_ADDR_LEN);

    pDevice->gsPMKIDCandidate.NumCandidates++;

    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"NumCandidates:%d\n", (int)pDevice->gsPMKIDCandidate.NumCandidates);

    return TRUE;
@@ -2276,7 +2275,7 @@ CARDbChannelGetList ( 
    if (uCountryCodeIdx >= CCODE_MAX) {

        return (FALSE);

    }

    MEMvCopy(pbyChannelTable, ChannelRuleTab[uCountryCodeIdx].bChannelIdxList, CB_MAX_CHANNEL);

    memcpy(pbyChannelTable, ChannelRuleTab[uCountryCodeIdx].bChannelIdxList, CB_MAX_CHANNEL);

    return (TRUE);

}