diff options
author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2011-03-30 21:57:33 -0400 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2011-03-31 10:26:23 -0400 |
commit | 25985edcedea6396277003854657b5f3cb31a628 (patch) | |
tree | f026e810210a2ee7290caeb737c23cb6472b7c38 /drivers/staging/rt2860 | |
parent | 6aba74f2791287ec407e0f92487a725a25908067 (diff) |
Fix common misspellings
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Diffstat (limited to 'drivers/staging/rt2860')
-rw-r--r-- | drivers/staging/rt2860/chip/rtmp_phy.h | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/ba_action.c | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_aes.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_cfg.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_data.c | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_data_pci.c | 6 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_data_usb.c | 6 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_mac_pci.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_sanity.c | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_sync.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/cmm_wpa.c | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/mlme.c | 16 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/rtmp_init.c | 14 | ||||
-rw-r--r-- | drivers/staging/rt2860/common/spectrum.c | 12 | ||||
-rw-r--r-- | drivers/staging/rt2860/mlme.h | 8 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_linux.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/rt_pci_rbus.c | 2 | ||||
-rw-r--r-- | drivers/staging/rt2860/rtmp.h | 4 | ||||
-rw-r--r-- | drivers/staging/rt2860/sta_ioctl.c | 2 |
19 files changed, 49 insertions, 49 deletions
diff --git a/drivers/staging/rt2860/chip/rtmp_phy.h b/drivers/staging/rt2860/chip/rtmp_phy.h index 98454df30a2..a52221f1294 100644 --- a/drivers/staging/rt2860/chip/rtmp_phy.h +++ b/drivers/staging/rt2860/chip/rtmp_phy.h | |||
@@ -467,7 +467,7 @@ | |||
467 | DBGPRINT_ERR("BBP write R%d=0x%x fail. BusyCnt= %d.bPCIclkOff = %d. \n", _I, BbpCsr.word, BusyCnt, (_A)->bPCIclkOff); \ | 467 | DBGPRINT_ERR("BBP write R%d=0x%x fail. BusyCnt= %d.bPCIclkOff = %d. \n", _I, BbpCsr.word, BusyCnt, (_A)->bPCIclkOff); \ |
468 | } \ | 468 | } \ |
469 | } else { \ | 469 | } else { \ |
470 | DBGPRINT_ERR("****** BBP_Write_Latch Buffer exceeds max boundry ****** \n"); \ | 470 | DBGPRINT_ERR("****** BBP_Write_Latch Buffer exceeds max boundary ****** \n"); \ |
471 | } \ | 471 | } \ |
472 | } | 472 | } |
473 | #endif /* RTMP_MAC_PCI // */ | 473 | #endif /* RTMP_MAC_PCI // */ |
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 62f6f6be4ac..133bc1b87d2 100644 --- a/drivers/staging/rt2860/common/ba_action.c +++ b/drivers/staging/rt2860/common/ba_action.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "../rt_config.h" | 28 | #include "../rt_config.h" |
29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
30 | 30 | ||
31 | #define BA_ORI_INIT_SEQ (pEntry->TxSeq[TID]) /*1 // inital sequence number of BA session */ | 31 | #define BA_ORI_INIT_SEQ (pEntry->TxSeq[TID]) /*1 // initial sequence number of BA session */ |
32 | 32 | ||
33 | #define ORI_SESSION_MAX_RETRY 8 | 33 | #define ORI_SESSION_MAX_RETRY 8 |
34 | #define ORI_BA_SESSION_TIMEOUT (2000) /* ms */ | 34 | #define ORI_BA_SESSION_TIMEOUT (2000) /* ms */ |
@@ -1487,7 +1487,7 @@ static void ba_enqueue_reordering_packet(struct rt_rtmp_adapter *pAd, | |||
1487 | 1487 | ||
1488 | /* | 1488 | /* |
1489 | * flush all pending reordering mpdus | 1489 | * flush all pending reordering mpdus |
1490 | * and receving mpdu to upper layer | 1490 | * and receiving mpdu to upper layer |
1491 | * make tcp/ip to take care reordering mechanism | 1491 | * make tcp/ip to take care reordering mechanism |
1492 | */ | 1492 | */ |
1493 | /*ba_refresh_reordering_mpdus(pAd, pBAEntry); */ | 1493 | /*ba_refresh_reordering_mpdus(pAd, pBAEntry); */ |
diff --git a/drivers/staging/rt2860/common/cmm_aes.c b/drivers/staging/rt2860/common/cmm_aes.c index a99879bada4..d70d229a6e5 100644 --- a/drivers/staging/rt2860/common/cmm_aes.c +++ b/drivers/staging/rt2860/common/cmm_aes.c | |||
@@ -858,7 +858,7 @@ static uint32 KT1[256]; | |||
858 | static uint32 KT2[256]; | 858 | static uint32 KT2[256]; |
859 | static uint32 KT3[256]; | 859 | static uint32 KT3[256]; |
860 | 860 | ||
861 | /* platform-independant 32-bit integer manipulation macros */ | 861 | /* platform-independent 32-bit integer manipulation macros */ |
862 | 862 | ||
863 | #define GET_UINT32(n,b,i) \ | 863 | #define GET_UINT32(n,b,i) \ |
864 | { \ | 864 | { \ |
diff --git a/drivers/staging/rt2860/common/cmm_cfg.c b/drivers/staging/rt2860/common/cmm_cfg.c index 24f43937843..727f7992925 100644 --- a/drivers/staging/rt2860/common/cmm_cfg.c +++ b/drivers/staging/rt2860/common/cmm_cfg.c | |||
@@ -223,7 +223,7 @@ int RT_CfgSetWepKey(struct rt_rtmp_adapter *pAd, | |||
223 | pAdapter Pointer to our adapter | 223 | pAdapter Pointer to our adapter |
224 | keyString WPA pre-shared key string | 224 | keyString WPA pre-shared key string |
225 | pHashStr String used for password hash function | 225 | pHashStr String used for password hash function |
226 | hashStrLen Lenght of the hash string | 226 | hashStrLen Length of the hash string |
227 | pPMKBuf Output buffer of WPAPSK key | 227 | pPMKBuf Output buffer of WPAPSK key |
228 | 228 | ||
229 | Return: | 229 | Return: |
diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c index f6c193cb84e..33799e1449a 100644 --- a/drivers/staging/rt2860/common/cmm_data.c +++ b/drivers/staging/rt2860/common/cmm_data.c | |||
@@ -337,7 +337,7 @@ int MlmeHardTransmitMgmtRing(struct rt_rtmp_adapter *pAd, | |||
337 | 337 | ||
338 | /* */ | 338 | /* */ |
339 | /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ | 339 | /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ |
340 | /* Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ | 340 | /* Data-Null packets also pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ |
341 | /* if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL)) */ | 341 | /* if ((pHeader_802_11->FC.Type != BTYPE_DATA) && (pHeader_802_11->FC.Type != BTYPE_CNTL)) */ |
342 | { | 342 | { |
343 | if ((pHeader_802_11->FC.SubType == SUBTYPE_ACTION) || | 343 | if ((pHeader_802_11->FC.SubType == SUBTYPE_ACTION) || |
@@ -1933,7 +1933,7 @@ BOOLEAN RTMPCheckEtherType(struct rt_rtmp_adapter *pAd, void *pPacket) | |||
1933 | 1933 | ||
1934 | if (TypeLen <= 1500) { /* 802.3, 802.3 LLC */ | 1934 | if (TypeLen <= 1500) { /* 802.3, 802.3 LLC */ |
1935 | /* | 1935 | /* |
1936 | DestMAC(6) + SrcMAC(6) + Lenght(2) + | 1936 | DestMAC(6) + SrcMAC(6) + Length(2) + |
1937 | DSAP(1) + SSAP(1) + Control(1) + | 1937 | DSAP(1) + SSAP(1) + Control(1) + |
1938 | if the DSAP = 0xAA, SSAP=0xAA, Contorl = 0x03, it has a 5-bytes SNAP header. | 1938 | if the DSAP = 0xAA, SSAP=0xAA, Contorl = 0x03, it has a 5-bytes SNAP header. |
1939 | => + SNAP (5, OriginationID(3) + etherType(2)) | 1939 | => + SNAP (5, OriginationID(3) + etherType(2)) |
diff --git a/drivers/staging/rt2860/common/cmm_data_pci.c b/drivers/staging/rt2860/common/cmm_data_pci.c index 7af59ff9e22..bef0bbd8cef 100644 --- a/drivers/staging/rt2860/common/cmm_data_pci.c +++ b/drivers/staging/rt2860/common/cmm_data_pci.c | |||
@@ -438,13 +438,13 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd, | |||
438 | /* Add Rx size to channel load counter, we should ignore error counts */ | 438 | /* Add Rx size to channel load counter, we should ignore error counts */ |
439 | pAd->StaCfg.CLBusyBytes += (pRxD->SDL0 + 14); | 439 | pAd->StaCfg.CLBusyBytes += (pRxD->SDL0 + 14); |
440 | 440 | ||
441 | /* Drop ToDs promiscous frame, it is opened due to CCX 2 channel load statistics */ | 441 | /* Drop ToDs promiscuous frame, it is opened due to CCX 2 channel load statistics */ |
442 | if (pHeader != NULL) { | 442 | if (pHeader != NULL) { |
443 | if (pHeader->FC.ToDs) { | 443 | if (pHeader->FC.ToDs) { |
444 | return (NDIS_STATUS_FAILURE); | 444 | return (NDIS_STATUS_FAILURE); |
445 | } | 445 | } |
446 | } | 446 | } |
447 | /* Drop not U2M frames, cant's drop here because we will drop beacon in this case */ | 447 | /* Drop not U2M frames, can't's drop here because we will drop beacon in this case */ |
448 | /* I am kind of doubting the U2M bit operation */ | 448 | /* I am kind of doubting the U2M bit operation */ |
449 | /* if (pRxD->U2M == 0) */ | 449 | /* if (pRxD->U2M == 0) */ |
450 | /* return(NDIS_STATUS_FAILURE); */ | 450 | /* return(NDIS_STATUS_FAILURE); */ |
@@ -939,7 +939,7 @@ int MlmeHardTransmitTxRing(struct rt_rtmp_adapter *pAd, | |||
939 | /* */ | 939 | /* */ |
940 | /* */ | 940 | /* */ |
941 | /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ | 941 | /* In WMM-UAPSD, mlme frame should be set psm as power saving but probe request frame */ |
942 | /* Data-Null packets alse pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ | 942 | /* Data-Null packets also pass through MMRequest in RT2860, however, we hope control the psm bit to pass APSD */ |
943 | if (pHeader_802_11->FC.Type != BTYPE_DATA) { | 943 | if (pHeader_802_11->FC.Type != BTYPE_DATA) { |
944 | if ((pHeader_802_11->FC.SubType == SUBTYPE_PROBE_REQ) | 944 | if ((pHeader_802_11->FC.SubType == SUBTYPE_PROBE_REQ) |
945 | || !(pAd->CommonCfg.bAPSDCapable | 945 | || !(pAd->CommonCfg.bAPSDCapable |
diff --git a/drivers/staging/rt2860/common/cmm_data_usb.c b/drivers/staging/rt2860/common/cmm_data_usb.c index 7c56c2f5198..5637857ae9e 100644 --- a/drivers/staging/rt2860/common/cmm_data_usb.c +++ b/drivers/staging/rt2860/common/cmm_data_usb.c | |||
@@ -702,7 +702,7 @@ Arguments: | |||
702 | *pRxPending pending received packet flag | 702 | *pRxPending pending received packet flag |
703 | 703 | ||
704 | Return Value: | 704 | Return Value: |
705 | the recieved packet | 705 | the received packet |
706 | 706 | ||
707 | Note: | 707 | Note: |
708 | ======================================================================== | 708 | ======================================================================== |
@@ -850,7 +850,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd, | |||
850 | /* Add Rx size to channel load counter, we should ignore error counts */ | 850 | /* Add Rx size to channel load counter, we should ignore error counts */ |
851 | pAd->StaCfg.CLBusyBytes += (pRxWI->MPDUtotalByteCount + 14); | 851 | pAd->StaCfg.CLBusyBytes += (pRxWI->MPDUtotalByteCount + 14); |
852 | 852 | ||
853 | /* Drop ToDs promiscous frame, it is opened due to CCX 2 channel load statistics */ | 853 | /* Drop ToDs promiscuous frame, it is opened due to CCX 2 channel load statistics */ |
854 | if (pHeader->FC.ToDs) { | 854 | if (pHeader->FC.ToDs) { |
855 | DBGPRINT_RAW(RT_DEBUG_ERROR, ("Err;FC.ToDs\n")); | 855 | DBGPRINT_RAW(RT_DEBUG_ERROR, ("Err;FC.ToDs\n")); |
856 | return NDIS_STATUS_FAILURE; | 856 | return NDIS_STATUS_FAILURE; |
@@ -860,7 +860,7 @@ int RTMPCheckRxError(struct rt_rtmp_adapter *pAd, | |||
860 | DBGPRINT_RAW(RT_DEBUG_ERROR, ("received packet too long\n")); | 860 | DBGPRINT_RAW(RT_DEBUG_ERROR, ("received packet too long\n")); |
861 | return NDIS_STATUS_FAILURE; | 861 | return NDIS_STATUS_FAILURE; |
862 | } | 862 | } |
863 | /* Drop not U2M frames, cant's drop here because we will drop beacon in this case */ | 863 | /* Drop not U2M frames, can't's drop here because we will drop beacon in this case */ |
864 | /* I am kind of doubting the U2M bit operation */ | 864 | /* I am kind of doubting the U2M bit operation */ |
865 | /* if (pRxD->U2M == 0) */ | 865 | /* if (pRxD->U2M == 0) */ |
866 | /* return(NDIS_STATUS_FAILURE); */ | 866 | /* return(NDIS_STATUS_FAILURE); */ |
diff --git a/drivers/staging/rt2860/common/cmm_mac_pci.c b/drivers/staging/rt2860/common/cmm_mac_pci.c index 21eed2507e1..d06f0a6dc37 100644 --- a/drivers/staging/rt2860/common/cmm_mac_pci.c +++ b/drivers/staging/rt2860/common/cmm_mac_pci.c | |||
@@ -1446,7 +1446,7 @@ BOOLEAN RT28xxPciAsicRadioOff(struct rt_rtmp_adapter *pAd, | |||
1446 | pAd->CheckDmaBusyCount = 0; | 1446 | pAd->CheckDmaBusyCount = 0; |
1447 | } | 1447 | } |
1448 | */ | 1448 | */ |
1449 | /*KH Debug:My original codes have the follwoing codes, but currecnt codes do not have it. */ | 1449 | /*KH Debug:My original codes have the following codes, but currecnt codes do not have it. */ |
1450 | /* Disable for stability. If PCIE Link Control is modified for advance power save, re-covery this code segment. */ | 1450 | /* Disable for stability. If PCIE Link Control is modified for advance power save, re-covery this code segment. */ |
1451 | RTMP_IO_WRITE32(pAd, PBF_SYS_CTRL, 0x1280); | 1451 | RTMP_IO_WRITE32(pAd, PBF_SYS_CTRL, 0x1280); |
1452 | /*OPSTATUS_SET_FLAG(pAd, fOP_STATUS_CLKSELECT_40MHZ); */ | 1452 | /*OPSTATUS_SET_FLAG(pAd, fOP_STATUS_CLKSELECT_40MHZ); */ |
diff --git a/drivers/staging/rt2860/common/cmm_sanity.c b/drivers/staging/rt2860/common/cmm_sanity.c index 6b003c90344..3bfb4ad00c1 100644 --- a/drivers/staging/rt2860/common/cmm_sanity.c +++ b/drivers/staging/rt2860/common/cmm_sanity.c | |||
@@ -67,7 +67,7 @@ BOOLEAN MlmeAddBAReqSanity(struct rt_rtmp_adapter *pAd, | |||
67 | 67 | ||
68 | if ((MsgLen != sizeof(struct rt_mlme_addba_req))) { | 68 | if ((MsgLen != sizeof(struct rt_mlme_addba_req))) { |
69 | DBGPRINT(RT_DEBUG_TRACE, | 69 | DBGPRINT(RT_DEBUG_TRACE, |
70 | ("MlmeAddBAReqSanity fail - message lenght not correct.\n")); | 70 | ("MlmeAddBAReqSanity fail - message length not correct.\n")); |
71 | return FALSE; | 71 | return FALSE; |
72 | } | 72 | } |
73 | 73 | ||
@@ -104,7 +104,7 @@ BOOLEAN MlmeDelBAReqSanity(struct rt_rtmp_adapter *pAd, void * Msg, unsigned lon | |||
104 | 104 | ||
105 | if ((MsgLen != sizeof(struct rt_mlme_delba_req))) { | 105 | if ((MsgLen != sizeof(struct rt_mlme_delba_req))) { |
106 | DBGPRINT(RT_DEBUG_ERROR, | 106 | DBGPRINT(RT_DEBUG_ERROR, |
107 | ("MlmeDelBAReqSanity fail - message lenght not correct.\n")); | 107 | ("MlmeDelBAReqSanity fail - message length not correct.\n")); |
108 | return FALSE; | 108 | return FALSE; |
109 | } | 109 | } |
110 | 110 | ||
diff --git a/drivers/staging/rt2860/common/cmm_sync.c b/drivers/staging/rt2860/common/cmm_sync.c index f84194da47b..aefe1b77465 100644 --- a/drivers/staging/rt2860/common/cmm_sync.c +++ b/drivers/staging/rt2860/common/cmm_sync.c | |||
@@ -694,7 +694,7 @@ void ScanNextChannel(struct rt_rtmp_adapter *pAd) | |||
694 | MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen); | 694 | MiniportMMRequest(pAd, 0, pOutBuffer, FrameLen); |
695 | MlmeFreeMemory(pAd, pOutBuffer); | 695 | MlmeFreeMemory(pAd, pOutBuffer); |
696 | } | 696 | } |
697 | /* For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe reponse */ | 697 | /* For SCAN_CISCO_PASSIVE, do nothing and silently wait for beacon or other probe response */ |
698 | 698 | ||
699 | pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN; | 699 | pAd->Mlme.SyncMachine.CurrState = SCAN_LISTEN; |
700 | } | 700 | } |
diff --git a/drivers/staging/rt2860/common/cmm_wpa.c b/drivers/staging/rt2860/common/cmm_wpa.c index 0040f45b629..616ebec50c6 100644 --- a/drivers/staging/rt2860/common/cmm_wpa.c +++ b/drivers/staging/rt2860/common/cmm_wpa.c | |||
@@ -1222,7 +1222,7 @@ void PeerGroupMsg2Action(struct rt_rtmp_adapter *pAd, | |||
1222 | 1222 | ||
1223 | Note: | 1223 | Note: |
1224 | All these constants are defined in wpa.h | 1224 | All these constants are defined in wpa.h |
1225 | For supplicant, there is only EAPOL Key message avaliable | 1225 | For supplicant, there is only EAPOL Key message available |
1226 | 1226 | ||
1227 | ======================================================================== | 1227 | ======================================================================== |
1228 | */ | 1228 | */ |
@@ -1267,7 +1267,7 @@ BOOLEAN WpaMsgTypeSubst(u8 EAPType, int * MsgType) | |||
1267 | int prefix_len - the length of the label | 1267 | int prefix_len - the length of the label |
1268 | u8 *data - a specific data with variable length | 1268 | u8 *data - a specific data with variable length |
1269 | int data_len - the length of a specific data | 1269 | int data_len - the length of a specific data |
1270 | int len - the output lenght | 1270 | int len - the output length |
1271 | 1271 | ||
1272 | Return Value: | 1272 | Return Value: |
1273 | u8 *output - the calculated result | 1273 | u8 *output - the calculated result |
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index d9c3fd5c216..e48eac0f3a2 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c | |||
@@ -632,7 +632,7 @@ void MlmeHalt(struct rt_rtmp_adapter *pAd) | |||
632 | pChipOps->AsicHaltAction(pAd); | 632 | pChipOps->AsicHaltAction(pAd); |
633 | } | 633 | } |
634 | 634 | ||
635 | RTMPusecDelay(5000); /* 5 msec to gurantee Ant Diversity timer canceled */ | 635 | RTMPusecDelay(5000); /* 5 msec to guarantee Ant Diversity timer canceled */ |
636 | 636 | ||
637 | MlmeQueueDestroy(&pAd->Mlme.Queue); | 637 | MlmeQueueDestroy(&pAd->Mlme.Queue); |
638 | NdisFreeSpinLock(&pAd->Mlme.TaskLock); | 638 | NdisFreeSpinLock(&pAd->Mlme.TaskLock); |
@@ -1107,14 +1107,14 @@ void MlmeSelectTxRateTable(struct rt_rtmp_adapter *pAd, | |||
1107 | *pInitTxRateIdx = | 1107 | *pInitTxRateIdx = |
1108 | RateSwitchTable11N1S[1]; | 1108 | RateSwitchTable11N1S[1]; |
1109 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1109 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1110 | ("DRS: unkown mode,default use 11N 1S AP \n")); | 1110 | ("DRS: unknown mode,default use 11N 1S AP \n")); |
1111 | } else { | 1111 | } else { |
1112 | *ppTable = RateSwitchTable11N2S; | 1112 | *ppTable = RateSwitchTable11N2S; |
1113 | *pTableSize = RateSwitchTable11N2S[0]; | 1113 | *pTableSize = RateSwitchTable11N2S[0]; |
1114 | *pInitTxRateIdx = | 1114 | *pInitTxRateIdx = |
1115 | RateSwitchTable11N2S[1]; | 1115 | RateSwitchTable11N2S[1]; |
1116 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1116 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1117 | ("DRS: unkown mode,default use 11N 2S AP \n")); | 1117 | ("DRS: unknown mode,default use 11N 2S AP \n")); |
1118 | } | 1118 | } |
1119 | } else { | 1119 | } else { |
1120 | if (pAd->CommonCfg.TxStream == 1) { | 1120 | if (pAd->CommonCfg.TxStream == 1) { |
@@ -1123,7 +1123,7 @@ void MlmeSelectTxRateTable(struct rt_rtmp_adapter *pAd, | |||
1123 | *pInitTxRateIdx = | 1123 | *pInitTxRateIdx = |
1124 | RateSwitchTable11N1S[1]; | 1124 | RateSwitchTable11N1S[1]; |
1125 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1125 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1126 | ("DRS: unkown mode,default use 11N 1S AP \n")); | 1126 | ("DRS: unknown mode,default use 11N 1S AP \n")); |
1127 | } else { | 1127 | } else { |
1128 | *ppTable = RateSwitchTable11N2SForABand; | 1128 | *ppTable = RateSwitchTable11N2SForABand; |
1129 | *pTableSize = | 1129 | *pTableSize = |
@@ -1131,11 +1131,11 @@ void MlmeSelectTxRateTable(struct rt_rtmp_adapter *pAd, | |||
1131 | *pInitTxRateIdx = | 1131 | *pInitTxRateIdx = |
1132 | RateSwitchTable11N2SForABand[1]; | 1132 | RateSwitchTable11N2SForABand[1]; |
1133 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1133 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1134 | ("DRS: unkown mode,default use 11N 2S AP \n")); | 1134 | ("DRS: unknown mode,default use 11N 2S AP \n")); |
1135 | } | 1135 | } |
1136 | } | 1136 | } |
1137 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 1137 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
1138 | ("DRS: unkown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n", | 1138 | ("DRS: unknown mode (SupRateLen=%d, ExtRateLen=%d, MCSSet[0]=0x%x, MCSSet[1]=0x%x)\n", |
1139 | pAd->StaActive.SupRateLen, | 1139 | pAd->StaActive.SupRateLen, |
1140 | pAd->StaActive.ExtRateLen, | 1140 | pAd->StaActive.ExtRateLen, |
1141 | pAd->StaActive.SupportedPhyInfo.MCSSet[0], | 1141 | pAd->StaActive.SupportedPhyInfo.MCSSet[0], |
@@ -1368,7 +1368,7 @@ void STAMlmePeriodicExec(struct rt_rtmp_adapter *pAd) | |||
1368 | if ((pAd->StaCfg.LastScanTime + | 1368 | if ((pAd->StaCfg.LastScanTime + |
1369 | 10 * OS_HZ) < pAd->Mlme.Now32) { | 1369 | 10 * OS_HZ) < pAd->Mlme.Now32) { |
1370 | DBGPRINT(RT_DEBUG_TRACE, | 1370 | DBGPRINT(RT_DEBUG_TRACE, |
1371 | ("MMCHK - Roaming, No eligable entry, try new scan!\n")); | 1371 | ("MMCHK - Roaming, No eligible entry, try new scan!\n")); |
1372 | pAd->StaCfg.ScanCnt = 2; | 1372 | pAd->StaCfg.ScanCnt = 2; |
1373 | pAd->StaCfg.LastScanTime = | 1373 | pAd->StaCfg.LastScanTime = |
1374 | pAd->Mlme.Now32; | 1374 | pAd->Mlme.Now32; |
@@ -2828,7 +2828,7 @@ void UpdateBasicRateBitmap(struct rt_rtmp_adapter *pAdapter) | |||
2828 | 2828 | ||
2829 | /* IRQL = PASSIVE_LEVEL */ | 2829 | /* IRQL = PASSIVE_LEVEL */ |
2830 | /* IRQL = DISPATCH_LEVEL */ | 2830 | /* IRQL = DISPATCH_LEVEL */ |
2831 | /* bLinkUp is to identify the inital link speed. */ | 2831 | /* bLinkUp is to identify the initial link speed. */ |
2832 | /* TRUE indicates the rate update at linkup, we should not try to set the rate at 54Mbps. */ | 2832 | /* TRUE indicates the rate update at linkup, we should not try to set the rate at 54Mbps. */ |
2833 | void MlmeUpdateTxRates(struct rt_rtmp_adapter *pAd, IN BOOLEAN bLinkUp, u8 apidx) | 2833 | void MlmeUpdateTxRates(struct rt_rtmp_adapter *pAd, IN BOOLEAN bLinkUp, u8 apidx) |
2834 | { | 2834 | { |
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c index d359a14f5d4..5fa193eac0d 100644 --- a/drivers/staging/rt2860/common/rtmp_init.c +++ b/drivers/staging/rt2860/common/rtmp_init.c | |||
@@ -2037,7 +2037,7 @@ void NICUpdateFifoStaCounters(struct rt_rtmp_adapter *pAd) | |||
2037 | 2037 | ||
2038 | pEntry->FIFOCount = 0; | 2038 | pEntry->FIFOCount = 0; |
2039 | pEntry->OneSecTxNoRetryOkCount++; | 2039 | pEntry->OneSecTxNoRetryOkCount++; |
2040 | /* update NoDataIdleCount when sucessful send packet to STA. */ | 2040 | /* update NoDataIdleCount when successful send packet to STA. */ |
2041 | pEntry->NoDataIdleCount = 0; | 2041 | pEntry->NoDataIdleCount = 0; |
2042 | pEntry->ContinueTxFailCnt = 0; | 2042 | pEntry->ContinueTxFailCnt = 0; |
2043 | } | 2043 | } |
@@ -2516,7 +2516,7 @@ void UserCfgInit(struct rt_rtmp_adapter *pAd) | |||
2516 | /*pAd->TurnAggrBulkInCount = 0; */ | 2516 | /*pAd->TurnAggrBulkInCount = 0; */ |
2517 | pAd->bUsbTxBulkAggre = 0; | 2517 | pAd->bUsbTxBulkAggre = 0; |
2518 | 2518 | ||
2519 | /* init as unsed value to ensure driver will set to MCU once. */ | 2519 | /* init as unused value to ensure driver will set to MCU once. */ |
2520 | pAd->LedIndicatorStrength = 0xFF; | 2520 | pAd->LedIndicatorStrength = 0xFF; |
2521 | 2521 | ||
2522 | pAd->CommonCfg.MaxPktOneTxBulk = 2; | 2522 | pAd->CommonCfg.MaxPktOneTxBulk = 2; |
@@ -3076,11 +3076,11 @@ void RTMPSetLED(struct rt_rtmp_adapter *pAd, u8 Status) | |||
3076 | ======================================================================== | 3076 | ======================================================================== |
3077 | 3077 | ||
3078 | Routine Description: | 3078 | Routine Description: |
3079 | Set LED Signal Stregth | 3079 | Set LED Signal Strength |
3080 | 3080 | ||
3081 | Arguments: | 3081 | Arguments: |
3082 | pAd Pointer to our adapter | 3082 | pAd Pointer to our adapter |
3083 | Dbm Signal Stregth | 3083 | Dbm Signal Strength |
3084 | 3084 | ||
3085 | Return Value: | 3085 | Return Value: |
3086 | None | 3086 | None |
@@ -3090,7 +3090,7 @@ void RTMPSetLED(struct rt_rtmp_adapter *pAd, u8 Status) | |||
3090 | Note: | 3090 | Note: |
3091 | Can be run on any IRQL level. | 3091 | Can be run on any IRQL level. |
3092 | 3092 | ||
3093 | According to Microsoft Zero Config Wireless Signal Stregth definition as belows. | 3093 | According to Microsoft Zero Config Wireless Signal Strength definition as belows. |
3094 | <= -90 No Signal | 3094 | <= -90 No Signal |
3095 | <= -81 Very Low | 3095 | <= -81 Very Low |
3096 | <= -71 Low | 3096 | <= -71 Low |
@@ -3118,7 +3118,7 @@ void RTMPSetSignalLED(struct rt_rtmp_adapter *pAd, IN NDIS_802_11_RSSI Dbm) | |||
3118 | nLed = 31; | 3118 | nLed = 31; |
3119 | 3119 | ||
3120 | /* */ | 3120 | /* */ |
3121 | /* Update Signal Stregth to firmware if changed. */ | 3121 | /* Update Signal Strength to firmware if changed. */ |
3122 | /* */ | 3122 | /* */ |
3123 | if (pAd->LedIndicatorStrength != nLed) { | 3123 | if (pAd->LedIndicatorStrength != nLed) { |
3124 | AsicSendCommandToMcu(pAd, 0x51, 0xff, nLed, | 3124 | AsicSendCommandToMcu(pAd, 0x51, 0xff, nLed, |
@@ -3166,7 +3166,7 @@ void RTMPEnableRxTx(struct rt_rtmp_adapter *pAd) | |||
3166 | if (pAd->CommonCfg.PSPXlink) | 3166 | if (pAd->CommonCfg.PSPXlink) |
3167 | rx_filter_flag = PSPXLINK; | 3167 | rx_filter_flag = PSPXLINK; |
3168 | else | 3168 | else |
3169 | rx_filter_flag = STANORMAL; /* Staion not drop control frame will fail WiFi Certification. */ | 3169 | rx_filter_flag = STANORMAL; /* Station not drop control frame will fail WiFi Certification. */ |
3170 | RTMP_IO_WRITE32(pAd, RX_FILTR_CFG, rx_filter_flag); | 3170 | RTMP_IO_WRITE32(pAd, RX_FILTR_CFG, rx_filter_flag); |
3171 | } | 3171 | } |
3172 | 3172 | ||
diff --git a/drivers/staging/rt2860/common/spectrum.c b/drivers/staging/rt2860/common/spectrum.c index c0d2f428069..ceb622df12d 100644 --- a/drivers/staging/rt2860/common/spectrum.c +++ b/drivers/staging/rt2860/common/spectrum.c | |||
@@ -1058,8 +1058,8 @@ static void InsertMeasureReqIE(struct rt_rtmp_adapter *pAd, | |||
1058 | 3. Measure Token. | 1058 | 3. Measure Token. |
1059 | 4. Measure Request Mode. | 1059 | 4. Measure Request Mode. |
1060 | 5. Measure Request Type. | 1060 | 5. Measure Request Type. |
1061 | 6. Length of Report Infomation | 1061 | 6. Length of Report Information |
1062 | 7. Pointer of Report Infomation Buffer. | 1062 | 7. Pointer of Report Information Buffer. |
1063 | 1063 | ||
1064 | Return : None. | 1064 | Return : None. |
1065 | ========================================================================== | 1065 | ========================================================================== |
@@ -1400,7 +1400,7 @@ static void StartDFSProcedure(struct rt_rtmp_adapter *pAd, | |||
1400 | Parametrs: | 1400 | Parametrs: |
1401 | 1. MLME message containing the received frame | 1401 | 1. MLME message containing the received frame |
1402 | 2. message length. | 1402 | 2. message length. |
1403 | 3. Channel switch announcement infomation buffer. | 1403 | 3. Channel switch announcement information buffer. |
1404 | 1404 | ||
1405 | Return : None. | 1405 | Return : None. |
1406 | ========================================================================== | 1406 | ========================================================================== |
@@ -1465,7 +1465,7 @@ static BOOLEAN PeerChSwAnnSanity(struct rt_rtmp_adapter *pAd, | |||
1465 | Parametrs: | 1465 | Parametrs: |
1466 | 1. MLME message containing the received frame | 1466 | 1. MLME message containing the received frame |
1467 | 2. message length. | 1467 | 2. message length. |
1468 | 3. Measurement request infomation buffer. | 1468 | 3. Measurement request information buffer. |
1469 | 1469 | ||
1470 | Return : None. | 1470 | Return : None. |
1471 | ========================================================================== | 1471 | ========================================================================== |
@@ -1538,8 +1538,8 @@ static BOOLEAN PeerMeasureReqSanity(struct rt_rtmp_adapter *pAd, | |||
1538 | Parametrs: | 1538 | Parametrs: |
1539 | 1. MLME message containing the received frame | 1539 | 1. MLME message containing the received frame |
1540 | 2. message length. | 1540 | 2. message length. |
1541 | 3. Measurement report infomation buffer. | 1541 | 3. Measurement report information buffer. |
1542 | 4. basic report infomation buffer. | 1542 | 4. basic report information buffer. |
1543 | 1543 | ||
1544 | Return : None. | 1544 | Return : None. |
1545 | ========================================================================== | 1545 | ========================================================================== |
diff --git a/drivers/staging/rt2860/mlme.h b/drivers/staging/rt2860/mlme.h index cd1ee3d7a91..a285851692e 100644 --- a/drivers/staging/rt2860/mlme.h +++ b/drivers/staging/rt2860/mlme.h | |||
@@ -374,7 +374,7 @@ struct PACKED rt_sec_cha_offset_ie { | |||
374 | struct rt_ht_phy_info { | 374 | struct rt_ht_phy_info { |
375 | BOOLEAN bHtEnable; /* If we should use ht rate. */ | 375 | BOOLEAN bHtEnable; /* If we should use ht rate. */ |
376 | BOOLEAN bPreNHt; /* If we should use ht rate. */ | 376 | BOOLEAN bPreNHt; /* If we should use ht rate. */ |
377 | /*Substract from HT Capability IE */ | 377 | /*Subtract from HT Capability IE */ |
378 | u8 MCSSet[16]; | 378 | u8 MCSSet[16]; |
379 | }; | 379 | }; |
380 | 380 | ||
@@ -392,7 +392,7 @@ struct rt_ht_capability { | |||
392 | u16 AmsduSize:1; /* Max receiving A-MSDU size */ | 392 | u16 AmsduSize:1; /* Max receiving A-MSDU size */ |
393 | u16 rsv:5; | 393 | u16 rsv:5; |
394 | 394 | ||
395 | /*Substract from Addiont HT INFO IE */ | 395 | /*Subtract from Addiont HT INFO IE */ |
396 | u8 MaxRAmpduFactor:2; | 396 | u8 MaxRAmpduFactor:2; |
397 | u8 MpduDensity:3; | 397 | u8 MpduDensity:3; |
398 | u8 ExtChanOffset:2; /* Please note the difference with following u8 NewExtChannelOffset; from 802.11n */ | 398 | u8 ExtChanOffset:2; /* Please note the difference with following u8 NewExtChannelOffset; from 802.11n */ |
@@ -410,7 +410,7 @@ struct rt_ht_capability { | |||
410 | u8 BSSCoexist2040; | 410 | u8 BSSCoexist2040; |
411 | }; | 411 | }; |
412 | 412 | ||
413 | /* field in Addtional HT Information IE . */ | 413 | /* field in Additional HT Information IE . */ |
414 | struct PACKED rt_add_htinfo { | 414 | struct PACKED rt_add_htinfo { |
415 | u8 ExtChanOffset:2; | 415 | u8 ExtChanOffset:2; |
416 | u8 RecomWidth:1; | 416 | u8 RecomWidth:1; |
@@ -857,7 +857,7 @@ struct rt_state_machine { | |||
857 | }; | 857 | }; |
858 | 858 | ||
859 | /* MLME AUX data structure that holds temporarliy settings during a connection attempt. */ | 859 | /* MLME AUX data structure that holds temporarliy settings during a connection attempt. */ |
860 | /* Once this attemp succeeds, all settings will be copy to pAd->StaActive. */ | 860 | /* Once this attempt succeeds, all settings will be copy to pAd->StaActive. */ |
861 | /* A connection attempt (user set OID, roaming, CCX fast roaming,..) consists of */ | 861 | /* A connection attempt (user set OID, roaming, CCX fast roaming,..) consists of */ |
862 | /* several steps (JOIN, AUTH, ASSOC or REASSOC) and may fail at any step. We purposely */ | 862 | /* several steps (JOIN, AUTH, ASSOC or REASSOC) and may fail at any step. We purposely */ |
863 | /* separate this under-trial settings away from pAd->StaActive so that once */ | 863 | /* separate this under-trial settings away from pAd->StaActive so that once */ |
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index e5b04271243..1583347fcd5 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c | |||
@@ -283,7 +283,7 @@ BOOLEAN OS_Need_Clone_Packet(void) | |||
283 | Arguments: | 283 | Arguments: |
284 | pAd Pointer to our adapter | 284 | pAd Pointer to our adapter |
285 | pInsAMSDUHdr EWC A-MSDU format has extra 14-bytes header. if TRUE, insert this 14-byte hdr in front of MSDU. | 285 | pInsAMSDUHdr EWC A-MSDU format has extra 14-bytes header. if TRUE, insert this 14-byte hdr in front of MSDU. |
286 | *pSrcTotalLen return total packet length. This lenght is calculated with 802.3 format packet. | 286 | *pSrcTotalLen return total packet length. This length is calculated with 802.3 format packet. |
287 | 287 | ||
288 | Return Value: | 288 | Return Value: |
289 | NDIS_STATUS_SUCCESS | 289 | NDIS_STATUS_SUCCESS |
diff --git a/drivers/staging/rt2860/rt_pci_rbus.c b/drivers/staging/rt2860/rt_pci_rbus.c index e5fb67cd9a6..f80ab4e6a0a 100644 --- a/drivers/staging/rt2860/rt_pci_rbus.c +++ b/drivers/staging/rt2860/rt_pci_rbus.c | |||
@@ -619,7 +619,7 @@ IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance) | |||
619 | Or kernel will panic after ifconfig ra0 down sometimes */ | 619 | Or kernel will panic after ifconfig ra0 down sometimes */ |
620 | 620 | ||
621 | /* */ | 621 | /* */ |
622 | /* Inital the Interrupt source. */ | 622 | /* Initial the Interrupt source. */ |
623 | /* */ | 623 | /* */ |
624 | IntSource.word = 0x00000000L; | 624 | IntSource.word = 0x00000000L; |
625 | /* McuIntSource.word = 0x00000000L; */ | 625 | /* McuIntSource.word = 0x00000000L; */ |
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h index d16b06a6e2a..3c31340c946 100644 --- a/drivers/staging/rt2860/rtmp.h +++ b/drivers/staging/rt2860/rtmp.h | |||
@@ -756,7 +756,7 @@ struct rt_tkip_key_info { | |||
756 | /* */ | 756 | /* */ |
757 | struct rt_private { | 757 | struct rt_private { |
758 | u32 SystemResetCnt; /* System reset counter */ | 758 | u32 SystemResetCnt; /* System reset counter */ |
759 | u32 TxRingFullCnt; /* Tx ring full occurrance number */ | 759 | u32 TxRingFullCnt; /* Tx ring full occurrence number */ |
760 | u32 PhyRxErrCnt; /* PHY Rx error count, for debug purpose, might move to global counter */ | 760 | u32 PhyRxErrCnt; /* PHY Rx error count, for debug purpose, might move to global counter */ |
761 | /* Variables for WEP encryption / decryption in rtmp_wep.c */ | 761 | /* Variables for WEP encryption / decryption in rtmp_wep.c */ |
762 | u32 FCSCRC32; | 762 | u32 FCSCRC32; |
@@ -925,7 +925,7 @@ struct rt_mlme { | |||
925 | **************************************************************************/ | 925 | **************************************************************************/ |
926 | struct reordering_mpdu { | 926 | struct reordering_mpdu { |
927 | struct reordering_mpdu *next; | 927 | struct reordering_mpdu *next; |
928 | void *pPacket; /* coverted to 802.3 frame */ | 928 | void *pPacket; /* converted to 802.3 frame */ |
929 | int Sequence; /* sequence number of MPDU */ | 929 | int Sequence; /* sequence number of MPDU */ |
930 | BOOLEAN bAMSDU; | 930 | BOOLEAN bAMSDU; |
931 | }; | 931 | }; |
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c index 5717e12a954..49b1013e7a0 100644 --- a/drivers/staging/rt2860/sta_ioctl.c +++ b/drivers/staging/rt2860/sta_ioctl.c | |||
@@ -2460,7 +2460,7 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev, | |||
2460 | } | 2460 | } |
2461 | } | 2461 | } |
2462 | 2462 | ||
2463 | { /* determine this ioctl command is comming from which interface. */ | 2463 | { /* determine this ioctl command is coming from which interface. */ |
2464 | pObj->ioctl_if_type = INT_MAIN; | 2464 | pObj->ioctl_if_type = INT_MAIN; |
2465 | pObj->ioctl_if = MAIN_MBSSID; | 2465 | pObj->ioctl_if = MAIN_MBSSID; |
2466 | } | 2466 | } |