Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfdcc425 authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: replace custom BOOL definition with bool 



Checkpatch findings were not resolved, just make direct replacement
plus a couple of conflicting types in declarations.

sed -i 's/\bBOOL\b/bool/g' drivers/staging/vt6656/*.[ch]

Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6592810

drivers/staging/vt6656/aes_ccmp.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ void AESv128(BYTE *key, BYTE *data, BYTE *ciphertext) 
 *

 */



BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)

bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)

{

	BYTE            abyNonce[13];

	BYTE            MIC_IV[16];
@@ -249,7 +249,7 @@ BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize) 
	WORD            wHLen = 22;

	/* 8 is IV, 8 is MIC, 4 is CRC */

	WORD            wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;

	BOOL            bA4 = FALSE;

	bool            bA4 = FALSE;

	BYTE            byTmp;

	WORD            wCnt;

	int             ii, jj, kk;

drivers/staging/vt6656/aes_ccmp.h

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ 
/*---------------------  Export Variables  --------------------------*/



/*---------------------  Export Functions  --------------------------*/

BOOL AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize);

bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize);



#endif /* __AES_CCMP_H__ */

drivers/staging/vt6656/bssdb.c

+3 −3
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice, 
		(struct vnt_rx_mgmt *)pRxPacketContext;

	PKnownBSS pBSSList = NULL;

	unsigned int ii;

	BOOL bParsingQuiet = FALSE;

	bool bParsingQuiet = FALSE;





    pBSSList = (PKnownBSS)&(pMgmt->sBSSList[0]);
@@ -453,7 +453,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice, 
    if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) || (pBSSList->bWPA2Valid == TRUE)) {



        PSKeyItem  pTransmitKey = NULL;

        BOOL       bIs802_1x = FALSE;

        bool       bIs802_1x = FALSE;



        for (ii = 0; ii < pBSSList->wAKMSSAuthCount; ii ++) {

            if (pBSSList->abyAKMSSAuthType[ii] == WLAN_11i_AKMSS_802_1X) {
@@ -534,7 +534,7 @@ int BSSbUpdateToBSSList(struct vnt_private *pDevice, 
		(struct vnt_rx_mgmt *)pRxPacketContext;

	int ii, jj;

	signed long ldBm, ldBmSum;

	BOOL bParsingQuiet = FALSE;

	bool bParsingQuiet = FALSE;



    if (pBSSList == NULL)

        return FALSE;

drivers/staging/vt6656/bssdb.h

+14 −14
Original line number Diff line number Diff line
@@ -79,20 +79,20 @@ 
//



typedef struct tagSERPObject {

    BOOL    bERPExist;

    bool    bERPExist;

    BYTE    byERP;

} ERPObject, *PERPObject;





typedef struct tagSRSNCapObject {

    BOOL    bRSNCapExist;

    bool    bRSNCapExist;

    WORD    wRSNCap;

} SRSNCapObject, *PSRSNCapObject;



// BSS info(AP)

typedef struct tagKnownBSS {

    // BSS info

    BOOL            bActive;

    bool            bActive;

    BYTE            abyBSSID[WLAN_BSSID_LEN];

    unsigned int            uChannel;

    BYTE            abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];
@@ -110,10 +110,10 @@ typedef struct tagKnownBSS { 
    signed long            ldBmAverage[RSSI_STAT_COUNT];

    signed long            ldBmAverRange;

    //For any BSSID selection improvment

    BOOL            bSelected;

    bool            bSelected;



    //++ WPA informations

    BOOL            bWPAValid;

    bool            bWPAValid;

    BYTE            byGKType;

    BYTE            abyPKType[4];

    WORD            wPKCount;
@@ -124,7 +124,7 @@ typedef struct tagKnownBSS { 
    //--



    //++ WPA2 informations

    BOOL            bWPA2Valid;

    bool            bWPA2Valid;

    BYTE            byCSSGK;

    WORD            wCSSPKCount;

    BYTE            abyCSSPK[4];
@@ -167,14 +167,14 @@ typedef enum tagNODE_STATE { 
// STA node info

typedef struct tagKnownNodeDB {

    // STA info

    BOOL            bActive;

    bool            bActive;

    BYTE            abyMACAddr[WLAN_ADDR_LEN];

    BYTE            abyCurrSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];

    BYTE            abyCurrExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN];

    WORD            wTxDataRate;

    BOOL            bShortPreamble;

    BOOL            bERPExist;

    BOOL            bShortSlotTime;

    bool            bShortPreamble;

    bool            bERPExist;

    bool            bShortSlotTime;

    unsigned int            uInActiveCount;

    WORD            wMaxBasicRate;     //Get from byTopOFDMBasicRate or byTopCCKBasicRate which depends on packetTyp.

    WORD            wMaxSuppRate;      //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon.
@@ -188,15 +188,15 @@ typedef struct tagKnownNodeDB { 
    WORD            wListenInterval;

    WORD            wAID;

    NODE_STATE      eNodeState;

    BOOL            bPSEnable;

    BOOL            bRxPSPoll;

    bool            bPSEnable;

    bool            bRxPSPoll;

    BYTE            byAuthSequence;

    unsigned long           ulLastRxJiffer;

    BYTE            bySuppRate;

    DWORD           dwFlags;

    WORD            wEnQueueCnt;



    BOOL            bOnFly;

    bool            bOnFly;

    unsigned long long       KeyRSC;

    BYTE            byKeyIndex;

    DWORD           dwKeyIndex;
@@ -207,7 +207,7 @@ typedef struct tagKnownNodeDB { 
    BYTE            abyWepKey[WLAN_WEPMAX_KEYLEN];

    //

    // Auto rate fallback vars

    BOOL            bIsInFallback;

    bool            bIsInFallback;

    unsigned int            uAverageRSSI;

    unsigned int            uRateRecoveryTimeout;

    unsigned int            uRatePollTimeout;

drivers/staging/vt6656/card.c

+3 −3
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ void vUpdateIFS(struct vnt_private *pDevice) 
    }

    else {// PK_TYPE_11GA & PK_TYPE_11GB

        BYTE byRate = 0;

        BOOL bOFDMRate = FALSE;

        bool bOFDMRate = FALSE;

	unsigned int ii = 0;

        PWLAN_IE_SUPP_RATES pItemRates = NULL;
@@ -726,7 +726,7 @@ void CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate, 
 * Return Value: TRUE if success; otherwise FALSE

 *

 */

int CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF)

bool CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF)

{



	*pqwCurrTSF = pDevice->qwCurrTSF;
@@ -746,7 +746,7 @@ int CARDbGetCurrentTSF(struct vnt_private *pDevice, u64 *pqwCurrTSF) 
 * Return Value: TRUE if success; otherwise FALSE

 *

 */

int CARDbClearCurrentTSF(struct vnt_private *pDevice)

bool CARDbClearCurrentTSF(struct vnt_private *pDevice)

{



	MACvRegBitsOn(pDevice, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);