Commit a0a1f61a authored by Justin P. Mattock's avatar Justin P. Mattock Committed by Greg Kroah-Hartman

staging "vt6656" Fix typos in comments, and in a printk message.

Signed-off-by: default avatarJustin P. Mattock <justinmattock@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7664ec86
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
// //
// Cipher Suite Selectors defiened in 802.11i // Cipher Suite Selectors defined in 802.11i
// //
#define WLAN_11i_CSS_USE_GROUP 0 #define WLAN_11i_CSS_USE_GROUP 0
#define WLAN_11i_CSS_WEP40 1 #define WLAN_11i_CSS_WEP40 1
...@@ -720,7 +720,7 @@ typedef struct tagWLAN_FR_AUTHEN { ...@@ -720,7 +720,7 @@ typedef struct tagWLAN_FR_AUTHEN {
} WLAN_FR_AUTHEN, *PWLAN_FR_AUTHEN; } WLAN_FR_AUTHEN, *PWLAN_FR_AUTHEN;
// Deauthenication // Deauthentication
typedef struct tagWLAN_FR_DEAUTHEN { typedef struct tagWLAN_FR_DEAUTHEN {
unsigned int uType; unsigned int uType;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* *
* Functions: * Functions:
* BBuGetFrameTime - Calculate data frame transmitting time * BBuGetFrameTime - Calculate data frame transmitting time
* BBvCaculateParameter - Caculate PhyLength, PhyService and Phy Signal parameter for baseband Tx * BBvCaculateParameter - Calculate PhyLength, PhyService and Phy Signal parameter for baseband Tx
* BBbVT3184Init - VIA VT3184 baseband chip init code * BBbVT3184Init - VIA VT3184 baseband chip init code
* BBvLoopbackOn - Turn on BaseBand Loopback mode * BBvLoopbackOn - Turn on BaseBand Loopback mode
* BBvLoopbackOff - Turn off BaseBand Loopback mode * BBvLoopbackOff - Turn off BaseBand Loopback mode
...@@ -741,7 +741,7 @@ BBuGetFrameTime ( ...@@ -741,7 +741,7 @@ BBuGetFrameTime (
} }
/* /*
* Description: Caculate Length, Service, and Signal fields of Phy for Tx * Description: Calculate Length, Service, and Signal fields of Phy for Tx
* *
* Parameters: * Parameters:
* In: * In:
......
...@@ -226,7 +226,7 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, ...@@ -226,7 +226,7 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
if (pSelect == NULL) { if (pSelect == NULL) {
pSelect = pCurrBSS; pSelect = pCurrBSS;
} else { } else {
// compare RSSI, select signal strong one // compare RSSI, select the strongest signal
if (pCurrBSS->uRSSI < pSelect->uRSSI) { if (pCurrBSS->uRSSI < pSelect->uRSSI) {
pSelect = pCurrBSS; pSelect = pCurrBSS;
} }
...@@ -274,9 +274,9 @@ void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID) ...@@ -274,9 +274,9 @@ void BSSvClearBSSList(void *hDeviceContext, BOOL bKeepCurrBSSID)
if (pMgmt->sBSSList[ii].bActive && if (pMgmt->sBSSList[ii].bActive &&
!compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID, !compare_ether_addr(pMgmt->sBSSList[ii].abyBSSID,
pMgmt->abyCurrBSSID)) { pMgmt->abyCurrBSSID)) {
//mike mark: there are two same BSSID in list if that AP is in hidden ssid mode,one 's SSID is null, //mike mark: there are two BSSID's in list. If that AP is in hidden ssid mode, one SSID is null,
// but other's is obvious, so if it acssociate with your STA exactly,you must keep two // but other's might not be obvious, so if it associate's with your STA,
// of them!!!!!!!!! // you must keep the two of them!!
// bKeepCurrBSSID = FALSE; // bKeepCurrBSSID = FALSE;
continue; continue;
} }
...@@ -489,7 +489,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext, ...@@ -489,7 +489,7 @@ BOOL BSSbInsertToBSSList(void *hDeviceContext,
} }
if (pDevice->bUpdateBBVGA) { if (pDevice->bUpdateBBVGA) {
// Moniter if RSSI is too strong. // Monitor if RSSI is too strong.
pBSSList->byRSSIStatCnt = 0; pBSSList->byRSSIStatCnt = 0;
RFvRSSITodBm(pDevice, (BYTE)(pRxPacket->uRSSI), &pBSSList->ldBmMAX); RFvRSSITodBm(pDevice, (BYTE)(pRxPacket->uRSSI), &pBSSList->ldBmMAX);
pBSSList->ldBmAverage[0] = pBSSList->ldBmMAX; pBSSList->ldBmAverage[0] = pBSSList->ldBmMAX;
...@@ -621,7 +621,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext, ...@@ -621,7 +621,7 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext,
if (pRxPacket->uRSSI != 0) { if (pRxPacket->uRSSI != 0) {
RFvRSSITodBm(pDevice, (BYTE)(pRxPacket->uRSSI), &ldBm); RFvRSSITodBm(pDevice, (BYTE)(pRxPacket->uRSSI), &ldBm);
// Moniter if RSSI is too strong. // Monitor if RSSI is too strong.
pBSSList->byRSSIStatCnt++; pBSSList->byRSSIStatCnt++;
pBSSList->byRSSIStatCnt %= RSSI_STAT_COUNT; pBSSList->byRSSIStatCnt %= RSSI_STAT_COUNT;
pBSSList->ldBmAverage[pBSSList->byRSSIStatCnt] = ldBm; pBSSList->ldBmAverage[pBSSList->byRSSIStatCnt] = ldBm;
...@@ -687,8 +687,8 @@ BOOL BSSbIsSTAInNodeDB(void *hDeviceContext, ...@@ -687,8 +687,8 @@ BOOL BSSbIsSTAInNodeDB(void *hDeviceContext,
/*+ /*+
* *
* Routine Description: * Routine Description:
* Find an empty node and allocated; if no empty found, * Find an empty node and allocate it; if no empty node
* instand used of most inactive one. * is found, then use the most inactive one.
* *
* Return Value: * Return Value:
* None * None
...@@ -718,7 +718,7 @@ void BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex) ...@@ -718,7 +718,7 @@ void BSSvCreateOneNode(void *hDeviceContext, unsigned int *puNodeIndex)
} }
} }
// if not found replace uInActiveCount is largest one. // if not found replace uInActiveCount with the largest one.
if ( ii == (MAX_NODE_NUM + 1)) { if ( ii == (MAX_NODE_NUM + 1)) {
*puNodeIndex = SelectIndex; *puNodeIndex = SelectIndex;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Replace inactive node = %d\n", SelectIndex); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Replace inactive node = %d\n", SelectIndex);
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
* CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet * CARDbIsOFDMinBasicRate - Check if any OFDM rate is in BasicRateSet
* CARDvSetLoopbackMode - Set Loopback mode * CARDvSetLoopbackMode - Set Loopback mode
* CARDbSoftwareReset - Sortware reset NIC * CARDbSoftwareReset - Sortware reset NIC
* CARDqGetTSFOffset - Caculate TSFOffset * CARDqGetTSFOffset - Calculate TSFOffset
* CARDbGetCurrentTSF - Read Current NIC TSF counter * CARDbGetCurrentTSF - Read Current NIC TSF counter
* CARDqGetNextTBTT - Caculate Next Beacon TSF counter * CARDqGetNextTBTT - Calculate Next Beacon TSF counter
* CARDvSetFirstNextTBTT - Set NIC Beacon time * CARDvSetFirstNextTBTT - Set NIC Beacon time
* CARDvUpdateNextTBTT - Sync. NIC Beacon time * CARDvUpdateNextTBTT - Sync. NIC Beacon time
* CARDbRadioPowerOff - Turn Off NIC Radio Power * CARDbRadioPowerOff - Turn Off NIC Radio Power
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* *
* Revision History: * Revision History:
* 06-10-2003 Bryan YC Fan: Re-write codes to support VT3253 spec. * 06-10-2003 Bryan YC Fan: Re-write codes to support VT3253 spec.
* 08-26-2003 Kyle Hsu: Modify the defination type of dwIoBase. * 08-26-2003 Kyle Hsu: Modify the definition type of dwIoBase.
* 09-01-2003 Bryan YC Fan: Add vUpdateIFS(). * 09-01-2003 Bryan YC Fan: Add vUpdateIFS().
* *
*/ */
...@@ -200,7 +200,7 @@ static WORD swGetOFDMControlRate(void *pDeviceHandler, WORD wRateIdx) ...@@ -200,7 +200,7 @@ static WORD swGetOFDMControlRate(void *pDeviceHandler, WORD wRateIdx)
} }
/* /*
* Description: Caculate TxRate and RsvTime fields for RSPINF in OFDM mode. * Description: Calculate TxRate and RsvTime fields for RSPINF in OFDM mode.
* *
* Parameters: * Parameters:
* In: * In:
...@@ -640,7 +640,7 @@ BYTE CARDbyGetPktType(void *pDeviceHandler) ...@@ -640,7 +640,7 @@ BYTE CARDbyGetPktType(void *pDeviceHandler)
/* /*
* Description: Caculate TSF offset of two TSF input * Description: Calculate TSF offset of two TSF input
* Get TSF Offset from RxBCN's TSF and local TSF * Get TSF Offset from RxBCN's TSF and local TSF
* *
* Parameters: * Parameters:
......
...@@ -478,7 +478,7 @@ typedef struct __device_info { ...@@ -478,7 +478,7 @@ typedef struct __device_info {
unsigned int cbTD; unsigned int cbTD;
// //
// Variables to track resources for the Interript In Pipe // Variables to track resources for the Interrupt In Pipe
// //
INT_BUFFER intBuf; INT_BUFFER intBuf;
BOOL fKillEventPollingThread; BOOL fKillEventPollingThread;
......
...@@ -748,7 +748,7 @@ RXbBulkInProcessData ( ...@@ -748,7 +748,7 @@ RXbBulkInProcessData (
if ((*pbyRSSI != 0) && if ((*pbyRSSI != 0) &&
(pMgmt->pCurrBSS!=NULL)) { (pMgmt->pCurrBSS!=NULL)) {
RFvRSSITodBm(pDevice, *pbyRSSI, &ldBm); RFvRSSITodBm(pDevice, *pbyRSSI, &ldBm);
// Moniter if RSSI is too strong. // Monitor if RSSI is too strong.
pMgmt->pCurrBSS->byRSSIStatCnt++; pMgmt->pCurrBSS->byRSSIStatCnt++;
pMgmt->pCurrBSS->byRSSIStatCnt %= RSSI_STAT_COUNT; pMgmt->pCurrBSS->byRSSIStatCnt %= RSSI_STAT_COUNT;
pMgmt->pCurrBSS->ldBmAverage[pMgmt->pCurrBSS->byRSSIStatCnt] = ldBm; pMgmt->pCurrBSS->ldBmAverage[pMgmt->pCurrBSS->byRSSIStatCnt] = ldBm;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* *
* File: hostap.c * File: hostap.c
* *
* Purpose: handle hostap deamon ioctl input/out functions * Purpose: handle hostap daemon ioctl input/out functions
* *
* Author: Lyndon Chen * Author: Lyndon Chen
* *
...@@ -48,7 +48,7 @@ static int msglevel =MSG_LEVEL_INFO; ...@@ -48,7 +48,7 @@ static int msglevel =MSG_LEVEL_INFO;
/* /*
* Description: * Description:
* register net_device (AP) for hostap deamon * register net_device (AP) for hostap daemon
* *
* Parameters: * Parameters:
* In: * In:
...@@ -176,7 +176,7 @@ int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked) ...@@ -176,7 +176,7 @@ int vt6656_hostap_set_hostapd(PSDevice pDevice, int val, int rtnl_locked)
/* /*
* Description: * Description:
* remove station function supported for hostap deamon * remove station function supported for hostap daemon
* *
* Parameters: * Parameters:
* In: * In:
...@@ -204,7 +204,7 @@ static int hostap_remove_sta(PSDevice pDevice, ...@@ -204,7 +204,7 @@ static int hostap_remove_sta(PSDevice pDevice,
/* /*
* Description: * Description:
* add a station from hostap deamon * add a station from hostap daemon
* *
* Parameters: * Parameters:
* In: * In:
...@@ -686,7 +686,7 @@ static int hostap_get_encryption(PSDevice pDevice, ...@@ -686,7 +686,7 @@ static int hostap_get_encryption(PSDevice pDevice,
/* /*
* Description: * Description:
* vt6656_hostap_ioctl main function supported for hostap deamon. * vt6656_hostap_ioctl main function supported for hostap daemon.
* *
* Parameters: * Parameters:
* In: * In:
......
...@@ -149,7 +149,7 @@ void INTnsProcessData(PSDevice pDevice) ...@@ -149,7 +149,7 @@ void INTnsProcessData(PSDevice pDevice)
pMgmt->sNodeDBTable[0].bRxPSPoll = pMgmt->sNodeDBTable[0].bRxPSPoll =
FALSE; FALSE;
} else if (pMgmt->byDTIMCount == 0) { } else if (pMgmt->byDTIMCount == 0) {
/* check if mutltcast tx bufferring */ /* check if multicast tx buffering */
pMgmt->byDTIMCount = pMgmt->byDTIMCount =
pMgmt->byDTIMPeriod-1; pMgmt->byDTIMPeriod-1;
pMgmt->sNodeDBTable[0].bRxPSPoll = TRUE; pMgmt->sNodeDBTable[0].bRxPSPoll = TRUE;
......
...@@ -617,7 +617,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) ...@@ -617,7 +617,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
result = -EFAULT; result = -EFAULT;
break; break;
} }
/* for some AP maybe good authenticate */ /* for some AP's maybe a good authentication */
if (wpa_Result.key_mgmt == 0x20) if (wpa_Result.key_mgmt == 0x20)
pMgmt->Cisco_cckm = 1; pMgmt->Cisco_cckm = 1;
else else
...@@ -641,7 +641,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) ...@@ -641,7 +641,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
break; break;
default: default:
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Private command not support..\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Private command not supported..\n");
} }
return result; return result;
......
...@@ -674,7 +674,7 @@ int iwctl_giwaplist(struct net_device *dev, struct iw_request_info *info, ...@@ -674,7 +674,7 @@ int iwctl_giwaplist(struct net_device *dev, struct iw_request_info *info,
jj++; jj++;
} }
wrq->flags = 1; // Should be define'd wrq->flags = 1; // Should be defined
wrq->length = jj; wrq->length = jj;
memcpy(extra, sock, sizeof(struct sockaddr) * jj); memcpy(extra, sock, sizeof(struct sockaddr) * jj);
memcpy(extra + sizeof(struct sockaddr) * jj, qual, sizeof(struct iw_quality) * jj); memcpy(extra + sizeof(struct sockaddr) * jj, qual, sizeof(struct iw_quality) * jj);
......
...@@ -403,7 +403,7 @@ BOOL KeybRemoveKey( ...@@ -403,7 +403,7 @@ BOOL KeybRemoveKey(
BOOL bReturnValue = FALSE; BOOL bReturnValue = FALSE;
if (is_broadcast_ether_addr(pbyBSSID)) { if (is_broadcast_ether_addr(pbyBSSID)) {
// dealte all key // delete all keys
if ((dwKeyIndex & PAIRWISE_KEY) != 0) { if ((dwKeyIndex & PAIRWISE_KEY) != 0) {
for (i=0;i<MAX_KEY_TABLE;i++) { for (i=0;i<MAX_KEY_TABLE;i++) {
pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE; pTable->KeyTable[i].PairwiseKey.bKeyValid = FALSE;
...@@ -618,7 +618,7 @@ BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType, ...@@ -618,7 +618,7 @@ BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType,
/* /*
* Description: Check Pairewise Key * Description: Check Pairwise Key
* *
* Parameters: * Parameters:
* In: * In:
......
...@@ -29,14 +29,14 @@ ...@@ -29,14 +29,14 @@
* vt6656_probe - module initial (insmod) driver entry * vt6656_probe - module initial (insmod) driver entry
* device_remove1 - module remove entry * device_remove1 - module remove entry
* device_open - allocate dma/descripter resource & initial mac/bbp function * device_open - allocate dma/descripter resource & initial mac/bbp function
* device_xmit - asynchrous data tx function * device_xmit - asynchronous data tx function
* device_set_multi - set mac filter * device_set_multi - set mac filter
* device_ioctl - ioctl entry * device_ioctl - ioctl entry
* device_close - shutdown mac/bbp & free dma/descripter resource * device_close - shutdown mac/bbp & free dma/descriptor resource
* device_alloc_frag_buf - rx fragement pre-allocated function * device_alloc_frag_buf - rx fragement pre-allocated function
* device_free_tx_bufs - free tx buffer function * device_free_tx_bufs - free tx buffer function
* device_dma0_tx_80211- tx 802.11 frame via dma0 * device_dma0_tx_80211- tx 802.11 frame via dma0
* device_dma0_xmit- tx PS bufferred frame via dma0 * device_dma0_xmit- tx PS buffered frame via dma0
* device_init_registers- initial MAC & BBP & RF internal registers. * device_init_registers- initial MAC & BBP & RF internal registers.
* device_init_rings- initial tx/rx ring buffer * device_init_rings- initial tx/rx ring buffer
* device_init_defrag_cb- initial & allocate de-fragement buffer. * device_init_defrag_cb- initial & allocate de-fragement buffer.
...@@ -316,7 +316,7 @@ static void device_init_diversity_timer(PSDevice pDevice) ...@@ -316,7 +316,7 @@ static void device_init_diversity_timer(PSDevice pDevice)
// //
// Initialiation of MAC & BBP registers // Initialization of MAC & BBP registers
// //
static BOOL device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) static BOOL device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
...@@ -639,7 +639,7 @@ static BOOL device_release_WPADEV(PSDevice pDevice) ...@@ -639,7 +639,7 @@ static BOOL device_release_WPADEV(PSDevice pDevice)
viawget_wpa_header *wpahdr; viawget_wpa_header *wpahdr;
int ii=0; int ii=0;
// wait_queue_head_t Set_wait; // wait_queue_head_t Set_wait;
//send device close to wpa_supplicnat layer //send device close to wpa_supplicant layer
if (pDevice->bWPADEVUp==TRUE) { if (pDevice->bWPADEVUp==TRUE) {
wpahdr = (viawget_wpa_header *)pDevice->skb->data; wpahdr = (viawget_wpa_header *)pDevice->skb->data;
wpahdr->type = VIAWGET_DEVICECLOSE_MSG; wpahdr->type = VIAWGET_DEVICECLOSE_MSG;
...@@ -1010,7 +1010,7 @@ static int device_open(struct net_device *dev) { ...@@ -1010,7 +1010,7 @@ static int device_open(struct net_device *dev) {
} }
if (device_init_defrag_cb(pDevice)== FALSE) { if (device_init_defrag_cb(pDevice)== FALSE) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Initial defragement cb fail \n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Initial defragment cb fail \n");
goto free_rx_tx; goto free_rx_tx;
} }
...@@ -1296,7 +1296,7 @@ static inline u32 ether_crc(int length, unsigned char *data) ...@@ -1296,7 +1296,7 @@ static inline u32 ether_crc(int length, unsigned char *data)
return crc; return crc;
} }
//find out the start position of str2 from str1 //find out the start position of str2 from str1
static unsigned char *kstrstr(const unsigned char *str1, static unsigned char *kstrstr(const unsigned char *str1,
const unsigned char *str2) { const unsigned char *str2) {
int str1_len = strlen(str1); int str1_len = strlen(str1);
...@@ -1345,7 +1345,7 @@ static int Config_FileGetParameter(unsigned char *string, ...@@ -1345,7 +1345,7 @@ static int Config_FileGetParameter(unsigned char *string,
} }
memset(buf2,0,100); memset(buf2,0,100);
memcpy(buf2,start_p,end_p-start_p); //get the tartget line memcpy(buf2,start_p,end_p-start_p); //get the target line
buf2[end_p-start_p]='\0'; buf2[end_p-start_p]='\0';
//find value //find value
...@@ -1396,7 +1396,7 @@ static unsigned char *Config_FileOperation(PSDevice pDevice) ...@@ -1396,7 +1396,7 @@ static unsigned char *Config_FileOperation(PSDevice pDevice)
} }
if(!(filp->f_op) || !(filp->f_op->read) ||!(filp->f_op->write)) { if(!(filp->f_op) || !(filp->f_op->read) ||!(filp->f_op->write)) {
printk("file %s cann't readable or writable?\n",config_path); printk("file %s is not read or writeable?\n",config_path);
result = -1; result = -1;
goto error1; goto error1;
} }
...@@ -1969,7 +1969,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { ...@@ -1969,7 +1969,7 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
default: default:
rc = -EOPNOTSUPP; rc = -EOPNOTSUPP;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Ioctl command not support..%x\n", cmd); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Ioctl command not supported..%x\n", cmd);
} }
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* *
* File: power.c * File: power.c
* *
* Purpose: Handles 802.11 power management functions * Purpose: Handles 802.11 power management functions
* *
* Author: Lyndon Chen * Author: Lyndon Chen
* *
......
...@@ -1048,7 +1048,7 @@ BYTE abyArray[256]; ...@@ -1048,7 +1048,7 @@ BYTE abyArray[256];
wLength1, wLength1,
abyArray abyArray
); );
//Channle Table 0 //Channel Table 0
wValue = 0; wValue = 0;
while ( wLength2 > 0 ) { while ( wLength2 > 0 ) {
...@@ -1106,7 +1106,7 @@ BYTE abyArray[256]; ...@@ -1106,7 +1106,7 @@ BYTE abyArray[256];
wLength1, wLength1,
abyArray); abyArray);
//Channle Table 0 //Channel Table 0
wValue = 0; wValue = 0;
while ( wLength2 > 0 ) { while ( wLength2 > 0 ) {
......
...@@ -1827,7 +1827,7 @@ s_bPacketToWirelessUsb( ...@@ -1827,7 +1827,7 @@ s_bPacketToWirelessUsb(
* *
* Parameters: * Parameters:
* In: * In:
* pDevice - Pointer to adpater * pDevice - Pointer to adapter
* dwTxBufferAddr - Transmit Buffer * dwTxBufferAddr - Transmit Buffer
* pPacket - Packet from upper layer * pPacket - Packet from upper layer
* cbPacketSize - Transmit Data Length * cbPacketSize - Transmit Data Length
...@@ -2198,7 +2198,7 @@ CMD_STATUS csMgmt_xmit( ...@@ -2198,7 +2198,7 @@ CMD_STATUS csMgmt_xmit(
if (bIsPSPOLL) { if (bIsPSPOLL) {
// The MAC will automatically replace the Duration-field of MAC header by Duration-field // The MAC will automatically replace the Duration-field of MAC header by Duration-field
// of FIFO control header. // of FIFO control header.
// This will cause AID-field of PS-POLL packet be incorrect (Because PS-POLL's AID field is // This will cause AID-field of PS-POLL packet be incorrect (Because PS-POLL's AID field is
// in the same place of other packet's Duration-field). // in the same place of other packet's Duration-field).
// And it will cause Cisco-AP to issue Disassociation-packet // And it will cause Cisco-AP to issue Disassociation-packet
...@@ -2473,7 +2473,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { ...@@ -2473,7 +2473,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
cbMacHdLen = WLAN_HDR_ADDR3_LEN; cbMacHdLen = WLAN_HDR_ADDR3_LEN;
} }
// hostapd deamon ext support rate patch // hostapd daemon ext support rate patch
if (WLAN_GET_FC_FSTYPE(p80211Header->sA4.wFrameCtl) == WLAN_FSTYPE_ASSOCRESP) { if (WLAN_GET_FC_FSTYPE(p80211Header->sA4.wFrameCtl) == WLAN_FSTYPE_ASSOCRESP) {
if (((PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates)->len != 0) { if (((PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates)->len != 0) {
...@@ -2591,7 +2591,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) { ...@@ -2591,7 +2591,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb) {
pMACHeader->wFrameCtl &= cpu_to_le16(0xfffc); pMACHeader->wFrameCtl &= cpu_to_le16(0xfffc);
memcpy(pbyPayloadHead, (skb->data + cbMacHdLen), cbFrameBodySize); memcpy(pbyPayloadHead, (skb->data + cbMacHdLen), cbFrameBodySize);
// replace support rate, patch for hostapd deamon( only support 11M) // replace support rate, patch for hostapd daemon( only support 11M)
if (WLAN_GET_FC_FSTYPE(p80211Header->sA4.wFrameCtl) == WLAN_FSTYPE_ASSOCRESP) { if (WLAN_GET_FC_FSTYPE(p80211Header->sA4.wFrameCtl) == WLAN_FSTYPE_ASSOCRESP) {
if (cbExtSuppRate != 0) { if (cbExtSuppRate != 0) {
if (((PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates)->len != 0) if (((PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates)->len != 0)
...@@ -2855,7 +2855,7 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb) ...@@ -2855,7 +2855,7 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
} }
PRINT_K("Authentication completed!!\n"); PRINT_K("Authentication completed!!\n");
} }
else if((Key_info & BIT3) && (Descriptor_type==2) && //RSN pairse-key challenge else if((Key_info & BIT3) && (Descriptor_type==2) && //RSN pairwise-key challenge
(Key_info & BIT8) && (Key_info & BIT9)) { (Key_info & BIT8) && (Key_info & BIT9)) {
pDevice->fWPA_Authened = TRUE; pDevice->fWPA_Authened = TRUE;
PRINT_K("WPA2 Authentication completed!!\n"); PRINT_K("WPA2 Authentication completed!!\n");
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* *
* File: tcrc.c * File: tcrc.c
* *
* Purpose: Implement functions to caculate CRC * Purpose: Implement functions to calculate CRC
* *
* Author: Tevin Chen * Author: Tevin Chen
* *
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* *
* File: tcrc.h * File: tcrc.h
* *
* Purpose: Implement functions to caculate CRC * Purpose: Implement functions to calculate CRC
* *
* Author: Tevin Chen * Author: Tevin Chen
* *
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
* Date: May 21, 1996 * Date: May 21, 1996
* *
* Functions: * Functions:
* ETHbyGetHashIndexByCrc32 - Caculate multicast hash value by CRC32 * ETHbyGetHashIndexByCrc32 - Calculate multicast hash value by CRC32
* ETHbIsBufferCrc32Ok - Check CRC value of the buffer if Ok or not * ETHbIsBufferCrc32Ok - Check CRC value of the buffer if Ok or not
* *
* Revision History: * Revision History:
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
/* /*
* Description: Caculate multicast hash value by CRC32 * Description: Calculate multicast hash value by CRC32
* *
* Parameters: * Parameters:
* In: * In:
......
...@@ -168,7 +168,7 @@ static unsigned int rotr1(unsigned int a) ...@@ -168,7 +168,7 @@ static unsigned int rotr1(unsigned int a)
/* /*
* Description: Caculate RC4Key fom TK, TA, and TSC * Description: Calculate RC4Key fom TK, TA, and TSC
* *
* Parameters: * Parameters:
* In: * In:
......
...@@ -263,7 +263,7 @@ s_vProbeChannel( ...@@ -263,7 +263,7 @@ s_vProbeChannel(
* *
* *
* Return Value: * Return Value:
* A ptr to Tx frame or NULL on allocation failue * A ptr to Tx frame or NULL on allocation failure
* *
-*/ -*/
...@@ -794,7 +794,7 @@ void vRunCommand(void *hDeviceContext) ...@@ -794,7 +794,7 @@ void vRunCommand(void *hDeviceContext)
DBG_PRT(MSG_LEVEL_DEBUG, DBG_PRT(MSG_LEVEL_DEBUG,
KERN_INFO "vMgrCreateOwnIBSS fail!\n"); KERN_INFO "vMgrCreateOwnIBSS fail!\n");
} }
// alway turn off unicast bit // always turn off unicast bit
MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_UNICAST); MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_UNICAST);
pDevice->byRxMode &= ~RCR_UNICAST; pDevice->byRxMode &= ~RCR_UNICAST;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode ); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode );
...@@ -946,7 +946,7 @@ void vRunCommand(void *hDeviceContext) ...@@ -946,7 +946,7 @@ void vRunCommand(void *hDeviceContext)
pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID; pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
pItemSSID->len = 0; pItemSSID->len = 0;
memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN); memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
//clear dessire SSID //clear desired SSID
pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
pItemSSID->len = 0; pItemSSID->len = 0;
memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN); memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
......
...@@ -89,7 +89,7 @@ BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader) ...@@ -89,7 +89,7 @@ BOOL WCTLbIsDuplicate (PSCache pCache, PS802_11Header pMACHeader)
ADD_ONE_WITH_WRAP_AROUND(uIndex, DUPLICATE_RX_CACHE_LENGTH); ADD_ONE_WITH_WRAP_AROUND(uIndex, DUPLICATE_RX_CACHE_LENGTH);
} }
} }
/* Not fount in cache - insert */ /* Not found in cache - insert */
pCacheEntry = &pCache->asCacheEntry[pCache->uInPtr]; pCacheEntry = &pCache->asCacheEntry[pCache->uInPtr];
pCacheEntry->wFmSequence = pMACHeader->wSeqCtl; pCacheEntry->wFmSequence = pMACHeader->wSeqCtl;
memcpy(&(pCacheEntry->abyAddr2[0]), &(pMACHeader->abyAddr2[0]), ETH_ALEN); memcpy(&(pCacheEntry->abyAddr2[0]), &(pMACHeader->abyAddr2[0]), ETH_ALEN);
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* *
* Functions: * Functions:
* nsMgrObjectInitial - Initialize Management Objet data structure * nsMgrObjectInitial - Initialize Management Objet data structure
* vMgrObjectReset - Reset Management Objet data structure * vMgrObjectReset - Reset Management Object data structure
* vMgrAssocBeginSta - Start associate function * vMgrAssocBeginSta - Start associate function
* vMgrReAssocBeginSta - Start reassociate function * vMgrReAssocBeginSta - Start reassociate function
* vMgrDisassocBeginSta - Start disassociate function * vMgrDisassocBeginSta - Start disassociate function
...@@ -2188,7 +2188,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) ...@@ -2188,7 +2188,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
// During dpc, already in spinlocked. // During dpc, already in spinlocked.
if (BSSbIsSTAInNodeDB(pDevice, sFrame.pHdr->sA3.abyAddr2, &uNodeIndex)) { if (BSSbIsSTAInNodeDB(pDevice, sFrame.pHdr->sA3.abyAddr2, &uNodeIndex)) {
// Update the STA, (Techically the Beacons of all the IBSS nodes // Update the STA, (Technically the Beacons of all the IBSS nodes
// should be identical, but that's not happening in practice. // should be identical, but that's not happening in practice.
pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates, pMgmt->abyCurrSuppRates[1] = RATEuSetIE((PWLAN_IE_SUPP_RATES)sFrame.pSuppRates,
(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates, (PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
...@@ -2722,7 +2722,7 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus) ...@@ -2722,7 +2722,7 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus)
memcpy(pDevice->abyBSSID, pCurr->abyBSSID, WLAN_BSSID_LEN); memcpy(pDevice->abyBSSID, pCurr->abyBSSID, WLAN_BSSID_LEN);
// Add current BSS to Candidate list // Add current BSS to Candidate list
// This should only works for WPA2 BSS, and WPA2 BSS check must be done before. // This should only work for WPA2 BSS, and WPA2 BSS check must be done before.
if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) { if (pMgmt->eAuthenMode == WMAC_AUTH_WPA2) {
BOOL bResult = bAdd_PMKID_Candidate((void *) pDevice, BOOL bResult = bAdd_PMKID_Candidate((void *) pDevice,
pMgmt->abyCurrBSSID, pMgmt->abyCurrBSSID,
...@@ -3181,7 +3181,7 @@ s_vMgrFormatTIM( ...@@ -3181,7 +3181,7 @@ s_vMgrFormatTIM(
* *
* *
* Return Value: * Return Value:
* PTR to frame; or NULL on allocation failue * PTR to frame; or NULL on allocation failure
* *
-*/ -*/
...@@ -3353,7 +3353,7 @@ s_MgrMakeBeacon( ...@@ -3353,7 +3353,7 @@ s_MgrMakeBeacon(
* *
* *
* Return Value: * Return Value:
* PTR to frame; or NULL on allocation failue * PTR to frame; or NULL on allocation failure
* *
-*/ -*/
...@@ -3528,7 +3528,7 @@ s_MgrMakeAssocRequest( ...@@ -3528,7 +3528,7 @@ s_MgrMakeAssocRequest(
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN); memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN); memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
// Set the capibility and listen interval // Set the capability and listen interval
*(sFrame.pwCapInfo) = cpu_to_le16(wCurrCapInfo); *(sFrame.pwCapInfo) = cpu_to_le16(wCurrCapInfo);
*(sFrame.pwListenInterval) = cpu_to_le16(wListenInterval); *(sFrame.pwListenInterval) = cpu_to_le16(wListenInterval);
...@@ -3749,7 +3749,7 @@ s_MgrMakeAssocRequest( ...@@ -3749,7 +3749,7 @@ s_MgrMakeAssocRequest(
* *
* *
* Return Value: * Return Value:
* A ptr to frame or NULL on allocation failue * A ptr to frame or NULL on allocation failure
* *
-*/ -*/
...@@ -3792,7 +3792,7 @@ s_MgrMakeReAssocRequest( ...@@ -3792,7 +3792,7 @@ s_MgrMakeReAssocRequest(
memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN); memcpy( sFrame.pHdr->sA3.abyAddr2, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN); memcpy( sFrame.pHdr->sA3.abyAddr3, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
/* Set the capibility and listen interval */ /* Set the capability and listen interval */
*(sFrame.pwCapInfo) = cpu_to_le16(wCurrCapInfo); *(sFrame.pwCapInfo) = cpu_to_le16(wCurrCapInfo);
*(sFrame.pwListenInterval) = cpu_to_le16(wListenInterval); *(sFrame.pwListenInterval) = cpu_to_le16(wListenInterval);
...@@ -4004,7 +4004,7 @@ s_MgrMakeReAssocRequest( ...@@ -4004,7 +4004,7 @@ s_MgrMakeReAssocRequest(
* *
* *
* Return Value: * Return Value:
* PTR to frame; or NULL on allocation failue * PTR to frame; or NULL on allocation failure
* *
-*/ -*/
...@@ -4077,7 +4077,7 @@ s_MgrMakeAssocResponse( ...@@ -4077,7 +4077,7 @@ s_MgrMakeAssocResponse(
* *
* *
* Return Value: * Return Value:
* PTR to frame; or NULL on allocation failue * PTR to frame; or NULL on allocation failure
* *
-*/ -*/
......
...@@ -231,7 +231,7 @@ WPA_ParseRSN( ...@@ -231,7 +231,7 @@ WPA_ParseRSN(
* Parameters: * Parameters:
* In: * In:
* byCmd - Search type * byCmd - Search type
* byEncrypt- Encrcypt Type * byEncrypt- Encrypt Type
* pBSSList - BSS list * pBSSList - BSS list
* Out: * Out:
* none * none
......
...@@ -174,16 +174,16 @@ WPA2vParseRSN ( ...@@ -174,16 +174,16 @@ WPA2vParseRSN (
pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_USE_GROUP; pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_USE_GROUP;
bUseGK = TRUE; bUseGK = TRUE;
} else if ( !memcmp(pbyOUI, abyOUIWEP40, 4)) { } else if ( !memcmp(pbyOUI, abyOUIWEP40, 4)) {
// Invialid CSS, continue to parsing // Invalid CSS, continue parsing
} else if ( !memcmp(pbyOUI, abyOUITKIP, 4)) { } else if ( !memcmp(pbyOUI, abyOUITKIP, 4)) {
if (pBSSNode->byCSSGK != WLAN_11i_CSS_CCMP) if (pBSSNode->byCSSGK != WLAN_11i_CSS_CCMP)
pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_TKIP; pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_TKIP;
else else
; // Invialid CSS, continue to parsing ; // Invalid CSS, continue parsing
} else if ( !memcmp(pbyOUI, abyOUICCMP, 4)) { } else if ( !memcmp(pbyOUI, abyOUICCMP, 4)) {
pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_CCMP; pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_CCMP;
} else if ( !memcmp(pbyOUI, abyOUIWEP104, 4)) { } else if ( !memcmp(pbyOUI, abyOUIWEP104, 4)) {
// Invialid CSS, continue to parsing // Invalid CSS, continue parsing
} else { } else {
// any vendor checks here // any vendor checks here
pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_UNKNOWN; pBSSNode->abyCSSPK[j++] = WLAN_11i_CSS_UNKNOWN;
......
...@@ -74,7 +74,7 @@ static void wpadev_setup(struct net_device *dev) ...@@ -74,7 +74,7 @@ static void wpadev_setup(struct net_device *dev)
/* /*
* Description: * Description:
* register netdev for wpa supplicant deamon * register netdev for wpa supplicant daemon
* *
* Parameters: * Parameters:
* In: * In:
...@@ -154,7 +154,7 @@ static int wpa_release_wpadev(PSDevice pDevice) ...@@ -154,7 +154,7 @@ static int wpa_release_wpadev(PSDevice pDevice)
/* /*
* Description: * Description:
* Set enable/disable dev for wpa supplicant deamon * Set enable/disable dev for wpa supplicant daemon
* *
* Parameters: * Parameters:
* In: * In:
...@@ -326,7 +326,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val) ...@@ -326,7 +326,7 @@ int wpa_set_wpadev(PSDevice pDevice, int val)
if ((byKeyDecMode == KEY_CTL_TKIP) && if ((byKeyDecMode == KEY_CTL_TKIP) &&
(param->u.wpa_key.key_len != MAX_KEY_LEN)) { (param->u.wpa_key.key_len != MAX_KEY_LEN)) {
// TKIP Key must be 256 bits // TKIP Key must be 256 bits
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "return- TKIP Key must be 256 bits!\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "return - TKIP Key must be 256 bits!\n");
return -EINVAL; return -EINVAL;
} }
// Check AES key length // Check AES key length
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment