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

Staging: vt6656: removed custom UCHAR/USHORT/UINT/ULONG/ULONGLONG typedefs 



Cleared all checkpatch warnings but 'do not add new typedefs' ones.

Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 213d2e93

drivers/staging/vt6656/80211mgr.h

+24 −24
Original line number Original line Diff line number Diff line
@@ -524,8 +524,8 @@ typedef struct _WLAN_IE_IBSS_DFS { 
// prototype structure, all mgmt frame types will start with these members

// prototype structure, all mgmt frame types will start with these members

typedef struct tagWLAN_FR_MGMT {

typedef struct tagWLAN_FR_MGMT {





    UINT                  uType;

    unsigned int                  uType;

    UINT                  len;

    unsigned int                  len;

    PBYTE                 pBuf;

    PBYTE                 pBuf;

    PUWLAN_80211HDR       pHdr;

    PUWLAN_80211HDR       pHdr;
@@ -534,8 +534,8 @@ typedef struct tagWLAN_FR_MGMT { 
// Beacon frame

// Beacon frame

typedef struct tagWLAN_FR_BEACON {

typedef struct tagWLAN_FR_BEACON {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;

    // fixed fields

    // fixed fields
@@ -566,8 +566,8 @@ typedef struct tagWLAN_FR_BEACON { 
// IBSS ATIM frame

// IBSS ATIM frame

typedef struct tagWLAN_FR_IBSSATIM {

typedef struct tagWLAN_FR_IBSSATIM {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;
@@ -580,8 +580,8 @@ typedef struct tagWLAN_FR_IBSSATIM { 
// Disassociation

// Disassociation

typedef struct tagWLAN_FR_DISASSOC {

typedef struct tagWLAN_FR_DISASSOC {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /*-- fixed fields -----------*/
@@ -593,8 +593,8 @@ typedef struct tagWLAN_FR_DISASSOC { 
// Association Request

// Association Request

typedef struct tagWLAN_FR_ASSOCREQ {

typedef struct tagWLAN_FR_ASSOCREQ {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /*-- fixed fields -----------*/
@@ -617,8 +617,8 @@ typedef struct tagWLAN_FR_ASSOCREQ { 
// Association Response

// Association Response

typedef struct tagWLAN_FR_ASSOCRESP {

typedef struct tagWLAN_FR_ASSOCRESP {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /*-- fixed fields -----------*/
@@ -634,8 +634,8 @@ typedef struct tagWLAN_FR_ASSOCRESP { 
// Reassociation Request

// Reassociation Request

typedef struct tagWLAN_FR_REASSOCREQ {

typedef struct tagWLAN_FR_REASSOCREQ {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;
@@ -659,8 +659,8 @@ typedef struct tagWLAN_FR_REASSOCREQ { 
// Reassociation Response

// Reassociation Response

typedef struct tagWLAN_FR_REASSOCRESP {

typedef struct tagWLAN_FR_REASSOCRESP {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /*-- fixed fields -----------*/
@@ -676,8 +676,8 @@ typedef struct tagWLAN_FR_REASSOCRESP { 
// Probe Request

// Probe Request

typedef struct tagWLAN_FR_PROBEREQ {

typedef struct tagWLAN_FR_PROBEREQ {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /*-- fixed fields -----------*/
@@ -691,8 +691,8 @@ typedef struct tagWLAN_FR_PROBEREQ { 
// Probe Response

// Probe Response

typedef struct tagWLAN_FR_PROBERESP {

typedef struct tagWLAN_FR_PROBERESP {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /*-- fixed fields -----------*/
@@ -720,8 +720,8 @@ typedef struct tagWLAN_FR_PROBERESP { 
// Authentication

// Authentication

typedef struct tagWLAN_FR_AUTHEN {

typedef struct tagWLAN_FR_AUTHEN {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /*-- fixed fields -----------*/
@@ -736,8 +736,8 @@ typedef struct tagWLAN_FR_AUTHEN { 
// Deauthenication

// Deauthenication

typedef struct tagWLAN_FR_DEAUTHEN {

typedef struct tagWLAN_FR_DEAUTHEN {





    UINT                    uType;

    unsigned int                    uType;

    UINT                    len;

    unsigned int                    len;

    PBYTE                   pBuf;

    PBYTE                   pBuf;

    PUWLAN_80211HDR         pHdr;

    PUWLAN_80211HDR         pHdr;

    /*-- fixed fields -----------*/

    /*-- fixed fields -----------*/

drivers/staging/vt6656/baseband.c

+23 −29
Original line number Original line Diff line number Diff line
@@ -662,11 +662,11 @@ const WORD awcFrameTime[MAX_RATE] = 




/*

/*

static

static

ULONG

unsigned long

s_ulGetLowSQ3(PSDevice pDevice);

s_ulGetLowSQ3(PSDevice pDevice);





static

static

ULONG

unsigned long

s_ulGetRatio(PSDevice pDevice);

s_ulGetRatio(PSDevice pDevice);





static

static
@@ -689,19 +689,19 @@ s_vClearSQ3Value(PSDevice pDevice); 
 * Return Value: FrameTime

 * Return Value: FrameTime

 *

 *

 */

 */

UINT

unsigned int

BBuGetFrameTime (

BBuGetFrameTime (

     BYTE byPreambleType,

     BYTE byPreambleType,

     BYTE byPktType,

     BYTE byPktType,

     UINT cbFrameLength,

     unsigned int cbFrameLength,

     WORD wRate

     WORD wRate

    )

    )

{

{

    UINT uFrameTime;

    unsigned int uFrameTime;

    UINT uPreamble;

    unsigned int uPreamble;

    UINT uTmp;

    unsigned int uTmp;

    UINT uRateIdx = (UINT)wRate;

    unsigned int uRateIdx = (unsigned int)wRate;

    UINT uRate = 0;

    unsigned int uRate = 0;









    if (uRateIdx > RATE_54M) {

    if (uRateIdx > RATE_54M) {
@@ -709,7 +709,7 @@ BBuGetFrameTime ( 
        return 0;

        return 0;

    }

    }





    uRate = (UINT)awcFrameTime[uRateIdx];

    uRate = (unsigned int)awcFrameTime[uRateIdx];





    if (uRateIdx <= 3) {          //CCK mode

    if (uRateIdx <= 3) {          //CCK mode
@@ -759,7 +759,7 @@ BBuGetFrameTime ( 
void

void

BBvCaculateParameter (

BBvCaculateParameter (

      PSDevice pDevice,

      PSDevice pDevice,

      UINT cbFrameLength,

      unsigned int cbFrameLength,

      WORD wRate,

      WORD wRate,

      BYTE byPacketType,

      BYTE byPacketType,

     PWORD pwPhyLen,

     PWORD pwPhyLen,
@@ -767,9 +767,9 @@ BBvCaculateParameter ( 
     PBYTE pbyPhySgn

     PBYTE pbyPhySgn

    )

    )

{

{

    UINT cbBitCount;

    unsigned int cbBitCount;

    UINT cbUsCount = 0;

    unsigned int cbUsCount = 0;

    UINT cbTmp;

    unsigned int cbTmp;

    BOOL bExtBit;

    BOOL bExtBit;

    BYTE byPreambleType = pDevice->byPreambleType;

    BYTE byPreambleType = pDevice->byPreambleType;

    BOOL bCCK = pDevice->bCCK;

    BOOL bCCK = pDevice->bCCK;
@@ -1360,13 +1360,11 @@ BBvExitDeepSleep (PSDevice pDevice) 
}

}









static

static unsigned long s_ulGetLowSQ3(PSDevice pDevice)

ULONG

s_ulGetLowSQ3(PSDevice pDevice)

{

{

	int ii;

	int ii;

ULONG ulSQ3 = 0;

	unsigned long ulSQ3 = 0;

ULONG ulMaxPacket;

	unsigned long ulMaxPacket;





    ulMaxPacket = pDevice->aulPktNum[RATE_54M];

    ulMaxPacket = pDevice->aulPktNum[RATE_54M];

    if ( pDevice->aulPktNum[RATE_54M] != 0 ) {

    if ( pDevice->aulPktNum[RATE_54M] != 0 ) {
@@ -1382,16 +1380,12 @@ ULONG ulMaxPacket; 
    return ulSQ3;

    return ulSQ3;

}

}







static unsigned long s_ulGetRatio(PSDevice pDevice)



static

ULONG

s_ulGetRatio (PSDevice pDevice)

{

{

	int ii, jj;

	int ii, jj;

ULONG   ulRatio = 0;

	unsigned long ulRatio = 0;

ULONG   ulMaxPacket;

	unsigned long ulMaxPacket;

ULONG   ulPacketNum;

	unsigned long ulPacketNum;





    //This is a thousand-ratio

    //This is a thousand-ratio

    ulMaxPacket = pDevice->aulPktNum[RATE_54M];

    ulMaxPacket = pDevice->aulPktNum[RATE_54M];

drivers/staging/vt6656/baseband.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -96,18 +96,18 @@ 




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

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





UINT

unsigned int

BBuGetFrameTime(

BBuGetFrameTime(

     BYTE byPreambleType,

     BYTE byPreambleType,

     BYTE byFreqType,

     BYTE byFreqType,

     UINT cbFrameLength,

     unsigned int cbFrameLength,

     WORD wRate

     WORD wRate

    );

    );





void

void

BBvCaculateParameter (

BBvCaculateParameter (

      PSDevice pDevice,

      PSDevice pDevice,

      UINT cbFrameLength,

      unsigned int cbFrameLength,

      WORD wRate,

      WORD wRate,

      BYTE byPacketType,

      BYTE byPacketType,

     PWORD pwPhyLen,

     PWORD pwPhyLen,

drivers/staging/vt6656/bssdb.c

+57 −52
Original line number Original line Diff line number Diff line
@@ -129,8 +129,8 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, 
    PKnownBSS       pCurrBSS = NULL;

    PKnownBSS       pCurrBSS = NULL;

    PKnownBSS       pSelect = NULL;

    PKnownBSS       pSelect = NULL;

    BYTE                 ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};

    BYTE                 ZeroBSSID[WLAN_BSSID_LEN]={0x00,0x00,0x00,0x00,0x00,0x00};

    UINT            ii = 0;

    unsigned int ii = 0;

    UINT            jj = 0;   //DavidWang

    unsigned int jj = 0;

    if (pbyDesireBSSID != NULL) {

    if (pbyDesireBSSID != NULL) {

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n",

                            *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2),

                            *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2),
@@ -291,7 +291,7 @@ void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID) 
{

{

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    UINT            ii;

    unsigned int            ii;





    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

        if (bKeepCurrBSSID) {

        if (bKeepCurrBSSID) {
@@ -336,7 +336,7 @@ PKnownBSS BSSpAddrIsInBSSList(void *hDeviceContext, 
    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PKnownBSS       pBSSList = NULL;

    PKnownBSS       pBSSList = NULL;

    UINT            ii;

    unsigned int            ii;





    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

        pBSSList = &(pMgmt->sBSSList[ii]);

        pBSSList = &(pMgmt->sBSSList[ii]);
@@ -381,7 +381,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, 
			 PWLAN_IE_RSN_EXT pRSNWPA,

			 PWLAN_IE_RSN_EXT pRSNWPA,

			 PWLAN_IE_COUNTRY pIE_Country,

			 PWLAN_IE_COUNTRY pIE_Country,

			 PWLAN_IE_QUIET pIE_Quiet,

			 PWLAN_IE_QUIET pIE_Quiet,

			 UINT uIELength,

			 unsigned int uIELength,

			 PBYTE pbyIEs,

			 PBYTE pbyIEs,

			 void *pRxPacketContext)

			 void *pRxPacketContext)

{

{
@@ -390,7 +390,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, 
    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSRxMgmtPacket  pRxPacket = (PSRxMgmtPacket)pRxPacketContext;

    PSRxMgmtPacket  pRxPacket = (PSRxMgmtPacket)pRxPacketContext;

    PKnownBSS       pBSSList = NULL;

    PKnownBSS       pBSSList = NULL;

    UINT            ii;

    unsigned int            ii;

    BOOL            bParsingQuiet = FALSE;

    BOOL            bParsingQuiet = FALSE;
@@ -465,9 +465,10 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, 
    WPA_ClearRSN(pBSSList);

    WPA_ClearRSN(pBSSList);





    if (pRSNWPA != NULL) {

    if (pRSNWPA != NULL) {

        UINT uLen = pRSNWPA->len + 2;

	unsigned int uLen = pRSNWPA->len + 2;





        if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {

	if (uLen <= (uIELength -

		     (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) {

		pBSSList->wWPALen = uLen;

		pBSSList->wWPALen = uLen;

		memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);

		memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);

		WPA_ParseRSN(pBSSList, pRSNWPA);

		WPA_ParseRSN(pBSSList, pRSNWPA);
@@ -477,8 +478,10 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, 
    WPA2_ClearRSN(pBSSList);

    WPA2_ClearRSN(pBSSList);





    if (pRSN != NULL) {

    if (pRSN != NULL) {

        UINT uLen = pRSN->len + 2;

	unsigned int uLen = pRSN->len + 2;

        if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {



	if (uLen <= (uIELength -

		     (unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) {

		pBSSList->wRSNLen = uLen;

		pBSSList->wRSNLen = uLen;

		memcpy(pBSSList->byRSNIE, pRSN, uLen);

		memcpy(pBSSList->byRSNIE, pRSN, uLen);

		WPA2vParseRSN(pBSSList, pRSN);

		WPA2vParseRSN(pBSSList, pRSN);
@@ -600,7 +603,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, 
			 PWLAN_IE_COUNTRY pIE_Country,

			 PWLAN_IE_COUNTRY pIE_Country,

			 PWLAN_IE_QUIET pIE_Quiet,

			 PWLAN_IE_QUIET pIE_Quiet,

			 PKnownBSS pBSSList,

			 PKnownBSS pBSSList,

			 UINT uIELength,

			 unsigned int uIELength,

			 PBYTE pbyIEs,

			 PBYTE pbyIEs,

			 void *pRxPacketContext)

			 void *pRxPacketContext)

{

{
@@ -668,8 +671,9 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, 
   WPA_ClearRSN(pBSSList);         //mike update

   WPA_ClearRSN(pBSSList);         //mike update





   if (pRSNWPA != NULL) {

   if (pRSNWPA != NULL) {

        UINT uLen = pRSNWPA->len + 2;

	unsigned int uLen = pRSNWPA->len + 2;

        if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSNWPA - pbyIEs))) {

	if (uLen <= (uIELength -

		     (unsigned int) (ULONG_PTR) ((PBYTE) pRSNWPA - pbyIEs))) {

		pBSSList->wWPALen = uLen;

		pBSSList->wWPALen = uLen;

		memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);

		memcpy(pBSSList->byWPAIE, pRSNWPA, uLen);

		WPA_ParseRSN(pBSSList, pRSNWPA);

		WPA_ParseRSN(pBSSList, pRSNWPA);
@@ -679,8 +683,9 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, 
   WPA2_ClearRSN(pBSSList);  //mike update

   WPA2_ClearRSN(pBSSList);  //mike update





    if (pRSN != NULL) {

    if (pRSN != NULL) {

        UINT uLen = pRSN->len + 2;

	unsigned int uLen = pRSN->len + 2;

        if (uLen <= (uIELength - (UINT)(ULONG_PTR)((PBYTE)pRSN - pbyIEs))) {

	if (uLen <= (uIELength -

			(unsigned int) (ULONG_PTR) ((PBYTE) pRSN - pbyIEs))) {

		pBSSList->wRSNLen = uLen;

		pBSSList->wRSNLen = uLen;

		memcpy(pBSSList->byRSNIE, pRSN, uLen);

		memcpy(pBSSList->byRSNIE, pRSN, uLen);

		WPA2vParseRSN(pBSSList, pRSN);

		WPA2vParseRSN(pBSSList, pRSN);
@@ -754,7 +759,7 @@ BOOL BSSbIsSTAInNodeDB(void *hDeviceContext, 
{

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    UINT            ii;

    unsigned int            ii;





    // Index = 0 reserved for AP Node

    // Index = 0 reserved for AP Node

    for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {

    for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {
@@ -786,9 +791,9 @@ void BSSvCreateOneNode(void *hDeviceContext, PUINT puNodeIndex) 




    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    UINT            ii;

    unsigned int            ii;

    UINT            BigestCount = 0;

    unsigned int            BigestCount = 0;

    UINT            SelectIndex;

    unsigned int            SelectIndex;

    struct sk_buff  *skb;

    struct sk_buff  *skb;

    // Index = 0 reserved for AP Node (In STA mode)

    // Index = 0 reserved for AP Node (In STA mode)

    // Index = 0 reserved for Broadcast/MultiCast (In AP mode)

    // Index = 0 reserved for Broadcast/MultiCast (In AP mode)
@@ -843,7 +848,7 @@ void BSSvCreateOneNode(void *hDeviceContext, PUINT puNodeIndex) 
 *

 *

-*/

-*/





void BSSvRemoveOneNode(void *hDeviceContext, UINT uNodeIndex)

void BSSvRemoveOneNode(void *hDeviceContext, unsigned int uNodeIndex)

{

{





    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSDevice        pDevice = (PSDevice)hDeviceContext;
@@ -879,7 +884,7 @@ void BSSvUpdateAPNode(void *hDeviceContext, 
{

{

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    UINT            uRateLen = WLAN_RATES_MAXLEN;

    unsigned int            uRateLen = WLAN_RATES_MAXLEN;





    memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));

    memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));
@@ -967,11 +972,11 @@ void BSSvSecondCallBack(void *hDeviceContext) 
{

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    UINT            ii;

    unsigned int            ii;

    PWLAN_IE_SSID   pItemSSID, pCurrSSID;

    PWLAN_IE_SSID   pItemSSID, pCurrSSID;

    UINT            uSleepySTACnt = 0;

    unsigned int            uSleepySTACnt = 0;

    UINT            uNonShortSlotSTACnt = 0;

    unsigned int            uNonShortSlotSTACnt = 0;

    UINT            uLongPreambleSTACnt = 0;

    unsigned int            uLongPreambleSTACnt = 0;

    viawget_wpa_header *wpahdr;  //DavidWang

    viawget_wpa_header *wpahdr;  //DavidWang





    spin_lock_irq(&pDevice->lock);

    spin_lock_irq(&pDevice->lock);
@@ -1360,12 +1365,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, 
{

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    UINT            uNodeIndex = 0;

    unsigned int            uNodeIndex = 0;

    BYTE            byTxRetry;

    BYTE            byTxRetry;

    WORD            wRate;

    WORD            wRate;

    WORD            wFallBackRate = RATE_1M;

    WORD            wFallBackRate = RATE_1M;

    BYTE            byFallBack;

    BYTE            byFallBack;

    UINT            ii;

    unsigned int            ii;

    PBYTE           pbyDestAddr;

    PBYTE           pbyDestAddr;

    BYTE            byPktNum;

    BYTE            byPktNum;

    WORD            wFIFOCtl;

    WORD            wFIFOCtl;
@@ -1516,12 +1521,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, 
-*/

-*/





void BSSvClearNodeDBTable(void *hDeviceContext,

void BSSvClearNodeDBTable(void *hDeviceContext,

			  UINT uStartIndex)

			  unsigned int uStartIndex)

{

{

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSDevice     pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    struct sk_buff  *skb;

    struct sk_buff  *skb;

    UINT            ii;

    unsigned int            ii;





    for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) {

    for (ii = uStartIndex; ii < (MAX_NODE_NUM + 1); ii++) {

        if (pMgmt->sNodeDBTable[ii].bActive) {

        if (pMgmt->sNodeDBTable[ii].bActive) {
@@ -1586,9 +1591,9 @@ void s_vCheckSensitivity(void *hDeviceContext) 
void s_uCalculateLinkQual(void *hDeviceContext)

void s_uCalculateLinkQual(void *hDeviceContext)

{

{

   PSDevice        pDevice = (PSDevice)hDeviceContext;

   PSDevice        pDevice = (PSDevice)hDeviceContext;

   ULONG TxOkRatio, TxCnt;

   unsigned long TxOkRatio, TxCnt;

   ULONG RxOkRatio,RxCnt;

   unsigned long RxOkRatio, RxCnt;

   ULONG RssiRatio;

   unsigned long RssiRatio;

   long ldBm;

   long ldBm;





TxCnt = pDevice->scStatistic.TxNoRetryOkCount +

TxCnt = pDevice->scStatistic.TxNoRetryOkCount +
@@ -1633,7 +1638,7 @@ void BSSvClearAnyBSSJoinRecord(void *hDeviceContext) 
{

{

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSDevice        pDevice = (PSDevice)hDeviceContext;

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    PSMgmtObject    pMgmt = &(pDevice->sMgmtObj);

    UINT            ii;

    unsigned int            ii;





    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

    for (ii = 0; ii < MAX_BSS_NUM; ii++) {

        pMgmt->sBSSList[ii].bSelected = FALSE;

        pMgmt->sBSSList[ii].bSelected = FALSE;

drivers/staging/vt6656/bssdb.h

+24 −24
Original line number Original line Diff line number Diff line
@@ -97,10 +97,10 @@ typedef struct tagKnownBSS { 
    // BSS info

    // BSS info

    BOOL            bActive;

    BOOL            bActive;

    BYTE            abyBSSID[WLAN_BSSID_LEN];

    BYTE            abyBSSID[WLAN_BSSID_LEN];

    UINT            uChannel;

    unsigned int            uChannel;

    BYTE            abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];

    BYTE            abySuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];

    BYTE            abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];

    BYTE            abyExtSuppRates[WLAN_IEHDR_LEN + WLAN_RATES_MAXLEN + 1];

    UINT            uRSSI;

    unsigned int            uRSSI;

    BYTE            bySQ;

    BYTE            bySQ;

    WORD            wBeaconInterval;

    WORD            wBeaconInterval;

    WORD            wCapInfo;

    WORD            wCapInfo;
@@ -141,9 +141,9 @@ typedef struct tagKnownBSS { 
    WORD            wRSNLen;

    WORD            wRSNLen;





    // Clear count

    // Clear count

    UINT            uClearCount;

    unsigned int            uClearCount;

//    BYTE            abyIEs[WLAN_BEACON_FR_MAXLEN];

//    BYTE            abyIEs[WLAN_BEACON_FR_MAXLEN];

    UINT            uIELength;

    unsigned int            uIELength;

    QWORD           qwBSSTimestamp;

    QWORD           qwBSSTimestamp;

    QWORD           qwLocalTSF;     // local TSF timer

    QWORD           qwLocalTSF;     // local TSF timer
@@ -178,7 +178,7 @@ typedef struct tagKnownNodeDB { 
    BOOL            bShortPreamble;

    BOOL            bShortPreamble;

    BOOL            bERPExist;

    BOOL            bERPExist;

    BOOL            bShortSlotTime;

    BOOL            bShortSlotTime;

    UINT            uInActiveCount;

    unsigned int            uInActiveCount;

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

    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.

    WORD            wMaxSuppRate;      //Records the highest supported rate getting from SuppRates IE and ExtSuppRates IE in Beacon.

    WORD            wSuppRate;

    WORD            wSuppRate;
@@ -194,35 +194,35 @@ typedef struct tagKnownNodeDB { 
    BOOL            bPSEnable;

    BOOL            bPSEnable;

    BOOL            bRxPSPoll;

    BOOL            bRxPSPoll;

    BYTE            byAuthSequence;

    BYTE            byAuthSequence;

    ULONG           ulLastRxJiffer;

    unsigned long           ulLastRxJiffer;

    BYTE            bySuppRate;

    BYTE            bySuppRate;

    DWORD           dwFlags;

    DWORD           dwFlags;

    WORD            wEnQueueCnt;

    WORD            wEnQueueCnt;





    BOOL            bOnFly;

    BOOL            bOnFly;

    ULONGLONG       KeyRSC;

    unsigned long long       KeyRSC;

    BYTE            byKeyIndex;

    BYTE            byKeyIndex;

    DWORD           dwKeyIndex;

    DWORD           dwKeyIndex;

    BYTE            byCipherSuite;

    BYTE            byCipherSuite;

    DWORD           dwTSC47_16;

    DWORD           dwTSC47_16;

    WORD            wTSC15_0;

    WORD            wTSC15_0;

    UINT            uWepKeyLength;

    unsigned int            uWepKeyLength;

    BYTE            abyWepKey[WLAN_WEPMAX_KEYLEN];

    BYTE            abyWepKey[WLAN_WEPMAX_KEYLEN];

    //

    //

    // Auto rate fallback vars

    // Auto rate fallback vars

    BOOL            bIsInFallback;

    BOOL            bIsInFallback;

    UINT            uAverageRSSI;

    unsigned int            uAverageRSSI;

    UINT            uRateRecoveryTimeout;

    unsigned int            uRateRecoveryTimeout;

    UINT            uRatePollTimeout;

    unsigned int            uRatePollTimeout;

    UINT            uTxFailures;

    unsigned int            uTxFailures;

    UINT            uTxAttempts;

    unsigned int            uTxAttempts;





    UINT            uTxRetry;

    unsigned int            uTxRetry;

    UINT            uFailureRatio;

    unsigned int            uFailureRatio;

    UINT            uRetryRatio;

    unsigned int            uRetryRatio;

    UINT            uTxOk[MAX_RATE+1];

    unsigned int            uTxOk[MAX_RATE+1];

    UINT            uTxFail[MAX_RATE+1];

    unsigned int            uTxFail[MAX_RATE+1];

    UINT            uTimeCount;

    unsigned int            uTimeCount;





} KnownNodeDB, *PKnownNodeDB;

} KnownNodeDB, *PKnownNodeDB;
@@ -253,7 +253,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, 
			 PWLAN_IE_RSN_EXT pRSNWPA,

			 PWLAN_IE_RSN_EXT pRSNWPA,

			 PWLAN_IE_COUNTRY pIE_Country,

			 PWLAN_IE_COUNTRY pIE_Country,

			 PWLAN_IE_QUIET pIE_Quiet,

			 PWLAN_IE_QUIET pIE_Quiet,

			 UINT uIELength,

			 unsigned int uIELength,

			 PBYTE pbyIEs,

			 PBYTE pbyIEs,

			 void *pRxPacketContext);

			 void *pRxPacketContext);
@@ -272,7 +272,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, 
			 PWLAN_IE_COUNTRY pIE_Country,

			 PWLAN_IE_COUNTRY pIE_Country,

			 PWLAN_IE_QUIET pIE_Quiet,

			 PWLAN_IE_QUIET pIE_Quiet,

			 PKnownBSS pBSSList,

			 PKnownBSS pBSSList,

			 UINT uIELength,

			 unsigned int uIELength,

			 PBYTE pbyIEs,

			 PBYTE pbyIEs,

			 void *pRxPacketContext);

			 void *pRxPacketContext);
@@ -295,12 +295,12 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, 
			     BYTE byPktNO);

			     BYTE byPktNO);





void BSSvRemoveOneNode(void *hDeviceContext,

void BSSvRemoveOneNode(void *hDeviceContext,

		       UINT uNodeIndex);

		       unsigned int uNodeIndex);





void BSSvAddMulticastNode(void *hDeviceContext);

void BSSvAddMulticastNode(void *hDeviceContext);





void BSSvClearNodeDBTable(void *hDeviceContext,

void BSSvClearNodeDBTable(void *hDeviceContext,

			  UINT uStartIndex);

			  unsigned int uStartIndex);





void BSSvClearAnyBSSJoinRecord(void *hDeviceContext);

void BSSvClearAnyBSSJoinRecord(void *hDeviceContext);