diff options
Diffstat (limited to 'drivers/staging/vt6656')
-rw-r--r-- | drivers/staging/vt6656/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/bssdb.c | 8 | ||||
-rw-r--r-- | drivers/staging/vt6656/dpc.c | 10 | ||||
-rw-r--r-- | drivers/staging/vt6656/ioctl.c | 44 | ||||
-rw-r--r-- | drivers/staging/vt6656/main_usb.c | 7 | ||||
-rw-r--r-- | drivers/staging/vt6656/rxtx.c | 6 | ||||
-rw-r--r-- | drivers/staging/vt6656/wcmd.c | 12 | ||||
-rw-r--r-- | drivers/staging/vt6656/wmgr.c | 48 | ||||
-rw-r--r-- | drivers/staging/vt6656/wmgr.h | 4 | ||||
-rw-r--r-- | drivers/staging/vt6656/wpactl.c | 10 |
10 files changed, 74 insertions, 77 deletions
diff --git a/drivers/staging/vt6656/Kconfig b/drivers/staging/vt6656/Kconfig index a441ba5..f89ab20 100644 --- a/drivers/staging/vt6656/Kconfig +++ b/drivers/staging/vt6656/Kconfig @@ -1,6 +1,6 @@ config VT6656 tristate "VIA Technologies VT6656 support" - depends on USB && WLAN + depends on USB && WLAN && m select WIRELESS_EXT select WEXT_PRIV select FW_LOADER diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index 2bdd0a2..af006df 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -1192,7 +1192,7 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb)); netif_rx(pDevice->skb); pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); - }; + } #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT // if(pDevice->bWPASuppWextEnabled == TRUE) { @@ -1416,7 +1416,7 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, } } } - }; + } if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) || (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) { @@ -1472,9 +1472,9 @@ void BSSvUpdateNodeTxCounter(void *hDeviceContext, } } } - }; + } } - }; + } return; diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index f4fb0c6..cb817ce 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -730,7 +730,7 @@ RXbBulkInProcessData ( pMgmt->bInTIMWake = FALSE; } } - }; + } // Now it only supports 802.11g Infrastructure Mode, and support rate must up to 54 Mbps if (pDevice->bDiversityEnable && (FrameSize>50) && @@ -913,7 +913,7 @@ RXbBulkInProcessData ( memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb)); netif_rx(pDevice->skb); pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); - }; + } return FALSE; @@ -1045,7 +1045,7 @@ static BOOL s_bAPModeRxCtl ( ); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDeAuthenBeginSta 1\n"); return TRUE; - }; + } if (pMgmt->sNodeDBTable[iSANodeIndex].eNodeState < NODE_ASSOC) { // send deassoc notification // reason = (7) class 3 received from nonassoc sta @@ -1057,7 +1057,7 @@ static BOOL s_bAPModeRxCtl ( ); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDisassocBeginSta 2\n"); return TRUE; - }; + } if (pMgmt->sNodeDBTable[iSANodeIndex].bPSEnable) { // delcare received ps-poll event @@ -1488,7 +1488,7 @@ static BOOL s_bAPModeRxData ( bRelayOnly = TRUE; } } - }; + } } if (bRelayOnly || bRelayAndForward) { diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c index 2fe071c..cfe9c95 100644 --- a/drivers/staging/vt6656/ioctl.c +++ b/drivers/staging/vt6656/ioctl.c @@ -90,7 +90,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sScanCmd, pReq->data, sizeof(SCmdScan))) { result = -EFAULT; break; - }; + } pItemSSID = (PWLAN_IE_SSID)sScanCmd.ssid; if (pItemSSID->len != 0) { @@ -124,7 +124,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sZoneTypeCmd, pReq->data, sizeof(SCmdZoneTypeSet))) { result = -EFAULT; break; - }; + } if(sZoneTypeCmd.bWrite==TRUE) { //////write zonetype @@ -163,7 +163,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_to_user(pReq->data, &sZoneTypeCmd, sizeof(SCmdZoneTypeSet))) { result = -EFAULT; break; - }; + } } break; @@ -173,7 +173,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sJoinCmd, pReq->data, sizeof(SCmdBSSJoin))) { result = -EFAULT; break; - }; + } pItemSSID = (PWLAN_IE_SSID)sJoinCmd.ssid; memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); @@ -223,7 +223,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sWEPCmd, pReq->data, sizeof(SCmdSetWEP))) { result = -EFAULT; break; - }; + } if (sWEPCmd.bEnableWep != TRUE) { int uu; @@ -295,7 +295,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_to_user(pReq->data, &sLinkStatus, sizeof(SCmdLinkStatus))) { result = -EFAULT; break; - }; + } break; @@ -307,12 +307,12 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (!pBSS->bActive) continue; cbListCount++; - }; + } sList.uItem = cbListCount; if (copy_to_user(pReq->data, &sList, sizeof(SBSSIDList))) { result = -EFAULT; break; - }; + } pReq->wResult = 0; break; @@ -320,7 +320,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sList, pReq->data, sizeof(SBSSIDList))) { result = -EFAULT; break; - }; + } pList = (PSBSSIDList)kmalloc(sizeof(SBSSIDList) + (sList.uItem * sizeof(SBSSIDItem)), (int)GFP_ATOMIC); if (pList == NULL) { result = -ENOMEM; @@ -362,7 +362,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_to_user(pReq->data, pList, sizeof(SBSSIDList) + (sList.uItem * sizeof(SBSSIDItem)))) { result = -EFAULT; break; - }; + } kfree(pList); pReq->wResult = 0; break; @@ -371,14 +371,14 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_to_user(pReq->data, &(pDevice->s802_11Counter), sizeof(SDot11MIBCount))) { result = -EFAULT; break; - }; + } break; case WLAN_CMD_GET_STAT: if (copy_to_user(pReq->data, &(pDevice->scStatistic), sizeof(SStatCounter))) { result = -EFAULT; break; - }; + } break; case WLAN_CMD_STOP_MAC: @@ -415,7 +415,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) { result = -EFAULT; break; - }; + } if (sValue.dwValue == 1) { if (vt6656_hostap_set_hostapd(pDevice, 1, 1) == 0){ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Enable HOSTAP\n"); @@ -443,7 +443,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) { result = -EFAULT; break; - }; + } if (sValue.dwValue == 1) { pDevice->bEnable8021x = TRUE; @@ -463,7 +463,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) { result = -EFAULT; break; - }; + } if (sValue.dwValue == 1) { pDevice->bEnableHostWEP = TRUE; @@ -482,7 +482,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sValue, pReq->data, sizeof(SCmdValue))) { result = -EFAULT; break; - }; + } if (sValue.dwValue == 1) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "up wpadev\n"); memcpy(pDevice->wpadev->dev_addr, @@ -507,7 +507,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sStartAPCmd, pReq->data, sizeof(SCmdStartAP))) { result = -EFAULT; break; - }; + } if (sStartAPCmd.wBSSType == AP) { pMgmt->eConfigMode = WMAC_CONFIG_AP; @@ -594,13 +594,13 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (!pNode->bActive) continue; cbListCount++; - }; + } sNodeList.uItem = cbListCount; if (copy_to_user(pReq->data, &sNodeList, sizeof(SNodeList))) { result = -EFAULT; break; - }; + } pReq->wResult = 0; break; @@ -609,7 +609,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (copy_from_user(&sNodeList, pReq->data, sizeof(SNodeList))) { result = -EFAULT; break; - }; + } pNodeList = (PSNodeList)kmalloc(sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)), (int)GFP_ATOMIC); if (pNodeList == NULL) { result = -ENOMEM; @@ -645,11 +645,11 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { if (jj >= pNodeList->uItem) break; } - }; + } if (copy_to_user(pReq->data, pNodeList, sizeof(SNodeList) + (sNodeList.uItem * sizeof(SNodeItem)))) { result = -EFAULT; break; - }; + } kfree(pNodeList); pReq->wResult = 0; break; diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index af14ab0..e18efd4 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -709,7 +709,7 @@ static BOOL device_release_WPADEV(PSDevice pDevice) if(ii>20) break; } - }; + } return TRUE; } @@ -955,7 +955,6 @@ static BOOL device_alloc_bufs(PSDevice pDevice) { pDevice->pInterruptURB = usb_alloc_urb(0, GFP_ATOMIC); if (pDevice->pInterruptURB == NULL) { DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int urb\n"); - usb_kill_urb(pDevice->pControlURB); usb_free_urb(pDevice->pControlURB); goto free_rx_tx; } @@ -963,8 +962,6 @@ static BOOL device_alloc_bufs(PSDevice pDevice) { pDevice->intBuf.pDataBuf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL); if (pDevice->intBuf.pDataBuf == NULL) { DBG_PRT(MSG_LEVEL_ERR,KERN_ERR"Failed to alloc int buf\n"); - usb_kill_urb(pDevice->pControlURB); - usb_kill_urb(pDevice->pInterruptURB); usb_free_urb(pDevice->pControlURB); usb_free_urb(pDevice->pInterruptURB); goto free_rx_tx; @@ -995,7 +992,7 @@ static BOOL device_init_defrag_cb(PSDevice pDevice) { DBG_PRT(MSG_LEVEL_ERR,KERN_ERR "%s: can not alloc frag bufs\n", pDevice->dev->name); goto free_frag; - }; + } } pDevice->cbDFCB = CB_MAX_RX_FRAG; pDevice->cbFreeDFCB = pDevice->cbDFCB; diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 8f18578..9b64b10 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -1938,7 +1938,7 @@ s_vGenerateMACHeader ( * Out: * none * - * Return Value: CMD_STATUS_PENDING if MAC Tx resource avaliable; otherwise FALSE + * Return Value: CMD_STATUS_PENDING if MAC Tx resource available; otherwise FALSE * -*/ @@ -2441,13 +2441,13 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { if (pDevice->bEnableHostWEP) { uNodeIndex = 0; bNodeExist = TRUE; - }; + } } else { if (pDevice->bEnableHostWEP) { if (BSSbIsSTAInNodeDB(pDevice, (PBYTE)(p80211Header->sA3.abyAddr1), &uNodeIndex)) bNodeExist = TRUE; - }; + } bNeedACK = TRUE; pTxBufHead->wFIFOCtl |= FIFOCTL_NEEDACK; }; diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index b83b660..78ea121 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -421,7 +421,7 @@ void vRunCommand(void *hDeviceContext) pMgmt->eScanState = WMAC_IS_SCANNING; pDevice->byScanBBType = pDevice->byBBType; //lucas pDevice->bStopDataPkt = TRUE; - // Turn off RCR_BSSID filter everytime + // Turn off RCR_BSSID filter every time MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_BSSID); pDevice->byRxMode &= ~RCR_BSSID; @@ -604,7 +604,7 @@ void vRunCommand(void *hDeviceContext) // if Infra mode if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) { // Call mgr to begin the deauthentication - // reason = (3) beacuse sta has left ESS + // reason = (3) because sta has left ESS if (pMgmt->eCurrState >= WMAC_STATE_AUTH) { vMgrDeAuthenBeginSta((void *)pDevice, pMgmt, @@ -642,7 +642,7 @@ void vRunCommand(void *hDeviceContext) if (Status != CMD_STATUS_SUCCESS){ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_IBSS_CREATE fail!\n"); - }; + } BSSvAddMulticastNode(pDevice); } s_bClearBSSID_SCAN(pDevice); @@ -658,7 +658,7 @@ void vRunCommand(void *hDeviceContext) if (Status != CMD_STATUS_SUCCESS){ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "WLAN_CMD_IBSS_CREATE fail!\n"); - }; + } BSSvAddMulticastNode(pDevice); s_bClearBSSID_SCAN(pDevice); /* @@ -793,7 +793,7 @@ void vRunCommand(void *hDeviceContext) if (Status != CMD_STATUS_SUCCESS) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "vMgrCreateOwnIBSS fail!\n"); - }; + } // alway turn off unicast bit MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_UNICAST); pDevice->byRxMode &= ~RCR_UNICAST; @@ -827,7 +827,7 @@ void vRunCommand(void *hDeviceContext) pMgmt->sNodeDBTable[0].wEnQueueCnt--; } - }; + } // PS nodes tx for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) { diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index 2ec200d..d67748f 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -593,7 +593,7 @@ void vMgrDisassocBeginSta(void *hDeviceContext, if (*pStatus == CMD_STATUS_PENDING) { pMgmt->eCurrState = WMAC_STATE_IDLE; *pStatus = CMD_STATUS_SUCCESS; - }; + } return; } @@ -942,7 +942,7 @@ s_vMgrRxAssocResponse( || (sFrame.pSuppRates == NULL)) { DBG_PORT80(0xCC); return; - }; + } pMgmt->sAssocInfo.AssocInfo.ResponseFixedIEs.Capabilities = *(sFrame.pwCapInfo); pMgmt->sAssocInfo.AssocInfo.ResponseFixedIEs.StatusCode = *(sFrame.pwStatus); @@ -962,7 +962,7 @@ s_vMgrRxAssocResponse( if ( (pMgmt->wCurrAID >> 14) != (BIT0 | BIT1) ) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "AID from AP, has two msb clear.\n"); - }; + } DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "Association Successful, AID=%d.\n", pMgmt->wCurrAID & ~(BIT14|BIT15)); pMgmt->eCurrState = WMAC_STATE_ASSOC; BSSvUpdateAPNode((void *) pDevice, @@ -1621,7 +1621,7 @@ s_vMgrRxDisassociation( memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb)); netif_rx(pDevice->skb); pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); - }; + } //TODO: do something let upper layer know or //try to send associate packet again because of inactivity timeout @@ -1636,7 +1636,7 @@ s_vMgrRxDisassociation( pDevice->byReAssocCount ++; return; //mike add: you'll retry for many times, so it cann't be regarded as disconnected! } - }; + } #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT // if(pDevice->bWPASuppWextEnabled == TRUE) @@ -1710,7 +1710,7 @@ s_vMgrRxDeauthentication( pDevice->bLinkPass = FALSE; ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_SLOW); } - }; + } if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) { wpahdr = (viawget_wpa_header *)pDevice->skb->data; @@ -1725,7 +1725,7 @@ s_vMgrRxDeauthentication( memset(pDevice->skb->cb, 0, sizeof(pDevice->skb->cb)); netif_rx(pDevice->skb); pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); - }; + } #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT // if(pDevice->bWPASuppWextEnabled == TRUE) @@ -1845,7 +1845,7 @@ s_vMgrRxBeacon( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx beacon frame error\n"); return; - }; + } if( byCurrChannel > CB_MAX_CHANNEL_24G ) { @@ -1974,7 +1974,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) sFrame.pSSID->len ) == 0) { bIsSSIDEqual = TRUE; - }; + } } if ((WLAN_GET_CAP_INFO_ESS(*sFrame.pwCapInfo)== TRUE) && @@ -2074,8 +2074,8 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) if (WLAN_GET_CAP_INFO_ESS(*sFrame.pwCapInfo)) { if (sFrame.pCFParms->wCFPDurRemaining > 0) { // TODO: deal with CFP period to set NAV - }; - }; + } + } HIDWORD(qwTimestamp) = cpu_to_le32(HIDWORD(*sFrame.pqwTimestamp)); LODWORD(qwTimestamp) = cpu_to_le32(LODWORD(*sFrame.pqwTimestamp)); @@ -2096,7 +2096,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) } else if (HIDWORD(qwTimestamp) < HIDWORD(qwLocalTSF)) { bTSFOffsetPostive = FALSE; - }; + } if (bTSFOffsetPostive) { qwTSFOffset = CARDqGetTSFOffset(pRxPacket->byRxRate, (qwTimestamp), (qwLocalTSF)); @@ -2154,7 +2154,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) if (pMgmt->bInTIM) { PSvSendPSPOLL((PSDevice)pDevice); // DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN:PS-POLL sent..\n"); - }; + } } else { @@ -2167,7 +2167,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) } if(PSbConsiderPowerDown(pDevice, FALSE, FALSE)) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BCN: Power down now...\n"); - }; + } } } @@ -2247,7 +2247,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) pMgmt->sNodeDBTable[0].bActive = TRUE; pMgmt->sNodeDBTable[0].uInActiveCount = 0; - }; + } } else if (bIsSSIDEqual) { @@ -2292,9 +2292,9 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) // Prepare beacon frame bMgrPrepareBeaconToSend((void *) pDevice, pMgmt); // } - }; + } } - }; + } // endian issue ??? // Update TSF if (bUpdateTSF) { @@ -2556,7 +2556,7 @@ void vMgrCreateOwnIBSS(void *hDeviceContext, pMgmt->byCSSPK = KEY_CTL_WEP; pMgmt->byCSSGK = KEY_CTL_WEP; } - }; + } pMgmt->byERPContext = 0; @@ -2614,7 +2614,7 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus) *pStatus = CMD_STATUS_RESOURCES; DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "BSS finding:BSS list is empty.\n"); return; - }; + } // memset(pMgmt->abyDesireBSSID, 0, WLAN_BSSID_LEN); // Search known BSS list for prefer BSSID or SSID @@ -2630,7 +2630,7 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus) pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Scanning [%s] not found, disconnected !\n", pItemSSID->abySSID); return; - }; + } DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "AP(BSS) finding:Found a AP(BSS)..\n"); @@ -3061,7 +3061,7 @@ s_vMgrSynchBSS ( MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID); pDevice->byRxMode |= RCR_BSSID; pMgmt->bCurrBSSIDFilterOn = TRUE; - }; + } if (pDevice->byBBType == BB_TYPE_11A) { memcpy(pMgmt->abyCurrSuppRates, &abyCurrSuppRatesA[0], sizeof(abyCurrSuppRatesA)); @@ -3167,7 +3167,7 @@ s_vMgrFormatTIM( } wEndIndex = (WORD)ii; } - }; + } // Round start index down to nearest even number @@ -4209,7 +4209,7 @@ s_vMgrRxProbeResponse( pRxPacket->p80211Header); DBG_PORT80(0xCC); return; - }; + } if(sFrame.pSSID->len == 0) DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Rx Probe resp: SSID len = 0 \n"); @@ -4491,7 +4491,7 @@ void vMgrRxManagePacket(void *hDeviceContext, //DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "rx beacon\n"); if (pMgmt->eScanState != WMAC_NO_SCANNING) { bInScan = TRUE; - }; + } s_vMgrRxBeacon(pDevice, pMgmt, pRxPacket, bInScan); break; diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h index 594f3a8..13dfb3b 100644 --- a/drivers/staging/vt6656/wmgr.h +++ b/drivers/staging/vt6656/wmgr.h @@ -218,7 +218,7 @@ typedef enum tagWMAC_POWER_MODE { -// Tx Managment Packet descriptor +// Tx Management Packet descriptor typedef struct tagSTxMgmtPacket { PUWLAN_80211HDR p80211Header; @@ -228,7 +228,7 @@ typedef struct tagSTxMgmtPacket { } STxMgmtPacket, *PSTxMgmtPacket; -// Rx Managment Packet descriptor +// Rx Management Packet descriptor typedef struct tagSRxMgmtPacket { PUWLAN_80211HDR p80211Header; diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c index 8752736..9216df0 100644 --- a/drivers/staging/vt6656/wpactl.c +++ b/drivers/staging/vt6656/wpactl.c @@ -660,7 +660,7 @@ static int wpa_get_scan(PSDevice pDevice, } - }; + } kfree(ptempBSS); @@ -673,7 +673,7 @@ static int wpa_get_scan(PSDevice pDevice, if (!pBSS->bActive) continue; count++; - }; + } pBuf = kcalloc(count, sizeof(struct viawget_scan_result), (int)GFP_ATOMIC); @@ -729,7 +729,7 @@ static int wpa_get_scan(PSDevice pDevice, if (copy_to_user(param->u.scan_results.buf, pBuf, sizeof(struct viawget_scan_result) * count)) { ret = -EFAULT; - }; + } param->u.scan_results.scan_count = count; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " param->u.scan_results.scan_count = %d\n", count) @@ -831,7 +831,7 @@ static int wpa_set_associate(PSDevice pDevice, break; default: pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled; - }; + } pMgmt->Roam_dbm = param->u.wpa_associate.roam_dbm; // if ((pMgmt->Roam_dbm > 40)&&(pMgmt->Roam_dbm<80)) @@ -886,7 +886,7 @@ static int wpa_set_associate(PSDevice pDevice, bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID); - }; + } } /****************************************************************/ |