diff options
author | Sebastian Dalfuß <sd@sedf.de> | 2009-11-07 11:31:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:19 -0500 |
commit | 06aea994cf03ec589b198ff718ae7fee4ec41659 (patch) | |
tree | a6ba43a79d61a33f1e4bc3debb66067363beb80b | |
parent | 956cd45d03efd10f8b780d54b6e5e28d0afc2ef9 (diff) |
Staging: rt2860: reduce superfluous exclamation marks
This removes superfluous exclamation marks from strings and comments, and
also three spelling typos.
Signed-off-by: Sebastian Dalfuß <sd@sedf.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
27 files changed, 82 insertions, 82 deletions
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c index 69eea402d32d..174f2a73a1bb 100644 --- a/drivers/staging/rt2860/common/ba_action.c +++ b/drivers/staging/rt2860/common/ba_action.c | |||
@@ -1481,7 +1481,7 @@ static void ba_enqueue_reordering_packet(struct rt_rtmp_adapter *pAd, | |||
1481 | NdisReleaseSpinLock(&pBAEntry->RxReRingLock); | 1481 | NdisReleaseSpinLock(&pBAEntry->RxReRingLock); |
1482 | } else { | 1482 | } else { |
1483 | DBGPRINT(RT_DEBUG_ERROR, | 1483 | DBGPRINT(RT_DEBUG_ERROR, |
1484 | ("!!! (%d) Can't allocate reordering mpdu blk\n", | 1484 | (" (%d) Can't allocate reordering mpdu blk\n", |
1485 | pBAEntry->list.qlen)); | 1485 | pBAEntry->list.qlen)); |
1486 | 1486 | ||
1487 | /* | 1487 | /* |
@@ -1542,7 +1542,7 @@ void Indicate_AMPDU_Packet(struct rt_rtmp_adapter *pAd, | |||
1542 | } | 1542 | } |
1543 | pBAEntry = &pAd->BATable.BARecEntry[Idx]; | 1543 | pBAEntry = &pAd->BATable.BARecEntry[Idx]; |
1544 | } else { | 1544 | } else { |
1545 | /* impossible !!! */ | 1545 | /* impossible ! */ |
1546 | ASSERT(0); | 1546 | ASSERT(0); |
1547 | /* release packet */ | 1547 | /* release packet */ |
1548 | RELEASE_NDIS_PACKET(pAd, pRxBlk->pRxPacket, | 1548 | RELEASE_NDIS_PACKET(pAd, pRxBlk->pRxPacket, |
diff --git a/drivers/staging/rt2860/common/cmm_aes.c b/drivers/staging/rt2860/common/cmm_aes.c index 6730d78badfc..250357c5cd65 100644 --- a/drivers/staging/rt2860/common/cmm_aes.c +++ b/drivers/staging/rt2860/common/cmm_aes.c | |||
@@ -1279,7 +1279,7 @@ void AES_GTK_KEY_UNWRAP(u8 * key, | |||
1279 | 1279 | ||
1280 | if (R == NULL) { | 1280 | if (R == NULL) { |
1281 | DBGPRINT(RT_DEBUG_ERROR, | 1281 | DBGPRINT(RT_DEBUG_ERROR, |
1282 | ("!!!AES_GTK_KEY_UNWRAP: no memory!!!\n")); | 1282 | ("AES_GTK_KEY_UNWRAP: no memory!\n")); |
1283 | return; | 1283 | return; |
1284 | } | 1284 | } |
1285 | /* End of if */ | 1285 | /* End of if */ |
diff --git a/drivers/staging/rt2860/common/cmm_asic.c b/drivers/staging/rt2860/common/cmm_asic.c index fafba27fcd7b..4d77e83eb418 100644 --- a/drivers/staging/rt2860/common/cmm_asic.c +++ b/drivers/staging/rt2860/common/cmm_asic.c | |||
@@ -1005,7 +1005,7 @@ void AsicSwitchChannel(struct rt_rtmp_adapter *pAd, u8 Channel, IN BOOLEAN bScan | |||
1005 | void AsicResetBBPAgent(struct rt_rtmp_adapter *pAd) | 1005 | void AsicResetBBPAgent(struct rt_rtmp_adapter *pAd) |
1006 | { | 1006 | { |
1007 | BBP_CSR_CFG_STRUC BbpCsr; | 1007 | BBP_CSR_CFG_STRUC BbpCsr; |
1008 | DBGPRINT(RT_DEBUG_ERROR, ("Reset BBP Agent busy bit.!! \n")); | 1008 | DBGPRINT(RT_DEBUG_ERROR, ("Reset BBP Agent busy bit!\n")); |
1009 | /* Still need to find why BBP agent keeps busy, but in fact, hardware still function ok. Now clear busy first. */ | 1009 | /* Still need to find why BBP agent keeps busy, but in fact, hardware still function ok. Now clear busy first. */ |
1010 | RTMP_IO_READ32(pAd, H2M_BBP_AGENT, &BbpCsr.word); | 1010 | RTMP_IO_READ32(pAd, H2M_BBP_AGENT, &BbpCsr.word); |
1011 | BbpCsr.field.Busy = 0; | 1011 | BbpCsr.field.Busy = 0; |
diff --git a/drivers/staging/rt2860/common/cmm_data.c b/drivers/staging/rt2860/common/cmm_data.c index 2d2c311bc7a4..68263cee7952 100644 --- a/drivers/staging/rt2860/common/cmm_data.c +++ b/drivers/staging/rt2860/common/cmm_data.c | |||
@@ -397,7 +397,7 @@ int MlmeHardTransmitMgmtRing(struct rt_rtmp_adapter *pAd, | |||
397 | && (pAd->CommonCfg.bIEEE80211H == 1) | 397 | && (pAd->CommonCfg.bIEEE80211H == 1) |
398 | && (pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)) { | 398 | && (pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)) { |
399 | DBGPRINT(RT_DEBUG_ERROR, | 399 | DBGPRINT(RT_DEBUG_ERROR, |
400 | ("MlmeHardTransmit --> radar detect not in normal mode !!!\n")); | 400 | ("MlmeHardTransmit --> radar detect not in normal mode!\n")); |
401 | /* if (!IrqState) */ | 401 | /* if (!IrqState) */ |
402 | RTMP_SEM_UNLOCK(&pAd->MgmtRingLock); | 402 | RTMP_SEM_UNLOCK(&pAd->MgmtRingLock); |
403 | return (NDIS_STATUS_FAILURE); | 403 | return (NDIS_STATUS_FAILURE); |
@@ -964,7 +964,7 @@ u16 RTMPCalcDuration(struct rt_rtmp_adapter *pAd, u8 Rate, unsigned long Size) | |||
964 | IRQL = PASSIVE_LEVEL | 964 | IRQL = PASSIVE_LEVEL |
965 | IRQL = DISPATCH_LEVEL | 965 | IRQL = DISPATCH_LEVEL |
966 | 966 | ||
967 | See also : BASmartHardTransmit() !!! | 967 | See also : BASmartHardTransmit() ! |
968 | 968 | ||
969 | ======================================================================== | 969 | ======================================================================== |
970 | */ | 970 | */ |
@@ -1708,7 +1708,7 @@ BOOLEAN MacTableDeleteEntry(struct rt_rtmp_adapter *pAd, | |||
1708 | pProbeEntry = pProbeEntry->pNext; | 1708 | pProbeEntry = pProbeEntry->pNext; |
1709 | } while (pProbeEntry); | 1709 | } while (pProbeEntry); |
1710 | 1710 | ||
1711 | /* not found !!! */ | 1711 | /* not found ! */ |
1712 | ASSERT(pProbeEntry != NULL); | 1712 | ASSERT(pProbeEntry != NULL); |
1713 | 1713 | ||
1714 | RTMP_STA_ENTRY_KEY_DEL(pAd, BSS0, wcid); | 1714 | RTMP_STA_ENTRY_KEY_DEL(pAd, BSS0, wcid); |
@@ -1729,7 +1729,7 @@ BOOLEAN MacTableDeleteEntry(struct rt_rtmp_adapter *pAd, | |||
1729 | pAd->MacTab.Size)); | 1729 | pAd->MacTab.Size)); |
1730 | } else { | 1730 | } else { |
1731 | DBGPRINT(RT_DEBUG_OFF, | 1731 | DBGPRINT(RT_DEBUG_OFF, |
1732 | ("\n%s: Impossible Wcid = %d !!!!!\n", | 1732 | ("\n%s: Impossible Wcid = %d !\n", |
1733 | __func__, wcid)); | 1733 | __func__, wcid)); |
1734 | } | 1734 | } |
1735 | } | 1735 | } |
diff --git a/drivers/staging/rt2860/common/cmm_data_2860.c b/drivers/staging/rt2860/common/cmm_data_2860.c index 857ff450b6c9..d3ae7ca5a700 100644 --- a/drivers/staging/rt2860/common/cmm_data_2860.c +++ b/drivers/staging/rt2860/common/cmm_data_2860.c | |||
@@ -847,7 +847,7 @@ VOID RT28xxPciStaAsicForceWakeup( | |||
847 | AutoWakeupCfg.word = 0; | 847 | AutoWakeupCfg.word = 0; |
848 | RTMP_IO_WRITE32(pAd, AUTO_WAKEUP_CFG, AutoWakeupCfg.word); | 848 | RTMP_IO_WRITE32(pAd, AUTO_WAKEUP_CFG, AutoWakeupCfg.word); |
849 | 849 | ||
850 | // If this is called from Halt. ALWAYS force wakeup!!! | 850 | // If this is called from Halt. ALWAYS force wakeup! |
851 | if (Level == RTMP_HALT) | 851 | if (Level == RTMP_HALT) |
852 | { | 852 | { |
853 | RT28xxPciAsicRadioOn(pAd, RTMP_HALT); | 853 | RT28xxPciAsicRadioOn(pAd, RTMP_HALT); |
diff --git a/drivers/staging/rt2860/common/cmm_data_pci.c b/drivers/staging/rt2860/common/cmm_data_pci.c index e6cb55a1292e..43d73a05c8eb 100644 --- a/drivers/staging/rt2860/common/cmm_data_pci.c +++ b/drivers/staging/rt2860/common/cmm_data_pci.c | |||
@@ -979,7 +979,7 @@ int MlmeHardTransmitTxRing(struct rt_rtmp_adapter *pAd, | |||
979 | && (pAd->CommonCfg.bIEEE80211H == 1) | 979 | && (pAd->CommonCfg.bIEEE80211H == 1) |
980 | && (pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)) { | 980 | && (pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)) { |
981 | DBGPRINT(RT_DEBUG_ERROR, | 981 | DBGPRINT(RT_DEBUG_ERROR, |
982 | ("MlmeHardTransmit --> radar detect not in normal mode !!!\n")); | 982 | ("MlmeHardTransmit --> radar detect not in normal mode!\n")); |
983 | /*NdisReleaseSpinLock(&pAd->TxRingLock); */ | 983 | /*NdisReleaseSpinLock(&pAd->TxRingLock); */ |
984 | return (NDIS_STATUS_FAILURE); | 984 | return (NDIS_STATUS_FAILURE); |
985 | } | 985 | } |
diff --git a/drivers/staging/rt2860/common/cmm_mac_pci.c b/drivers/staging/rt2860/common/cmm_mac_pci.c index 11dfdc58c77b..560ebd398e1d 100644 --- a/drivers/staging/rt2860/common/cmm_mac_pci.c +++ b/drivers/staging/rt2860/common/cmm_mac_pci.c | |||
@@ -1650,7 +1650,7 @@ void RT28xxPciMlmeRadioOFF(struct rt_rtmp_adapter *pAd) | |||
1650 | 1650 | ||
1651 | if (brc == FALSE) { | 1651 | if (brc == FALSE) { |
1652 | DBGPRINT(RT_DEBUG_ERROR, | 1652 | DBGPRINT(RT_DEBUG_ERROR, |
1653 | ("%s call RT28xxPciAsicRadioOff fail !!\n", | 1653 | ("%s call RT28xxPciAsicRadioOff fail!\n", |
1654 | __func__)); | 1654 | __func__)); |
1655 | } | 1655 | } |
1656 | } | 1656 | } |
diff --git a/drivers/staging/rt2860/common/cmm_mac_usb.c b/drivers/staging/rt2860/common/cmm_mac_usb.c index 010c37c4c724..9dd6959cd5a5 100644 --- a/drivers/staging/rt2860/common/cmm_mac_usb.c +++ b/drivers/staging/rt2860/common/cmm_mac_usb.c | |||
@@ -205,9 +205,9 @@ int NICInitTransmit(struct rt_rtmp_adapter *pAd) | |||
205 | /*Allocate URB */ | 205 | /*Allocate URB */ |
206 | LM_USB_ALLOC(pObj, pHTTXContext, struct rt_httx_buffer *, | 206 | LM_USB_ALLOC(pObj, pHTTXContext, struct rt_httx_buffer *, |
207 | sizeof(struct rt_httx_buffer), Status, | 207 | sizeof(struct rt_httx_buffer), Status, |
208 | ("<-- ERROR in Alloc TX TxContext[%d] urb!! \n", | 208 | ("<-- ERROR in Alloc TX TxContext[%d] urb!\n", |
209 | acidx), done, | 209 | acidx), done, |
210 | ("<-- ERROR in Alloc TX TxContext[%d] struct rt_httx_buffer !! \n", | 210 | ("<-- ERROR in Alloc TX TxContext[%d] struct rt_httx_buffer!\n", |
211 | acidx), out1); | 211 | acidx), out1); |
212 | 212 | ||
213 | NdisZeroMemory(pHTTXContext->TransferBuffer-> | 213 | NdisZeroMemory(pHTTXContext->TransferBuffer-> |
@@ -259,7 +259,7 @@ int NICInitTransmit(struct rt_rtmp_adapter *pAd) | |||
259 | pMLMEContext->pUrb = RTUSB_ALLOC_URB(0); | 259 | pMLMEContext->pUrb = RTUSB_ALLOC_URB(0); |
260 | if (pMLMEContext->pUrb == NULL) { | 260 | if (pMLMEContext->pUrb == NULL) { |
261 | DBGPRINT(RT_DEBUG_ERROR, | 261 | DBGPRINT(RT_DEBUG_ERROR, |
262 | ("<-- ERROR in Alloc TX MLMEContext[%d] urb!! \n", | 262 | ("<-- ERROR in Alloc TX MLMEContext[%d] urb!\n", |
263 | i)); | 263 | i)); |
264 | Status = NDIS_STATUS_RESOURCES; | 264 | Status = NDIS_STATUS_RESOURCES; |
265 | goto out2; | 265 | goto out2; |
@@ -296,9 +296,9 @@ int NICInitTransmit(struct rt_rtmp_adapter *pAd) | |||
296 | /*Allocate URB */ | 296 | /*Allocate URB */ |
297 | LM_USB_ALLOC(pObj, pBeaconContext, struct rt_tx_buffer *, | 297 | LM_USB_ALLOC(pObj, pBeaconContext, struct rt_tx_buffer *, |
298 | sizeof(struct rt_tx_buffer), Status, | 298 | sizeof(struct rt_tx_buffer), Status, |
299 | ("<-- ERROR in Alloc TX BeaconContext[%d] urb!! \n", | 299 | ("<-- ERROR in Alloc TX BeaconContext[%d] urb!\n", |
300 | i), out2, | 300 | i), out2, |
301 | ("<-- ERROR in Alloc TX BeaconContext[%d] struct rt_tx_buffer !! \n", | 301 | ("<-- ERROR in Alloc TX BeaconContext[%d] struct rt_tx_buffer!\n", |
302 | i), out3); | 302 | i), out3); |
303 | 303 | ||
304 | pBeaconContext->pAd = pAd; | 304 | pBeaconContext->pAd = pAd; |
@@ -315,9 +315,9 @@ int NICInitTransmit(struct rt_rtmp_adapter *pAd) | |||
315 | /*Allocate URB */ | 315 | /*Allocate URB */ |
316 | LM_USB_ALLOC(pObj, pNullContext, struct rt_tx_buffer *, sizeof(struct rt_tx_buffer), | 316 | LM_USB_ALLOC(pObj, pNullContext, struct rt_tx_buffer *, sizeof(struct rt_tx_buffer), |
317 | Status, | 317 | Status, |
318 | ("<-- ERROR in Alloc TX NullContext urb!! \n"), | 318 | ("<-- ERROR in Alloc TX NullContext urb!\n"), |
319 | out3, | 319 | out3, |
320 | ("<-- ERROR in Alloc TX NullContext struct rt_tx_buffer !! \n"), | 320 | ("<-- ERROR in Alloc TX NullContext struct rt_tx_buffer!\n"), |
321 | out4); | 321 | out4); |
322 | 322 | ||
323 | pNullContext->pAd = pAd; | 323 | pNullContext->pAd = pAd; |
@@ -333,9 +333,9 @@ int NICInitTransmit(struct rt_rtmp_adapter *pAd) | |||
333 | /*Allocate URB */ | 333 | /*Allocate URB */ |
334 | LM_USB_ALLOC(pObj, pRTSContext, struct rt_tx_buffer *, sizeof(struct rt_tx_buffer), | 334 | LM_USB_ALLOC(pObj, pRTSContext, struct rt_tx_buffer *, sizeof(struct rt_tx_buffer), |
335 | Status, | 335 | Status, |
336 | ("<-- ERROR in Alloc TX RTSContext urb!! \n"), | 336 | ("<-- ERROR in Alloc TX RTSContext urb!\n"), |
337 | out4, | 337 | out4, |
338 | ("<-- ERROR in Alloc TX RTSContext struct rt_tx_buffer !! \n"), | 338 | ("<-- ERROR in Alloc TX RTSContext struct rt_tx_buffer!\n"), |
339 | out5); | 339 | out5); |
340 | 340 | ||
341 | pRTSContext->pAd = pAd; | 341 | pRTSContext->pAd = pAd; |
@@ -350,9 +350,9 @@ int NICInitTransmit(struct rt_rtmp_adapter *pAd) | |||
350 | /*Allocate URB */ | 350 | /*Allocate URB */ |
351 | LM_USB_ALLOC(pObj, pPsPollContext, struct rt_tx_buffer *, | 351 | LM_USB_ALLOC(pObj, pPsPollContext, struct rt_tx_buffer *, |
352 | sizeof(struct rt_tx_buffer), Status, | 352 | sizeof(struct rt_tx_buffer), Status, |
353 | ("<-- ERROR in Alloc TX PsPollContext urb!! \n"), | 353 | ("<-- ERROR in Alloc TX PsPollContext urb!\n"), |
354 | out5, | 354 | out5, |
355 | ("<-- ERROR in Alloc TX PsPollContext struct rt_tx_buffer !! \n"), | 355 | ("<-- ERROR in Alloc TX PsPollContext struct rt_tx_buffer!\n"), |
356 | out6); | 356 | out6); |
357 | 357 | ||
358 | pPsPollContext->pAd = pAd; | 358 | pPsPollContext->pAd = pAd; |
diff --git a/drivers/staging/rt2860/common/cmm_sanity.c b/drivers/staging/rt2860/common/cmm_sanity.c index 556e3d06b88b..6b003c903444 100644 --- a/drivers/staging/rt2860/common/cmm_sanity.c +++ b/drivers/staging/rt2860/common/cmm_sanity.c | |||
@@ -256,7 +256,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(struct rt_rtmp_adapter *pAd, void * Msg, uns | |||
256 | 256 | ||
257 | /* For some 11a AP which didn't have DS_IE, we use two conditions to decide the channel */ | 257 | /* For some 11a AP which didn't have DS_IE, we use two conditions to decide the channel */ |
258 | /* 1. If the AP is 11n enabled, then check the control channel. */ | 258 | /* 1. If the AP is 11n enabled, then check the control channel. */ |
259 | /* 2. If the AP didn't have any info about channel, use the channel we received this frame as the channel. (May inaccuracy!!) */ | 259 | /* 2. If the AP didn't have any info about channel, use the channel we received this frame as the channel. (May inaccuracy!) */ |
260 | u8 CtrlChannel = 0; | 260 | u8 CtrlChannel = 0; |
261 | 261 | ||
262 | /* Add for 3 necessary EID field check */ | 262 | /* Add for 3 necessary EID field check */ |
@@ -371,7 +371,7 @@ BOOLEAN PeerBeaconAndProbeRspSanity(struct rt_rtmp_adapter *pAd, void * Msg, uns | |||
371 | break; | 371 | break; |
372 | 372 | ||
373 | case IE_HT_CAP: | 373 | case IE_HT_CAP: |
374 | if (pEid->Len >= SIZE_HT_CAP_IE) /*Note: allow extension.!! */ | 374 | if (pEid->Len >= SIZE_HT_CAP_IE) /*Note: allow extension! */ |
375 | { | 375 | { |
376 | NdisMoveMemory(pHtCapability, pEid->Octet, | 376 | NdisMoveMemory(pHtCapability, pEid->Octet, |
377 | sizeof(struct rt_ht_capability_ie)); | 377 | sizeof(struct rt_ht_capability_ie)); |
diff --git a/drivers/staging/rt2860/common/cmm_tkip.c b/drivers/staging/rt2860/common/cmm_tkip.c index 7a2a48eb8e51..4881ef9ba022 100644 --- a/drivers/staging/rt2860/common/cmm_tkip.c +++ b/drivers/staging/rt2860/common/cmm_tkip.c | |||
@@ -828,6 +828,6 @@ BOOLEAN RTMPSoftDecryptTKIP(struct rt_rtmp_adapter *pAd, | |||
828 | /*RTMPReportMicError(pAd, &pWpaKey[KeyID]); // marked by AlbertY @ 20060630 */ | 828 | /*RTMPReportMicError(pAd, &pWpaKey[KeyID]); // marked by AlbertY @ 20060630 */ |
829 | return (FALSE); | 829 | return (FALSE); |
830 | } | 830 | } |
831 | /*DBGPRINT(RT_DEBUG_TRACE, "RTMPSoftDecryptTKIP Decript done!!\n"); */ | 831 | /*DBGPRINT(RT_DEBUG_TRACE, "RTMPSoftDecryptTKIP Decript done!\n"); */ |
832 | return TRUE; | 832 | return TRUE; |
833 | } | 833 | } |
diff --git a/drivers/staging/rt2860/common/cmm_wep.c b/drivers/staging/rt2860/common/cmm_wep.c index c72835504ecb..76f880cb39b0 100644 --- a/drivers/staging/rt2860/common/cmm_wep.c +++ b/drivers/staging/rt2860/common/cmm_wep.c | |||
@@ -245,7 +245,7 @@ BOOLEAN RTMPSoftDecryptWEP(struct rt_rtmp_adapter *pAd, | |||
245 | crc32 ^= 0xffffffff; /* complement */ | 245 | crc32 ^= 0xffffffff; /* complement */ |
246 | 246 | ||
247 | if (crc32 != cpu2le32(trailfcs)) { | 247 | if (crc32 != cpu2le32(trailfcs)) { |
248 | DBGPRINT(RT_DEBUG_TRACE, ("! WEP Data CRC Error !\n")); /*CRC error. */ | 248 | DBGPRINT(RT_DEBUG_TRACE, ("WEP Data CRC Error!\n")); /*CRC error. */ |
249 | return (FALSE); | 249 | return (FALSE); |
250 | } | 250 | } |
251 | return (TRUE); | 251 | return (TRUE); |
diff --git a/drivers/staging/rt2860/common/cmm_wpa.c b/drivers/staging/rt2860/common/cmm_wpa.c index 7b51be0e8dd3..94e119faaa71 100644 --- a/drivers/staging/rt2860/common/cmm_wpa.c +++ b/drivers/staging/rt2860/common/cmm_wpa.c | |||
@@ -1292,7 +1292,7 @@ void PRF(u8 * key, | |||
1292 | os_alloc_mem(NULL, (u8 **) & input, 1024); | 1292 | os_alloc_mem(NULL, (u8 **) & input, 1024); |
1293 | 1293 | ||
1294 | if (input == NULL) { | 1294 | if (input == NULL) { |
1295 | DBGPRINT(RT_DEBUG_ERROR, ("!!!PRF: no memory!!!\n")); | 1295 | DBGPRINT(RT_DEBUG_ERROR, ("PRF: no memory!\n")); |
1296 | return; | 1296 | return; |
1297 | } | 1297 | } |
1298 | /* Generate concatenation input */ | 1298 | /* Generate concatenation input */ |
@@ -2672,7 +2672,7 @@ static void CalculateMIC(u8 KeyDescVer, | |||
2672 | os_alloc_mem(NULL, (u8 **) & OutBuffer, 512); | 2672 | os_alloc_mem(NULL, (u8 **) & OutBuffer, 512); |
2673 | 2673 | ||
2674 | if (OutBuffer == NULL) { | 2674 | if (OutBuffer == NULL) { |
2675 | DBGPRINT(RT_DEBUG_ERROR, ("!!!CalculateMIC: no memory!!!\n")); | 2675 | DBGPRINT(RT_DEBUG_ERROR, ("CalculateMIC: no memory!\n")); |
2676 | return; | 2676 | return; |
2677 | } | 2677 | } |
2678 | /* make a frame for calculating MIC. */ | 2678 | /* make a frame for calculating MIC. */ |
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c index 8cd8f53ed0e6..9fc34a8f2180 100644 --- a/drivers/staging/rt2860/common/mlme.c +++ b/drivers/staging/rt2860/common/mlme.c | |||
@@ -483,7 +483,7 @@ void MlmeHandler(struct rt_rtmp_adapter *pAd) | |||
483 | #ifdef RTMP_MAC_USB | 483 | #ifdef RTMP_MAC_USB |
484 | if (Elem->MsgType == MT2_RESET_CONF) { | 484 | if (Elem->MsgType == MT2_RESET_CONF) { |
485 | DBGPRINT_RAW(RT_DEBUG_TRACE, | 485 | DBGPRINT_RAW(RT_DEBUG_TRACE, |
486 | ("!!! reset MLME state machine !!!\n")); | 486 | ("reset MLME state machine!\n")); |
487 | MlmeRestartStateMachine(pAd); | 487 | MlmeRestartStateMachine(pAd); |
488 | Elem->Occupied = FALSE; | 488 | Elem->Occupied = FALSE; |
489 | Elem->MsgLen = 0; | 489 | Elem->MsgLen = 0; |
@@ -4042,7 +4042,7 @@ void BssTableSsidSort(struct rt_rtmp_adapter *pAd, | |||
4042 | } | 4042 | } |
4043 | /* Since the AP is using hidden SSID, and we are trying to connect to ANY */ | 4043 | /* Since the AP is using hidden SSID, and we are trying to connect to ANY */ |
4044 | /* It definitely will fail. So, skip it. */ | 4044 | /* It definitely will fail. So, skip it. */ |
4045 | /* CCX also require not even try to connect it!! */ | 4045 | /* CCX also require not even try to connect it! */ |
4046 | if (SsidLen == 0) | 4046 | if (SsidLen == 0) |
4047 | continue; | 4047 | continue; |
4048 | 4048 | ||
@@ -4600,8 +4600,8 @@ void MgtMacHeaderInit(struct rt_rtmp_adapter *pAd, | |||
4600 | * input params: | 4600 | * input params: |
4601 | * Buffer - pointer to a pre-allocated memory segment | 4601 | * Buffer - pointer to a pre-allocated memory segment |
4602 | * args - a list of <int arg_size, arg> pairs. | 4602 | * args - a list of <int arg_size, arg> pairs. |
4603 | * NOTE NOTE NOTE!!!! the last argument must be NULL, otherwise this | 4603 | * NOTE NOTE NOTE! the last argument must be NULL, otherwise this |
4604 | * function will FAIL!!! | 4604 | * function will FAIL! |
4605 | * return: | 4605 | * return: |
4606 | * Size of the buffer | 4606 | * Size of the buffer |
4607 | * usage: | 4607 | * usage: |
diff --git a/drivers/staging/rt2860/common/rt_rf.c b/drivers/staging/rt2860/common/rt_rf.c index fb0ca88fa3ea..519121d81040 100644 --- a/drivers/staging/rt2860/common/rt_rf.c +++ b/drivers/staging/rt2860/common/rt_rf.c | |||
@@ -72,7 +72,7 @@ int RT30xxWriteRFRegister(struct rt_rtmp_adapter *pAd, | |||
72 | if ((i == RETRY_LIMIT) | 72 | if ((i == RETRY_LIMIT) |
73 | || (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) { | 73 | || (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) { |
74 | DBGPRINT_RAW(RT_DEBUG_ERROR, | 74 | DBGPRINT_RAW(RT_DEBUG_ERROR, |
75 | ("Retry count exhausted or device removed!!!\n")); | 75 | ("Retry count exhausted or device removed!\n")); |
76 | return STATUS_UNSUCCESSFUL; | 76 | return STATUS_UNSUCCESSFUL; |
77 | } | 77 | } |
78 | 78 | ||
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c index d3c7c17e36a8..21a95ffdfb86 100644 --- a/drivers/staging/rt2860/common/rtmp_init.c +++ b/drivers/staging/rt2860/common/rtmp_init.c | |||
@@ -75,7 +75,7 @@ struct rt_rtmp_reg_pair MACRegTable[] = { | |||
75 | {BCN_OFFSET0, 0xece8e4e0}, /* 0x3800, 0x3A00, 0x3C00, 0x3E00, 512B for each beacon */ | 75 | {BCN_OFFSET0, 0xece8e4e0}, /* 0x3800, 0x3A00, 0x3C00, 0x3E00, 512B for each beacon */ |
76 | {BCN_OFFSET1, 0xfcf8f4f0}, /* 0x3800, 0x3A00, 0x3C00, 0x3E00, 512B for each beacon */ | 76 | {BCN_OFFSET1, 0xfcf8f4f0}, /* 0x3800, 0x3A00, 0x3C00, 0x3E00, 512B for each beacon */ |
77 | #else | 77 | #else |
78 | #error You must re-calculate new value for BCN_OFFSET0 & BCN_OFFSET1 in MACRegTable[]!!! | 78 | #error You must re-calculate new value for BCN_OFFSET0 & BCN_OFFSET1 in MACRegTable[]! |
79 | #endif /* HW_BEACON_OFFSET // */ | 79 | #endif /* HW_BEACON_OFFSET // */ |
80 | 80 | ||
81 | {LEGACY_BASIC_RATE, 0x0000013f}, /* Basic rate set bitmap */ | 81 | {LEGACY_BASIC_RATE, 0x0000013f}, /* Basic rate set bitmap */ |
@@ -1272,7 +1272,7 @@ void NICInitAsicFromEEPROM(struct rt_rtmp_adapter *pAd) | |||
1272 | pAd->bAutoTxAgcA = pAd->bAutoTxAgcG = FALSE; | 1272 | pAd->bAutoTxAgcA = pAd->bAutoTxAgcG = FALSE; |
1273 | /* */ | 1273 | /* */ |
1274 | /* Since BBP has been progamed, to make sure BBP setting will be */ | 1274 | /* Since BBP has been progamed, to make sure BBP setting will be */ |
1275 | /* upate inside of AsicAntennaSelect, so reset to UNKNOWN_BAND!! */ | 1275 | /* upate inside of AsicAntennaSelect, so reset to UNKNOWN_BAND! */ |
1276 | /* */ | 1276 | /* */ |
1277 | pAd->CommonCfg.BandState = UNKNOWN_BAND; | 1277 | pAd->CommonCfg.BandState = UNKNOWN_BAND; |
1278 | 1278 | ||
@@ -3470,7 +3470,7 @@ err1: | |||
3470 | err0: | 3470 | err0: |
3471 | #endif /* ST // */ | 3471 | #endif /* ST // */ |
3472 | 3472 | ||
3473 | DBGPRINT(RT_DEBUG_ERROR, ("!!! rt28xx Initialized fail !!!\n")); | 3473 | DBGPRINT(RT_DEBUG_ERROR, ("rt28xx Initialized fail!\n")); |
3474 | return FALSE; | 3474 | return FALSE; |
3475 | } | 3475 | } |
3476 | 3476 | ||
diff --git a/drivers/staging/rt2860/oid.h b/drivers/staging/rt2860/oid.h index fa4a2e692e79..fd1c14192451 100644 --- a/drivers/staging/rt2860/oid.h +++ b/drivers/staging/rt2860/oid.h | |||
@@ -557,7 +557,7 @@ enum { | |||
557 | /* New for MeetingHouse Api support */ | 557 | /* New for MeetingHouse Api support */ |
558 | #define OID_MH_802_1X_SUPPORTED 0xFFEDC100 | 558 | #define OID_MH_802_1X_SUPPORTED 0xFFEDC100 |
559 | 559 | ||
560 | /* MIMO Tx parameter, ShortGI, MCS, STBC, etc. these are fields in TXWI. Don't change this definition!!! */ | 560 | /* MIMO Tx parameter, ShortGI, MCS, STBC, etc. these are fields in TXWI. Don't change this definition! */ |
561 | typedef union _HTTRANSMIT_SETTING { | 561 | typedef union _HTTRANSMIT_SETTING { |
562 | struct { | 562 | struct { |
563 | u16 MCS:7; /* MCS */ | 563 | u16 MCS:7; /* MCS */ |
@@ -614,7 +614,7 @@ struct rt_802_11_event_table { | |||
614 | struct rt_802_11_event_log Log[MAX_NUMBER_OF_EVENT]; | 614 | struct rt_802_11_event_log Log[MAX_NUMBER_OF_EVENT]; |
615 | }; | 615 | }; |
616 | 616 | ||
617 | /* MIMO Tx parameter, ShortGI, MCS, STBC, etc. these are fields in TXWI. Don't change this definition!!! */ | 617 | /* MIMO Tx parameter, ShortGI, MCS, STBC, etc. these are fields in TXWI. Don't change this definition! */ |
618 | typedef union _MACHTTRANSMIT_SETTING { | 618 | typedef union _MACHTTRANSMIT_SETTING { |
619 | struct { | 619 | struct { |
620 | u16 MCS:7; /* MCS */ | 620 | u16 MCS:7; /* MCS */ |
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index d84ac32b8a87..9357fb26cc2a 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c | |||
@@ -51,7 +51,7 @@ char const *pWirelessSysEventText[IW_SYS_EVENT_TYPE_NUM] = { | |||
51 | "connects with our wireless client", /* IW_STA_LINKUP_EVENT_FLAG */ | 51 | "connects with our wireless client", /* IW_STA_LINKUP_EVENT_FLAG */ |
52 | "disconnects with our wireless client", /* IW_STA_LINKDOWN_EVENT_FLAG */ | 52 | "disconnects with our wireless client", /* IW_STA_LINKDOWN_EVENT_FLAG */ |
53 | "scan completed" /* IW_SCAN_COMPLETED_EVENT_FLAG */ | 53 | "scan completed" /* IW_SCAN_COMPLETED_EVENT_FLAG */ |
54 | "scan terminate!! Busy!! Enqueue fail!!" /* IW_SCAN_ENQUEUE_FAIL_EVENT_FLAG */ | 54 | "scan terminate! Busy! Enqueue fail!" /* IW_SCAN_ENQUEUE_FAIL_EVENT_FLAG */ |
55 | }; | 55 | }; |
56 | 56 | ||
57 | /* for wireless IDS_spoof_attack event message */ | 57 | /* for wireless IDS_spoof_attack event message */ |
@@ -1282,7 +1282,7 @@ int RtmpOSNetDevDestory(struct rt_rtmp_adapter *pAd, struct net_device *pNetDev) | |||
1282 | { | 1282 | { |
1283 | 1283 | ||
1284 | /* TODO: Need to fix this */ | 1284 | /* TODO: Need to fix this */ |
1285 | printk("WARNING: This function(%s) not implement yet!!!\n", __func__); | 1285 | printk("WARNING: This function(%s) not implement yet!\n", __func__); |
1286 | return 0; | 1286 | return 0; |
1287 | } | 1287 | } |
1288 | 1288 | ||
diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h index 7efc109c22ff..f85508d9d5a9 100644 --- a/drivers/staging/rt2860/rt_linux.h +++ b/drivers/staging/rt2860/rt_linux.h | |||
@@ -427,7 +427,7 @@ do{ \ | |||
427 | 427 | ||
428 | #define DBGPRINT_ERR(Fmt) \ | 428 | #define DBGPRINT_ERR(Fmt) \ |
429 | { \ | 429 | { \ |
430 | printk("ERROR!!! "); \ | 430 | printk("ERROR! "); \ |
431 | printk Fmt; \ | 431 | printk Fmt; \ |
432 | } | 432 | } |
433 | 433 | ||
diff --git a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c index fbbec9d2dcdd..c3d92802d0c9 100644 --- a/drivers/staging/rt2860/rt_main_dev.c +++ b/drivers/staging/rt2860/rt_main_dev.c | |||
@@ -321,7 +321,7 @@ int rt28xx_close(struct net_device *dev) | |||
321 | 321 | ||
322 | if (brc == FALSE) { | 322 | if (brc == FALSE) { |
323 | DBGPRINT(RT_DEBUG_ERROR, | 323 | DBGPRINT(RT_DEBUG_ERROR, |
324 | ("%s call RT28xxPciAsicRadioOff fail !!\n", | 324 | ("%s call RT28xxPciAsicRadioOff fail!\n", |
325 | __func__)); | 325 | __func__)); |
326 | } | 326 | } |
327 | } | 327 | } |
diff --git a/drivers/staging/rt2860/rtmp_chip.h b/drivers/staging/rt2860/rtmp_chip.h index 32ff3504e9e8..0adf2cd2deb7 100644 --- a/drivers/staging/rt2860/rtmp_chip.h +++ b/drivers/staging/rt2860/rtmp_chip.h | |||
@@ -197,7 +197,7 @@ typedef union _EEPROM_NIC_CINFIG2_STRUC { | |||
197 | u16 DynamicTxAgcControl:1; /* */ | 197 | u16 DynamicTxAgcControl:1; /* */ |
198 | u16 ExternalLNAForG:1; /* */ | 198 | u16 ExternalLNAForG:1; /* */ |
199 | u16 ExternalLNAForA:1; /* external LNA enable for 2.4G */ | 199 | u16 ExternalLNAForA:1; /* external LNA enable for 2.4G */ |
200 | u16 CardbusAcceleration:1; /* !!! NOTE: 0 - enable, 1 - disable */ | 200 | u16 CardbusAcceleration:1; /* ! NOTE: 0 - enable, 1 - disable */ |
201 | u16 BW40MSidebandForG:1; | 201 | u16 BW40MSidebandForG:1; |
202 | u16 BW40MSidebandForA:1; | 202 | u16 BW40MSidebandForA:1; |
203 | u16 EnableWPSPBC:1; /* WPS PBC Control bit */ | 203 | u16 EnableWPSPBC:1; /* WPS PBC Control bit */ |
diff --git a/drivers/staging/rt2860/rtmp_def.h b/drivers/staging/rt2860/rtmp_def.h index c79eceb6e71c..9c54bacb845b 100644 --- a/drivers/staging/rt2860/rtmp_def.h +++ b/drivers/staging/rt2860/rtmp_def.h | |||
@@ -409,7 +409,7 @@ | |||
409 | #define MAX_LEN_OF_MAC_TABLE MAX_NUMBER_OF_MAC /* if MAX_MBSSID_NUM is 8, this value can't be larger than 211 */ | 409 | #define MAX_LEN_OF_MAC_TABLE MAX_NUMBER_OF_MAC /* if MAX_MBSSID_NUM is 8, this value can't be larger than 211 */ |
410 | 410 | ||
411 | #if MAX_LEN_OF_MAC_TABLE>MAX_AVAILABLE_CLIENT_WCID | 411 | #if MAX_LEN_OF_MAC_TABLE>MAX_AVAILABLE_CLIENT_WCID |
412 | #error MAX_LEN_OF_MAC_TABLE can not be larger than MAX_AVAILABLE_CLIENT_WCID!!!! | 412 | #error MAX_LEN_OF_MAC_TABLE can not be larger than MAX_AVAILABLE_CLIENT_WCID! |
413 | #endif | 413 | #endif |
414 | 414 | ||
415 | #define MAX_NUM_OF_WDS_LINK_PERBSSID 3 | 415 | #define MAX_NUM_OF_WDS_LINK_PERBSSID 3 |
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c index 733bc083a6a7..7055f229e511 100644 --- a/drivers/staging/rt2860/sta/assoc.c +++ b/drivers/staging/rt2860/sta/assoc.c | |||
@@ -563,7 +563,7 @@ void MlmeAssocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem * | |||
563 | pAd->Mlme.AssocMachine.CurrState = ASSOC_WAIT_RSP; | 563 | pAd->Mlme.AssocMachine.CurrState = ASSOC_WAIT_RSP; |
564 | } else { | 564 | } else { |
565 | DBGPRINT(RT_DEBUG_TRACE, | 565 | DBGPRINT(RT_DEBUG_TRACE, |
566 | ("ASSOC - MlmeAssocReqAction() sanity check failed. BUG!!!!!! \n")); | 566 | ("ASSOC - MlmeAssocReqAction() sanity check failed. BUG!\n")); |
567 | pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE; | 567 | pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE; |
568 | Status = MLME_INVALID_FORMAT; | 568 | Status = MLME_INVALID_FORMAT; |
569 | MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_ASSOC_CONF, 2, | 569 | MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_ASSOC_CONF, 2, |
@@ -746,7 +746,7 @@ void MlmeReassocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem | |||
746 | pAd->Mlme.AssocMachine.CurrState = REASSOC_WAIT_RSP; | 746 | pAd->Mlme.AssocMachine.CurrState = REASSOC_WAIT_RSP; |
747 | } else { | 747 | } else { |
748 | DBGPRINT(RT_DEBUG_TRACE, | 748 | DBGPRINT(RT_DEBUG_TRACE, |
749 | ("ASSOC - MlmeReassocReqAction() sanity check failed. BUG!!!! \n")); | 749 | ("ASSOC - MlmeReassocReqAction() sanity check failed. BUG!\n")); |
750 | pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE; | 750 | pAd->Mlme.AssocMachine.CurrState = ASSOC_IDLE; |
751 | Status = MLME_INVALID_FORMAT; | 751 | Status = MLME_INVALID_FORMAT; |
752 | MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_REASSOC_CONF, 2, | 752 | MlmeEnqueue(pAd, MLME_CNTL_STATE_MACHINE, MT2_REASSOC_CONF, 2, |
diff --git a/drivers/staging/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c index 9c7752076b00..17e59ba3d807 100644 --- a/drivers/staging/rt2860/sta/connect.c +++ b/drivers/staging/rt2860/sta/connect.c | |||
@@ -214,7 +214,7 @@ void MlmeCntlMachinePerformAction(struct rt_rtmp_adapter *pAd, | |||
214 | break; | 214 | break; |
215 | #endif /* RTMP_MAC_USB // */ | 215 | #endif /* RTMP_MAC_USB // */ |
216 | default: | 216 | default: |
217 | DBGPRINT_ERR(("!ERROR! CNTL - Illegal message type(=%ld)", | 217 | DBGPRINT_ERR(("ERROR! CNTL - Illegal message type(=%ld)", |
218 | Elem->MsgType)); | 218 | Elem->MsgType)); |
219 | break; | 219 | break; |
220 | } | 220 | } |
@@ -911,7 +911,7 @@ void CntlWaitStartProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E | |||
911 | pAd->CommonCfg.Bssid[5])); | 911 | pAd->CommonCfg.Bssid[5])); |
912 | } else { | 912 | } else { |
913 | DBGPRINT(RT_DEBUG_TRACE, | 913 | DBGPRINT(RT_DEBUG_TRACE, |
914 | ("CNTL - Start IBSS fail. BUG!!!!!\n")); | 914 | ("CNTL - Start IBSS fail. BUG!\n")); |
915 | pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; | 915 | pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE; |
916 | } | 916 | } |
917 | } | 917 | } |
@@ -1184,7 +1184,7 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType) | |||
1184 | /* */ | 1184 | /* */ |
1185 | /* ASSOC - DisassocTimeoutAction */ | 1185 | /* ASSOC - DisassocTimeoutAction */ |
1186 | /* CNTL - Dis-associate successful */ | 1186 | /* CNTL - Dis-associate successful */ |
1187 | /* !!! LINK DOWN !!! */ | 1187 | /* ! LINK DOWN ! */ |
1188 | /* [88888] OID_802_11_SSID should have returned NDTEST_WEP_AP2(Returned: ) */ | 1188 | /* [88888] OID_802_11_SSID should have returned NDTEST_WEP_AP2(Returned: ) */ |
1189 | /* */ | 1189 | /* */ |
1190 | /* To prevent DisassocTimeoutAction to call Link down after we link up, */ | 1190 | /* To prevent DisassocTimeoutAction to call Link down after we link up, */ |
@@ -1218,12 +1218,12 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType) | |||
1218 | if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) | 1218 | if (pAd->CommonCfg.PhyMode >= PHY_11ABGN_MIXED) |
1219 | AdhocTurnOnQos(pAd); | 1219 | AdhocTurnOnQos(pAd); |
1220 | 1220 | ||
1221 | DBGPRINT(RT_DEBUG_TRACE, ("!!!Adhoc LINK UP !!! \n")); | 1221 | DBGPRINT(RT_DEBUG_TRACE, ("Adhoc LINK UP!\n")); |
1222 | } else { | 1222 | } else { |
1223 | OPSTATUS_SET_FLAG(pAd, fOP_STATUS_INFRA_ON); | 1223 | OPSTATUS_SET_FLAG(pAd, fOP_STATUS_INFRA_ON); |
1224 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_ADHOC_ON); | 1224 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_ADHOC_ON); |
1225 | 1225 | ||
1226 | DBGPRINT(RT_DEBUG_TRACE, ("!!!Infra LINK UP !!! \n")); | 1226 | DBGPRINT(RT_DEBUG_TRACE, ("Infra LINK UP!\n")); |
1227 | } | 1227 | } |
1228 | 1228 | ||
1229 | /* 3*3 */ | 1229 | /* 3*3 */ |
@@ -1262,11 +1262,11 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType) | |||
1262 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R69, 0x1A); | 1262 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R69, 0x1A); |
1263 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R70, 0x0A); | 1263 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R70, 0x0A); |
1264 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R73, 0x16); | 1264 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R73, 0x16); |
1265 | DBGPRINT(RT_DEBUG_TRACE, ("!!!rt2860C !!! \n")); | 1265 | DBGPRINT(RT_DEBUG_TRACE, ("rt2860C !\n")); |
1266 | } | 1266 | } |
1267 | 1267 | ||
1268 | DBGPRINT(RT_DEBUG_TRACE, | 1268 | DBGPRINT(RT_DEBUG_TRACE, |
1269 | ("!!!40MHz Lower LINK UP !!! Control Channel at Below. Central = %d \n", | 1269 | ("40MHz Lower LINK UP! Control Channel at Below. Central = %d \n", |
1270 | pAd->CommonCfg.CentralChannel)); | 1270 | pAd->CommonCfg.CentralChannel)); |
1271 | } else if ((pAd->CommonCfg.CentralChannel < pAd->CommonCfg.Channel) | 1271 | } else if ((pAd->CommonCfg.CentralChannel < pAd->CommonCfg.Channel) |
1272 | && (pAd->MlmeAux.HtCapability.HtCapInfo.ChannelWidth == | 1272 | && (pAd->MlmeAux.HtCapability.HtCapInfo.ChannelWidth == |
@@ -1296,11 +1296,11 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType) | |||
1296 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R69, 0x1A); | 1296 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R69, 0x1A); |
1297 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R70, 0x0A); | 1297 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R70, 0x0A); |
1298 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R73, 0x16); | 1298 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R73, 0x16); |
1299 | DBGPRINT(RT_DEBUG_TRACE, ("!!!rt2860C !!! \n")); | 1299 | DBGPRINT(RT_DEBUG_TRACE, ("rt2860C !\n")); |
1300 | } | 1300 | } |
1301 | 1301 | ||
1302 | DBGPRINT(RT_DEBUG_TRACE, | 1302 | DBGPRINT(RT_DEBUG_TRACE, |
1303 | ("!!! 40MHz Upper LINK UP !!! Control Channel at UpperCentral = %d \n", | 1303 | ("40MHz Upper LINK UP! Control Channel at UpperCentral = %d \n", |
1304 | pAd->CommonCfg.CentralChannel)); | 1304 | pAd->CommonCfg.CentralChannel)); |
1305 | } else { | 1305 | } else { |
1306 | pAd->CommonCfg.BBPCurrentBW = BW_20; | 1306 | pAd->CommonCfg.BBPCurrentBW = BW_20; |
@@ -1327,10 +1327,10 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType) | |||
1327 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R69, 0x16); | 1327 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R69, 0x16); |
1328 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R70, 0x08); | 1328 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R70, 0x08); |
1329 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R73, 0x11); | 1329 | RTMP_BBP_IO_WRITE8_BY_REG_ID(pAd, BBP_R73, 0x11); |
1330 | DBGPRINT(RT_DEBUG_TRACE, ("!!!rt2860C !!! \n")); | 1330 | DBGPRINT(RT_DEBUG_TRACE, ("rt2860C !\n")); |
1331 | } | 1331 | } |
1332 | 1332 | ||
1333 | DBGPRINT(RT_DEBUG_TRACE, ("!!! 20MHz LINK UP !!! \n")); | 1333 | DBGPRINT(RT_DEBUG_TRACE, ("20MHz LINK UP!\n")); |
1334 | } | 1334 | } |
1335 | 1335 | ||
1336 | RTMPSetAGCInitValue(pAd, pAd->CommonCfg.BBPCurrentBW); | 1336 | RTMPSetAGCInitValue(pAd, pAd->CommonCfg.BBPCurrentBW); |
@@ -1342,12 +1342,12 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType) | |||
1342 | &pAd->BbpTuning.R66CurrentValue); | 1342 | &pAd->BbpTuning.R66CurrentValue); |
1343 | 1343 | ||
1344 | DBGPRINT(RT_DEBUG_TRACE, | 1344 | DBGPRINT(RT_DEBUG_TRACE, |
1345 | ("!!! LINK UP !!! (BssType=%d, AID=%d, ssid=%s, Channel=%d, CentralChannel = %d)\n", | 1345 | ("LINK UP! (BssType=%d, AID=%d, ssid=%s, Channel=%d, CentralChannel = %d)\n", |
1346 | BssType, pAd->StaActive.Aid, pAd->CommonCfg.Ssid, | 1346 | BssType, pAd->StaActive.Aid, pAd->CommonCfg.Ssid, |
1347 | pAd->CommonCfg.Channel, pAd->CommonCfg.CentralChannel)); | 1347 | pAd->CommonCfg.Channel, pAd->CommonCfg.CentralChannel)); |
1348 | 1348 | ||
1349 | DBGPRINT(RT_DEBUG_TRACE, | 1349 | DBGPRINT(RT_DEBUG_TRACE, |
1350 | ("!!! LINK UP !!! (Density =%d, )\n", | 1350 | ("LINK UP! (Density =%d, )\n", |
1351 | pAd->MacTab.Content[BSSID_WCID].MpduDensity)); | 1351 | pAd->MacTab.Content[BSSID_WCID].MpduDensity)); |
1352 | 1352 | ||
1353 | AsicSetBssid(pAd, pAd->CommonCfg.Bssid); | 1353 | AsicSetBssid(pAd, pAd->CommonCfg.Bssid); |
@@ -1634,13 +1634,13 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType) | |||
1634 | NdisReleaseSpinLock(&pAd->MacTabLock); | 1634 | NdisReleaseSpinLock(&pAd->MacTabLock); |
1635 | 1635 | ||
1636 | DBGPRINT(RT_DEBUG_TRACE, | 1636 | DBGPRINT(RT_DEBUG_TRACE, |
1637 | ("!!! LINK UP !!! ClientStatusFlags=%lx)\n", | 1637 | ("LINK UP! ClientStatusFlags=%lx)\n", |
1638 | pAd->MacTab.Content[BSSID_WCID].ClientStatusFlags)); | 1638 | pAd->MacTab.Content[BSSID_WCID].ClientStatusFlags)); |
1639 | 1639 | ||
1640 | MlmeUpdateTxRates(pAd, TRUE, BSS0); | 1640 | MlmeUpdateTxRates(pAd, TRUE, BSS0); |
1641 | MlmeUpdateHtTxRates(pAd, BSS0); | 1641 | MlmeUpdateHtTxRates(pAd, BSS0); |
1642 | DBGPRINT(RT_DEBUG_TRACE, | 1642 | DBGPRINT(RT_DEBUG_TRACE, |
1643 | ("!!! LINK UP !! (StaActive.bHtEnable =%d, )\n", | 1643 | ("LINK UP! (StaActive.bHtEnable =%d, )\n", |
1644 | pAd->StaActive.SupportedPhyInfo.bHtEnable)); | 1644 | pAd->StaActive.SupportedPhyInfo.bHtEnable)); |
1645 | 1645 | ||
1646 | if (pAd->CommonCfg.bAggregationCapable) { | 1646 | if (pAd->CommonCfg.bAggregationCapable) { |
@@ -1811,7 +1811,7 @@ void LinkUp(struct rt_rtmp_adapter *pAd, u8 BssType) | |||
1811 | pAd->CommonCfg.IOTestParm.bLastAtheros = FALSE; | 1811 | pAd->CommonCfg.IOTestParm.bLastAtheros = FALSE; |
1812 | COPY_MAC_ADDR(pAd->CommonCfg.LastBssid, pAd->CommonCfg.Bssid); | 1812 | COPY_MAC_ADDR(pAd->CommonCfg.LastBssid, pAd->CommonCfg.Bssid); |
1813 | DBGPRINT(RT_DEBUG_TRACE, | 1813 | DBGPRINT(RT_DEBUG_TRACE, |
1814 | ("!!!pAd->bNextDisableRxBA= %d \n", | 1814 | ("pAd->bNextDisableRxBA= %d \n", |
1815 | pAd->CommonCfg.IOTestParm.bNextDisableRxBA)); | 1815 | pAd->CommonCfg.IOTestParm.bNextDisableRxBA)); |
1816 | /* BSSID add in one MAC entry too. Because in Tx, ASIC need to check Cipher and IV/EIV, BAbitmap */ | 1816 | /* BSSID add in one MAC entry too. Because in Tx, ASIC need to check Cipher and IV/EIV, BAbitmap */ |
1817 | /* Pther information in MACTab.Content[BSSID_WCID] is not necessary for driver. */ | 1817 | /* Pther information in MACTab.Content[BSSID_WCID] is not necessary for driver. */ |
@@ -1893,7 +1893,7 @@ void LinkDown(struct rt_rtmp_adapter *pAd, IN BOOLEAN IsReqFromAP) | |||
1893 | BSS0, 0); | 1893 | BSS0, 0); |
1894 | } | 1894 | } |
1895 | 1895 | ||
1896 | DBGPRINT(RT_DEBUG_TRACE, ("!!! LINK DOWN !!!\n")); | 1896 | DBGPRINT(RT_DEBUG_TRACE, ("LINK DOWN!\n")); |
1897 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_AGGREGATION_INUSED); | 1897 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_AGGREGATION_INUSED); |
1898 | 1898 | ||
1899 | #ifdef RTMP_MAC_PCI | 1899 | #ifdef RTMP_MAC_PCI |
@@ -1921,7 +1921,7 @@ void LinkDown(struct rt_rtmp_adapter *pAd, IN BOOLEAN IsReqFromAP) | |||
1921 | 1921 | ||
1922 | if (ADHOC_ON(pAd)) /* Adhoc mode link down */ | 1922 | if (ADHOC_ON(pAd)) /* Adhoc mode link down */ |
1923 | { | 1923 | { |
1924 | DBGPRINT(RT_DEBUG_TRACE, ("!!! LINK DOWN 1!!!\n")); | 1924 | DBGPRINT(RT_DEBUG_TRACE, ("LINK DOWN 1!\n")); |
1925 | 1925 | ||
1926 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_ADHOC_ON); | 1926 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_ADHOC_ON); |
1927 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED); | 1927 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED); |
@@ -1931,10 +1931,10 @@ void LinkDown(struct rt_rtmp_adapter *pAd, IN BOOLEAN IsReqFromAP) | |||
1931 | BssTableDeleteEntry(&pAd->ScanTab, pAd->CommonCfg.Bssid, | 1931 | BssTableDeleteEntry(&pAd->ScanTab, pAd->CommonCfg.Bssid, |
1932 | pAd->CommonCfg.Channel); | 1932 | pAd->CommonCfg.Channel); |
1933 | DBGPRINT(RT_DEBUG_TRACE, | 1933 | DBGPRINT(RT_DEBUG_TRACE, |
1934 | ("!!! MacTab.Size=%d !!!\n", pAd->MacTab.Size)); | 1934 | (" MacTab.Size=%d !\n", pAd->MacTab.Size)); |
1935 | } else /* Infra structure mode */ | 1935 | } else /* Infra structure mode */ |
1936 | { | 1936 | { |
1937 | DBGPRINT(RT_DEBUG_TRACE, ("!!! LINK DOWN 2!!!\n")); | 1937 | DBGPRINT(RT_DEBUG_TRACE, ("LINK DOWN 2!\n")); |
1938 | 1938 | ||
1939 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_INFRA_ON); | 1939 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_INFRA_ON); |
1940 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED); | 1940 | OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED); |
diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c index 8c0ab2df0011..c50394759079 100644 --- a/drivers/staging/rt2860/sta/rtmp_data.c +++ b/drivers/staging/rt2860/sta/rtmp_data.c | |||
@@ -192,7 +192,7 @@ void STARxEAPOLFrameIndicate(struct rt_rtmp_adapter *pAd, | |||
192 | pRxWI->RSSI1, pRxWI->RSSI2, | 192 | pRxWI->RSSI1, pRxWI->RSSI2, |
193 | pRxD->PlcpSignal); | 193 | pRxD->PlcpSignal); |
194 | DBGPRINT_RAW(RT_DEBUG_TRACE, | 194 | DBGPRINT_RAW(RT_DEBUG_TRACE, |
195 | ("!!! report EAPOL/AIRONET DATA to MLME (len=%d) !!!\n", | 195 | ("report EAPOL/AIRONET DATA to MLME (len=%d) !\n", |
196 | pRxBlk->DataSize)); | 196 | pRxBlk->DataSize)); |
197 | } | 197 | } |
198 | } | 198 | } |
@@ -940,7 +940,7 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket) | |||
940 | 940 | ||
941 | if (pSrcBufVA == NULL) { | 941 | if (pSrcBufVA == NULL) { |
942 | DBGPRINT(RT_DEBUG_ERROR, | 942 | DBGPRINT(RT_DEBUG_ERROR, |
943 | ("STASendPacket --> pSrcBufVA == NULL !!!SrcBufLen=%x\n", | 943 | ("STASendPacket --> pSrcBufVA == NULL !SrcBufLen=%x\n", |
944 | SrcBufLen)); | 944 | SrcBufLen)); |
945 | /* Resourece is low, system did not allocate virtual address */ | 945 | /* Resourece is low, system did not allocate virtual address */ |
946 | /* return NDIS_STATUS_FAILURE directly to upper layer */ | 946 | /* return NDIS_STATUS_FAILURE directly to upper layer */ |
@@ -950,7 +950,7 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket) | |||
950 | 950 | ||
951 | if (SrcBufLen < 14) { | 951 | if (SrcBufLen < 14) { |
952 | DBGPRINT(RT_DEBUG_ERROR, | 952 | DBGPRINT(RT_DEBUG_ERROR, |
953 | ("STASendPacket --> Ndis Packet buffer error !!!\n")); | 953 | ("STASendPacket --> Ndis Packet buffer error!\n")); |
954 | RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE); | 954 | RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE); |
955 | return (NDIS_STATUS_FAILURE); | 955 | return (NDIS_STATUS_FAILURE); |
956 | } | 956 | } |
@@ -1007,7 +1007,7 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket) | |||
1007 | && (RTMP_GET_PACKET_EAPOL(pPacket) == FALSE) | 1007 | && (RTMP_GET_PACKET_EAPOL(pPacket) == FALSE) |
1008 | ) { | 1008 | ) { |
1009 | DBGPRINT(RT_DEBUG_TRACE, | 1009 | DBGPRINT(RT_DEBUG_TRACE, |
1010 | ("STASendPacket --> Drop packet before port secured !!!\n")); | 1010 | ("STASendPacket --> Drop packet before port secured!\n")); |
1011 | RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE); | 1011 | RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE); |
1012 | 1012 | ||
1013 | return (NDIS_STATUS_FAILURE); | 1013 | return (NDIS_STATUS_FAILURE); |
@@ -1680,7 +1680,7 @@ void STA_AMPDU_Frame_Tx(struct rt_rtmp_adapter *pAd, struct rt_tx_blk *pTxBlk) | |||
1680 | 1680 | ||
1681 | pMacEntry = pTxBlk->pMacEntry; | 1681 | pMacEntry = pTxBlk->pMacEntry; |
1682 | if (pMacEntry->isCached) { | 1682 | if (pMacEntry->isCached) { |
1683 | /* NOTE: Please make sure the size of pMacEntry->CachedBuf[] is smaller than pTxBlk->HeaderBuf[]!!!! */ | 1683 | /* NOTE: Please make sure the size of pMacEntry->CachedBuf[] is smaller than pTxBlk->HeaderBuf[]! */ |
1684 | NdisMoveMemory((u8 *)& pTxBlk-> | 1684 | NdisMoveMemory((u8 *)& pTxBlk-> |
1685 | HeaderBuf[TXINFO_SIZE], | 1685 | HeaderBuf[TXINFO_SIZE], |
1686 | (u8 *)& pMacEntry->CachedBuf[0], | 1686 | (u8 *)& pMacEntry->CachedBuf[0], |
@@ -2506,7 +2506,7 @@ int STAHardTransmit(struct rt_rtmp_adapter *pAd, | |||
2506 | { | 2506 | { |
2507 | /* It should not happened! */ | 2507 | /* It should not happened! */ |
2508 | DBGPRINT(RT_DEBUG_ERROR, | 2508 | DBGPRINT(RT_DEBUG_ERROR, |
2509 | ("Send a pacekt was not classified!! It should not happen!\n")); | 2509 | ("Send a packet was not classified! It should not happen!\n")); |
2510 | while (pTxBlk->TxPacketList.Number) { | 2510 | while (pTxBlk->TxPacketList.Number) { |
2511 | pQEntry = | 2511 | pQEntry = |
2512 | RemoveHeadQueue(&pTxBlk->TxPacketList); | 2512 | RemoveHeadQueue(&pTxBlk->TxPacketList); |
diff --git a/drivers/staging/rt2860/sta/sanity.c b/drivers/staging/rt2860/sta/sanity.c index 64a0e8739048..8f9fd19be151 100644 --- a/drivers/staging/rt2860/sta/sanity.c +++ b/drivers/staging/rt2860/sta/sanity.c | |||
@@ -150,7 +150,7 @@ BOOLEAN PeerAssocRspSanity(struct rt_rtmp_adapter *pAd, void * pMsg, unsigned lo | |||
150 | 150 | ||
151 | case IE_HT_CAP: | 151 | case IE_HT_CAP: |
152 | case IE_HT_CAP2: | 152 | case IE_HT_CAP2: |
153 | if (pEid->Len >= SIZE_HT_CAP_IE) /*Note: allow extension.!! */ | 153 | if (pEid->Len >= SIZE_HT_CAP_IE) /*Note: allow extension! */ |
154 | { | 154 | { |
155 | NdisMoveMemory(pHtCapability, pEid->Octet, | 155 | NdisMoveMemory(pHtCapability, pEid->Octet, |
156 | SIZE_HT_CAP_IE); | 156 | SIZE_HT_CAP_IE); |
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c index 04f81bdeb0c8..d8fbe6cc6941 100644 --- a/drivers/staging/rt2860/sta_ioctl.c +++ b/drivers/staging/rt2860/sta_ioctl.c | |||
@@ -600,7 +600,7 @@ int rt_ioctl_siwap(struct net_device *dev, | |||
600 | if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) { | 600 | if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) { |
601 | RTMP_MLME_RESET_STATE_MACHINE(pAdapter); | 601 | RTMP_MLME_RESET_STATE_MACHINE(pAdapter); |
602 | DBGPRINT(RT_DEBUG_TRACE, | 602 | DBGPRINT(RT_DEBUG_TRACE, |
603 | ("!!! MLME busy, reset MLME state machine !!!\n")); | 603 | ("MLME busy, reset MLME state machine!\n")); |
604 | } | 604 | } |
605 | /* tell CNTL state machine to call NdisMSetInformationComplete() after completing */ | 605 | /* tell CNTL state machine to call NdisMSetInformationComplete() after completing */ |
606 | /* this request, because this request is initiated by NDIS. */ | 606 | /* this request, because this request is initiated by NDIS. */ |
@@ -741,7 +741,7 @@ int rt_ioctl_siwscan(struct net_device *dev, | |||
741 | 741 | ||
742 | if (MONITOR_ON(pAdapter)) { | 742 | if (MONITOR_ON(pAdapter)) { |
743 | DBGPRINT(RT_DEBUG_TRACE, | 743 | DBGPRINT(RT_DEBUG_TRACE, |
744 | ("!!! Driver is in Monitor Mode now !!!\n")); | 744 | ("Driver is in Monitor Mode now!\n")); |
745 | return -EINVAL; | 745 | return -EINVAL; |
746 | } | 746 | } |
747 | 747 | ||
@@ -758,7 +758,7 @@ int rt_ioctl_siwscan(struct net_device *dev, | |||
758 | if ((pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE) | 758 | if ((pAdapter->StaCfg.WpaSupplicantUP == WPA_SUPPLICANT_ENABLE) |
759 | && (pAdapter->StaCfg.WpaSupplicantScanCount > 3)) { | 759 | && (pAdapter->StaCfg.WpaSupplicantScanCount > 3)) { |
760 | DBGPRINT(RT_DEBUG_TRACE, | 760 | DBGPRINT(RT_DEBUG_TRACE, |
761 | ("!!! WpaSupplicantScanCount > 3\n")); | 761 | ("WpaSupplicantScanCount > 3\n")); |
762 | Status = NDIS_STATUS_SUCCESS; | 762 | Status = NDIS_STATUS_SUCCESS; |
763 | break; | 763 | break; |
764 | } | 764 | } |
@@ -771,7 +771,7 @@ int rt_ioctl_siwscan(struct net_device *dev, | |||
771 | && (pAdapter->StaCfg.PortSecured == | 771 | && (pAdapter->StaCfg.PortSecured == |
772 | WPA_802_1X_PORT_NOT_SECURED)) { | 772 | WPA_802_1X_PORT_NOT_SECURED)) { |
773 | DBGPRINT(RT_DEBUG_TRACE, | 773 | DBGPRINT(RT_DEBUG_TRACE, |
774 | ("!!! Link UP, Port Not Secured! ignore this set::OID_802_11_BSSID_LIST_SCAN\n")); | 774 | ("Link UP, Port Not Secured! ignore this set::OID_802_11_BSSID_LIST_SCAN\n")); |
775 | Status = NDIS_STATUS_SUCCESS; | 775 | Status = NDIS_STATUS_SUCCESS; |
776 | break; | 776 | break; |
777 | } | 777 | } |
@@ -779,7 +779,7 @@ int rt_ioctl_siwscan(struct net_device *dev, | |||
779 | if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) { | 779 | if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) { |
780 | RTMP_MLME_RESET_STATE_MACHINE(pAdapter); | 780 | RTMP_MLME_RESET_STATE_MACHINE(pAdapter); |
781 | DBGPRINT(RT_DEBUG_TRACE, | 781 | DBGPRINT(RT_DEBUG_TRACE, |
782 | ("!!! MLME busy, reset MLME state machine !!!\n")); | 782 | ("MLME busy, reset MLME state machine!\n")); |
783 | } | 783 | } |
784 | /* tell CNTL state machine to call NdisMSetInformationComplete() after completing */ | 784 | /* tell CNTL state machine to call NdisMSetInformationComplete() after completing */ |
785 | /* this request, because this request is initiated by NDIS. */ | 785 | /* this request, because this request is initiated by NDIS. */ |
@@ -2256,7 +2256,7 @@ int rt_ioctl_siwpmksa(struct net_device *dev, | |||
2256 | break; | 2256 | break; |
2257 | default: | 2257 | default: |
2258 | DBGPRINT(RT_DEBUG_TRACE, | 2258 | DBGPRINT(RT_DEBUG_TRACE, |
2259 | ("rt_ioctl_siwpmksa - Unknow Command!!\n")); | 2259 | ("rt_ioctl_siwpmksa - Unknown Command!\n")); |
2260 | break; | 2260 | break; |
2261 | } | 2261 | } |
2262 | 2262 | ||
@@ -2664,7 +2664,7 @@ int Set_SSID_Proc(struct rt_rtmp_adapter *pAdapter, char *arg) | |||
2664 | if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) { | 2664 | if (pAdapter->Mlme.CntlMachine.CurrState != CNTL_IDLE) { |
2665 | RTMP_MLME_RESET_STATE_MACHINE(pAdapter); | 2665 | RTMP_MLME_RESET_STATE_MACHINE(pAdapter); |
2666 | DBGPRINT(RT_DEBUG_TRACE, | 2666 | DBGPRINT(RT_DEBUG_TRACE, |
2667 | ("!!! MLME busy, reset MLME state machine !!!\n")); | 2667 | ("MLME busy, reset MLME state machine!\n")); |
2668 | } | 2668 | } |
2669 | 2669 | ||
2670 | if ((pAdapter->StaCfg.WpaPassPhraseLen >= 8) && | 2670 | if ((pAdapter->StaCfg.WpaPassPhraseLen >= 8) && |
diff --git a/drivers/staging/rt2860/usb_main_dev.c b/drivers/staging/rt2860/usb_main_dev.c index c1d1fb535a37..925a236e1044 100644 --- a/drivers/staging/rt2860/usb_main_dev.c +++ b/drivers/staging/rt2860/usb_main_dev.c | |||
@@ -584,7 +584,7 @@ void RTUSBWatchDog(struct rt_rtmp_adapter *pAd) | |||
584 | RTMP_IO_READ32(pAd, TXRXQ_PCNT, &MACValue); | 584 | RTMP_IO_READ32(pAd, TXRXQ_PCNT, &MACValue); |
585 | if ((MACValue & 0xff) != 0) { | 585 | if ((MACValue & 0xff) != 0) { |
586 | DBGPRINT(RT_DEBUG_TRACE, | 586 | DBGPRINT(RT_DEBUG_TRACE, |
587 | ("TX QUEUE 0 Not EMPTY(Value=0x%0x). !!!!!!!!!!!!!!!\n", | 587 | ("TX QUEUE 0 Not EMPTY(Value=0x%0x)!\n", |
588 | MACValue)); | 588 | MACValue)); |
589 | RTMP_IO_WRITE32(pAd, PBF_CFG, 0xf40012); | 589 | RTMP_IO_WRITE32(pAd, PBF_CFG, 0xf40012); |
590 | while ((MACValue & 0xff) != 0 && (idx++ < 10)) { | 590 | while ((MACValue & 0xff) != 0 && (idx++ < 10)) { |
@@ -707,7 +707,7 @@ void RTUSBWatchDog(struct rt_rtmp_adapter *pAd) | |||
707 | } | 707 | } |
708 | } else { | 708 | } else { |
709 | DBGPRINT(RT_DEBUG_ERROR, | 709 | DBGPRINT(RT_DEBUG_ERROR, |
710 | ("Unkonw bulkOut URB maybe hanged!!!!!!!!!!!!\n")); | 710 | ("Unknown bulkOut URB maybe hanged!\n")); |
711 | } | 711 | } |
712 | } else { | 712 | } else { |
713 | RTMP_IRQ_UNLOCK(&pAd->BulkOutLock[idx], | 713 | RTMP_IRQ_UNLOCK(&pAd->BulkOutLock[idx], |