staging: rt2860: remove superfluous exclamation marks
PATCH 3/3 staging: rt2860: remove superfluous exclamation marks
From: Sebastian Dalfuß <[email protected]>
Subject: [Patch 3/3] staging: rt2860: remove superfluous exclamation marks
This patch is based on 2.6.32-rc6 and needs to be applied on top of [1/3] and [2/3].
This patch removes an estimated bazillion exclamation marks from DBGPRINT() and printk() strings and also comments. No-one needs a dozen of exclamation marks in a single debug message, so i condensed each chain of exclamation marks to a single one. I removed leading exclamation marks from strings as well.
Signed-off-by Sebastian Dalfuß <[email protected]>
---
drivers/staging/rt2860/common/ba_action.c +2 -2
@@ -1584,7 +1584,7 @@ }else { -DBGPRINT (RT_DEBUG_ERROR , ("!!! (%d) Can't allocate reordering mpdu blk\n" , +DBGPRINT (RT_DEBUG_ERROR , ("(%d) Can't allocate reordering mpdu blk\n" , pBAEntry->list.qlen));/*
@@ -1652,7 +1652,7 @@ }else { -// impossible !!! +// impossible ! ASSERT (0 );// release packet RELEASE_NDIS_PACKET (pAd, pRxBlk->pRxPacket,NDIS_STATUS_FAILURE );
drivers/staging/rt2860/common/cmm_data_2860.c +1 -1
@@ -847,7 +847,7 @@ AutoWakeupCfg.word =0 ;RTMP_IO_WRITE32 (pAd,AUTO_WAKEUP_CFG , AutoWakeupCfg.word); -// If this is called from Halt. ALWAYS force wakeup!!! +// If this is called from Halt. ALWAYS force wakeup! if (Level ==RTMP_HALT ) {RT28xxPciAsicRadioOn (pAd,RTMP_HALT );
drivers/staging/rt2860/common/cmm_data.c +5 -5
@@ -423,7 +423,7 @@ && (pAd->CommonCfg.bIEEE80211H == 1) && (pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)) { -DBGPRINT (RT_DEBUG_ERROR ,("MlmeHardTransmit --> radar detect not in normal mode !!!\n" )); +DBGPRINT (RT_DEBUG_ERROR ,("MlmeHardTransmit --> radar detect not in normal mode !\n" ));return (NDIS_STATUS_FAILURE ); }
@@ -605,7 +605,7 @@ && (pAd->CommonCfg.bIEEE80211H == 1) && (pAd->CommonCfg.RadarDetect.RDMode != RD_NORMAL_MODE)) { -DBGPRINT (RT_DEBUG_ERROR ,("MlmeHardTransmit --> radar detect not in normal mode !!!\n" )); +DBGPRINT (RT_DEBUG_ERROR ,("MlmeHardTransmit --> radar detect not in normal mode !\n" ));RTMP_SEM_UNLOCK (&pAd->MgmtRingLock);return (NDIS_STATUS_FAILURE ); }
@@ -1194,7 +1194,7 @@IRQL = PASSIVE_LEVEL IRQL = DISPATCH_LEVEL -See also : BASmartHardTransmit() !!! +See also : BASmartHardTransmit() ! ======================================================================== */
@@ -2305,7 +2305,7 @@ pProbeEntry = pProbeEntry->pNext; }while (pProbeEntry); -// not found !!! +// not found ! ASSERT (pProbeEntry !=NULL );RT28XX_STA_ENTRY_KEY_DEL (pAd,BSS0 , wcid);
@@ -2324,7 +2324,7 @@ }else { -printk ("\n%s: Impossible Wcid = %d !!!!!\n" , __func__, wcid); +printk ("\n%s: Impossible Wcid = %d !\n" , __func__, wcid); } }
drivers/staging/rt2860/common/cmm_sanity.c +2 -2
@@ -295,7 +295,7 @@// For some 11a AP which didn't have DS_IE, we use two conditions to decide the channel // 1. If the AP is 11n enabled, then check the control channel. -// 2. If the AP didn't have any info about channel, use the channel we received this frame as the channel. (May inaccuracy!!) +// 2. If the AP didn't have any info about channel, use the channel we received this frame as the channel. (May inaccuracy!) UCHAR CtrlChannel =0 ;// Add for 3 necessary EID field check
@@ -414,7 +414,7 @@break ;case IE_HT_CAP : -if (pEid->Len >=SIZE_HT_CAP_IE )//Note: allow extension.!! +if (pEid->Len >=SIZE_HT_CAP_IE )//Note: allow extension.! {NdisMoveMemory (pHtCapability, pEid->Octet,sizeof (HT_CAPABILITY_IE )); *pHtCapabilityLen =SIZE_HT_CAP_IE ;// Nnow we only support 26 bytes.
drivers/staging/rt2860/common/cmm_wpa.c +2 -2
@@ -103,7 +103,7 @@if (input ==NULL ) { -DBGPRINT (RT_DEBUG_ERROR , ("!!!PRF: no memory!!!\n" )); +DBGPRINT (RT_DEBUG_ERROR , ("PRF: no memory!\n" ));return ; }
@@ -797,7 +797,7 @@if (R ==NULL ) { -DBGPRINT (RT_DEBUG_ERROR , ("!!!AES_GTK_KEY_UNWRAP: no memory!!!\n" )); +DBGPRINT (RT_DEBUG_ERROR , ("AES_GTK_KEY_UNWRAP: no memory!\n" ));return ; }/* End of if */
drivers/staging/rt2860/common/eeprom.c +5 -5
@@ -692,7 +692,7 @@if (BlkNum ==0xffff ) { -DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters: out of free E-fuse space!!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters: out of free E-fuse space!\n" ));return FALSE; }
@@ -814,7 +814,7 @@DBGPRINT (RT_DEBUG_TRACE , ("Not bWriteSuccess new BlkNum = %d\n" , BlkNum));if (BlkNum ==0xffff ) { -DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters: out of free E-fuse space!!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters: out of free E-fuse space!\n" ));return FALSE; }
@@ -1093,7 +1093,7 @@ }else { -DBGPRINT (RT_DEBUG_ERROR , ("--> Error!! System doest not support read function\n" )); +DBGPRINT (RT_DEBUG_ERROR , ("--> Error! System doest not support read function\n" ));kfree (PDATA );kfree (buffer);kfree (src);
@@ -1231,7 +1231,7 @@if (BlkNum ==0xffff ) { -DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters: out of free E-fuse space!!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegisters: out of free E-fuse space!\n" ));return FALSE; }//Step 1.1.0
@@ -1429,7 +1429,7 @@DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegistersFromBin::Not bWriteSuccess new BlkNum = %d\n" , BlkNum));if (BlkNum ==0xffff ) { -DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegistersFromBin: out of free E-fuse space!!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("eFuseWriteRegistersFromBin: out of free E-fuse space!\n" ));return FALSE; }
drivers/staging/rt2860/common/mlme.c +13 -13
@@ -570,7 +570,7 @@#ifdef RT2870 if (Elem->MsgType ==MT2_RESET_CONF ) { -DBGPRINT_RAW (RT_DEBUG_TRACE , ("!!! reset MLME state machine !!!\n" )); +DBGPRINT_RAW (RT_DEBUG_TRACE , ("reset MLME state machine !\n" ));MlmeRestartStateMachine (pAd); Elem->Occupied = FALSE; Elem->MsgLen =0 ;
@@ -863,7 +863,7 @@ {if ((pAd->StaCfg.bRadio == TRUE) && (pAd->SameRxByteCount <700 )) { -DBGPRINT (RT_DEBUG_TRACE , ("---> SameRxByteCount = %lu !!!!!!!!!!!!!!! \n" , pAd->SameRxByteCount)); +DBGPRINT (RT_DEBUG_TRACE , ("---> SameRxByteCount = %lu ! \n" , pAd->SameRxByteCount)); pAd->SameRxByteCount =700 ;AsicResetBBP (pAd); }
@@ -3950,7 +3950,7 @@// Since the AP is using hidden SSID, and we are trying to connect to ANY // It definitely will fail. So, skip it. -// CCX also require not even try to connect it!! +// CCX also require not even try to connect it! if (SsidLen ==0 )continue ;
@@ -4510,8 +4510,8 @@* input params: * Buffer - pointer to a pre-allocated memory segment * args - a list of <int arg_size, arg> pairs. -* NOTE NOTE NOTE!!!! the last argument must be NULL, otherwise this -* function will FAIL!!! +* NOTE NOTE NOTE! the last argument must be NULL, otherwise this +* function will FAIL! * return: * Size of the buffer * usage:
@@ -8571,7 +8571,7 @@UINT32 Data;BOOLEAN bCtrl = FALSE; -DBGPRINT (RT_DEBUG_TRACE , ("---> AsicResetFromDMABusy !!!!!!!!!!!!!!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("---> AsicResetFromDMABusy ! \n" ));// Be sure restore link control value so we can write register. RTMP_CLEAR_PSFLAG (pAd, fRTMP_PS_CAN_GO_SLEEP);
@@ -8609,13 +8609,13 @@RTMP_SET_PSFLAG (pAd, fRTMP_PS_CAN_GO_SLEEP);RTMP_CLEAR_FLAG (pAd, fRTMP_ADAPTER_NIC_NOT_EXIST | fRTMP_ADAPTER_HALT_IN_PROGRESS); -DBGPRINT (RT_DEBUG_TRACE , ("<--- AsicResetFromDMABusy !!!!!!!!!!!!!!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("<--- AsicResetFromDMABusy ! \n" )); }VOID AsicResetBBP ( IN PRTMP_ADAPTER pAd) { -DBGPRINT (RT_DEBUG_TRACE , ("---> Asic HardReset BBP !!!!!!!!!!!!!!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("---> Asic HardReset BBP ! \n" ));RTMP_IO_WRITE32 (pAd,MAC_SYS_CTRL ,0x0 );RTMP_IO_WRITE32 (pAd,MAC_SYS_CTRL ,0x2 );
@@ -8623,7 +8623,7 @@// After hard-reset BBP, initialize all BBP values. NICRestoreBBPValue (pAd); -DBGPRINT (RT_DEBUG_TRACE , ("<--- Asic HardReset BBP !!!!!!!!!!!!!!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("<--- Asic HardReset BBP ! \n" )); } VOID AsicResetMAC(
@@ -8631,14 +8631,14 @@ {ULONG Data; -DBGPRINT (RT_DEBUG_TRACE , ("---> AsicResetMAC !!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("---> AsicResetMAC ! \n" ));RTMP_IO_READ32 (pAd,PBF_SYS_CTRL , &Data); Data |=0x4 ;RTMP_IO_WRITE32 (pAd,PBF_SYS_CTRL , Data); Data &=0xfffffffb ;RTMP_IO_WRITE32 (pAd,PBF_SYS_CTRL , Data); -DBGPRINT (RT_DEBUG_TRACE , ("<--- AsicResetMAC !!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("<--- AsicResetMAC ! \n" )); } VOID AsicResetPBF(
@@ -8654,14 +8654,14 @@// sum should be equals to 0xff, which is the total buffer size. if ((Value1 + Value2) <0xff ) { -DBGPRINT (RT_DEBUG_TRACE , ("---> Asic HardReset PBF !!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("---> Asic HardReset PBF ! \n" ));RTMP_IO_READ32 (pAd,PBF_SYS_CTRL , &Data); Data |=0x8 ;RTMP_IO_WRITE32 (pAd,PBF_SYS_CTRL , Data); Data &=0xfffffff7 ;RTMP_IO_WRITE32 (pAd,PBF_SYS_CTRL , Data); -DBGPRINT (RT_DEBUG_TRACE , ("<--- Asic HardReset PBF !!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("<--- Asic HardReset PBF ! \n" )); } }#endif /* RT2860 */
drivers/staging/rt2860/common/rtmp_init.c +9 -9
@@ -120,7 +120,7 @@ {BCN_OFFSET0, 0xece8e4e0}, /* 0x3800, 0x3A00, 0x3C00, 0x3E00, 512B for each beacon */ {BCN_OFFSET1, 0xfcf8f4f0}, /* 0x3800, 0x3A00, 0x3C00, 0x3E00, 512B for each beacon */ #else - #error You must re-calculate new value for BCN_OFFSET0 & BCN_OFFSET1 in MACRegTable[]!!! + #error You must re-calculate new value for BCN_OFFSET0 & BCN_OFFSET1 in MACRegTable[]! #endif // HW_BEACON_OFFSET // {LEGACY_BASIC_RATE, 0x0000013f}, // Basic rate set bitmap
@@ -2430,7 +2430,7 @@UCHAR Value =0 ;ULONG Data; -DBGPRINT (RT_DEBUG_TRACE , ("---> NICRestoreBBPValue !!!!!!!!!!!!!!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("---> NICRestoreBBPValue ! \n" ));// Initialize BBP register to default value (rtmp_init.c) for (index =0 ; index <NUM_BBP_REG_PARMS ; index++) {
@@ -2475,10 +2475,10 @@RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R69 ,0x1A );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R70 ,0x0A );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R73 ,0x16 ); -DBGPRINT (RT_DEBUG_TRACE , ("!!!rt2860C !!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("rt2860C ! \n" )); } -DBGPRINT (RT_DEBUG_TRACE , ("!!!40MHz Lower LINK UP !!! Control Channel at Below. Central = %d \n" , pAd->CommonCfg.CentralChannel )); +DBGPRINT (RT_DEBUG_TRACE , ("40MHz Lower LINK UP ! Control Channel at Below. Central = %d \n" , pAd->CommonCfg.CentralChannel )); }else if ((pAd->CommonCfg.CentralChannel < pAd->CommonCfg.Channel) && (pAd->MlmeAux.HtCapability.HtCapInfo.ChannelWidth ==BW_40 )) {
@@ -2507,10 +2507,10 @@RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R69 ,0x1A );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R70 ,0x0A );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R73 ,0x16 ); -DBGPRINT (RT_DEBUG_TRACE , ("!!!rt2860C !!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("rt2860C ! \n" )); } -DBGPRINT (RT_DEBUG_TRACE , ("!!!40MHz Upper LINK UP !!! Control Channel at UpperCentral = %d \n" , pAd->CommonCfg.CentralChannel )); +DBGPRINT (RT_DEBUG_TRACE , ("40MHz Upper LINK UP ! Control Channel at UpperCentral = %d \n" , pAd->CommonCfg.CentralChannel )); }else {
@@ -2537,14 +2537,14 @@RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R69 ,0x16 );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R70 ,0x08 );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R73 ,0x11 ); - DBGPRINT(RT_DEBUG_TRACE, ("!!!rt2860C !!! \n" )); + DBGPRINT(RT_DEBUG_TRACE, ("rt2860C ! \n" )); } -DBGPRINT (RT_DEBUG_TRACE , ("!!!20MHz LINK UP !!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("20MHz LINK UP ! \n" )); } } -DBGPRINT (RT_DEBUG_TRACE , ("<--- NICRestoreBBPValue !!!!!!!!!!!!!!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("<--- NICRestoreBBPValue ! \n" )); }#endif /* RT2860 */
drivers/staging/rt2860/common/rtmp_wep.c +1 -1
@@ -247,7 +247,7 @@if (crc32 !=cpu2le32 (trailfcs)) { -DBGPRINT (RT_DEBUG_TRACE , ("! WEP Data CRC Error !\n" ));//CRC error. +DBGPRINT (RT_DEBUG_TRACE , ("WEP Data CRC Error !\n" ));//CRC error. return (FALSE); }return (TRUE);
drivers/staging/rt2860/oid.h +2 -2
@@ -557,7 +557,7 @@#define OID_MH_802_1X_SUPPORTED 0xFFEDC100#endif -// MIMO Tx parameter, ShortGI, MCS, STBC, etc. these are fields in TXWI. Don't change this definition!!! +// MIMO Tx parameter, ShortGI, MCS, STBC, etc. these are fields in TXWI. Don't change this definition! typedef union _HTTRANSMIT_SETTING { struct { USHORT MCS:7; // MCS
@@ -614,7 +614,7 @@RT_802_11_EVENT_LOG Log[MAX_NUMBER_OF_EVENT ]; } RT_802_11_EVENT_TABLE, PRT_802_11_EVENT_TABLE; -// MIMO Tx parameter, ShortGI, MCS, STBC, etc. these are fields in TXWI. Don't change this definition!!! +// MIMO Tx parameter, ShortGI, MCS, STBC, etc. these are fields in TXWI. Don't change this definition! typedef union _MACHTTRANSMIT_SETTING { struct { USHORT MCS:7; // MCS
drivers/staging/rt2860/rt28xx.h +1 -1
@@ -1588,7 +1588,7 @@ USHORT DynamicTxAgcControl:1; // USHORT ExternalLNAForG:1; // USHORT ExternalLNAForA:1; // external LNA enable for 2.4G - USHORT CardbusAcceleration:1; // !!! NOTE: 0 - enable, 1 - disable + USHORT CardbusAcceleration:1; // ! NOTE: 0 - enable, 1 - disable USHORT BW40MSidebandForG:1; USHORT BW40MSidebandForA:1; USHORT EnableWPSPBC:1; // WPS PBC Control bit
drivers/staging/rt2860/rt_linux.c +1 -1
@@ -73,7 +73,7 @@"connects with our wireless client" ,/* IW_STA_LINKUP_EVENT_FLAG */ "disconnects with our wireless client" ,/* IW_STA_LINKDOWN_EVENT_FLAG */ "scan completed" /* IW_SCAN_COMPLETED_EVENT_FLAG */ - "scan terminate!! Busy!! Enqueue fail!!" /* IW_SCAN_ENQUEUE_FAIL_EVENT_FLAG */ + "scan terminate! Busy! Enqueue fail!" /* IW_SCAN_ENQUEUE_FAIL_EVENT_FLAG */ };// for wireless IDS_spoof_attack event message
drivers/staging/rt2860/rt_linux.h +1 -1
@@ -347,7 +347,7 @@#define DBGPRINT_ERR (Fmt) \ { \ - printk("ERROR!!! "); \ + printk("ERROR! "); \ printk Fmt; \ }
drivers/staging/rt2860/rt_main_dev.c +1 -1
@@ -572,7 +572,7 @@// shall not set ml_priv to NULL here because the ml_priv didn't been free yet. //net_dev->ml_priv = 0; -printk ("!!! %s Initialized fail !!!\n" , RT28xx_CHIP_NAME); +printk ("%s Initialized fail !\n" , RT28xx_CHIP_NAME);return FALSE; }/* End of rt28xx_init */
drivers/staging/rt2860/rtmp_def.h +1 -1
@@ -418,7 +418,7 @@#define MAX_LEN_OF_MAC_TABLE MAX_NUMBER_OF_MAC // if MAX_MBSSID_NUM is 8, this value can't be larger than 211#if MAX_LEN_OF_MAC_TABLE >MAX_AVAILABLE_CLIENT_WCID -#error MAX_LEN_OF_MAC_TABLE can not be larger than MAX_AVAILABLE_CLIENT_WCID!!!! +#error MAX_LEN_OF_MAC_TABLE can not be larger than MAX_AVAILABLE_CLIENT_WCID!#endif #define MAX_NUM_OF_WDS_LINK_PERBSSID 3
drivers/staging/rt2860/sta/assoc.c +2 -2
@@ -569,7 +569,7 @@ }else { -DBGPRINT (RT_DEBUG_TRACE ,("ASSOC - MlmeAssocReqAction() sanity check failed. BUG!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE ,("ASSOC - MlmeAssocReqAction() sanity check failed. BUG! \n" )); pAd->Mlme.AssocMachine.CurrState =ASSOC_IDLE ; Status =MLME_INVALID_FORMAT ;MlmeEnqueue (pAd,MLME_CNTL_STATE_MACHINE ,MT2_ASSOC_CONF ,2 , &Status);
@@ -771,7 +771,7 @@ }else { -DBGPRINT (RT_DEBUG_TRACE ,("ASSOC - MlmeReassocReqAction() sanity check failed. BUG!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE ,("ASSOC - MlmeReassocReqAction() sanity check failed. BUG! \n" )); pAd->Mlme.AssocMachine.CurrState =ASSOC_IDLE ; Status =MLME_INVALID_FORMAT ;MlmeEnqueue (pAd,MLME_CNTL_STATE_MACHINE ,MT2_REASSOC_CONF ,2 , &Status);
drivers/staging/rt2860/sta/connect.c +20 -20
@@ -221,7 +221,7 @@break ;#endif // RT2870 // default : -DBGPRINT_ERR (("!ERROR! CNTL - Illegal message type(=%ld)" , Elem->MsgType)); +DBGPRINT_ERR (("ERROR! CNTL - Illegal message type(=%ld)" , Elem->MsgType));break ; } }
@@ -861,7 +861,7 @@ }else { -DBGPRINT (RT_DEBUG_TRACE , ("CNTL - Start IBSS fail. BUG!!!!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("CNTL - Start IBSS fail. BUG!\n" )); pAd->Mlme.CntlMachine.CurrState =CNTL_IDLE ; } }
@@ -1128,7 +1128,7 @@// // ASSOC - DisassocTimeoutAction // CNTL - Dis-associate successful -// !!! LINK DOWN !!! +// ! LINK DOWN ! // [88888] OID_802_11_SSID should have returned NDTEST_WEP_AP2(Returned: ) // // To prevent DisassocTimeoutAction to call Link down after we link up,
@@ -1187,14 +1187,14 @@AdhocTurnOnQos (pAd);#endif -DBGPRINT (RT_DEBUG_TRACE , ("!!!Adhoc LINK UP !!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("Adhoc LINK UP ! \n" )); }else {OPSTATUS_SET_FLAG (pAd, fOP_STATUS_INFRA_ON);OPSTATUS_CLEAR_FLAG (pAd, fOP_STATUS_ADHOC_ON); -DBGPRINT (RT_DEBUG_TRACE , ("!!!Infra LINK UP !!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("Infra LINK UP ! \n" )); }// 3*3
@@ -1234,10 +1234,10 @@RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R69 ,0x1A );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R70 ,0x0A );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R73 ,0x16 ); -DBGPRINT (RT_DEBUG_TRACE , ("!!!rt2860C !!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("rt2860C ! \n" )); } -DBGPRINT (RT_DEBUG_TRACE , ("!!!40MHz Lower LINK UP !!! Control Channel at Below. Central = %d \n" , pAd->CommonCfg.CentralChannel )); +DBGPRINT (RT_DEBUG_TRACE , ("40MHz Lower LINK UP ! Control Channel at Below. Central = %d \n" , pAd->CommonCfg.CentralChannel )); }else if ((pAd->CommonCfg.CentralChannel < pAd->CommonCfg.Channel) && (pAd->MlmeAux.HtCapability.HtCapInfo.ChannelWidth ==BW_40 )) {
@@ -1267,10 +1267,10 @@RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R69 ,0x1A );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R70 ,0x0A );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R73 ,0x16 ); -DBGPRINT (RT_DEBUG_TRACE , ("!!!rt2860C !!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("rt2860C ! \n" )); } -DBGPRINT (RT_DEBUG_TRACE , ("!!! 40MHz Upper LINK UP !!! Control Channel at UpperCentral = %d \n" , pAd->CommonCfg.CentralChannel )); +DBGPRINT (RT_DEBUG_TRACE , ("40MHz Upper LINK UP ! Control Channel at UpperCentral = %d \n" , pAd->CommonCfg.CentralChannel )); }else {
@@ -1299,10 +1299,10 @@RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R69 ,0x16 );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R70 ,0x08 );RTMP_BBP_IO_WRITE8_BY_REG_ID (pAd,BBP_R73 ,0x11 ); -DBGPRINT (RT_DEBUG_TRACE , ("!!!rt2860C !!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("rt2860C ! \n" )); } -DBGPRINT (RT_DEBUG_TRACE , ("!!! 20MHz LINK UP !!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("20MHz LINK UP ! \n" )); }RTMPSetAGCInitValue (pAd, pAd->CommonCfg.BBPCurrentBW);
@@ -1311,10 +1311,10 @@// RTMP_BBP_IO_READ8_BY_REG_ID (pAd,BBP_R66 , &pAd->BbpTuning.R66CurrentValue); -DBGPRINT (RT_DEBUG_TRACE , ("!!! LINK UP !!! (BssType=%d, AID=%d, ssid=%s, Channel=%d, CentralChannel = %d)\n" , +DBGPRINT (RT_DEBUG_TRACE , ("LINK UP ! (BssType=%d, AID=%d, ssid=%s, Channel=%d, CentralChannel = %d)\n" , BssType, pAd->StaActive.Aid, pAd->CommonCfg.Ssid, pAd->CommonCfg.Channel, pAd->CommonCfg.CentralChannel)); -DBGPRINT (RT_DEBUG_TRACE , ("!!! LINK UP !!! (Density =%d, )\n" , pAd->MacTab.Content[BSSID_WCID ].MpduDensity)); +DBGPRINT (RT_DEBUG_TRACE , ("LINK UP ! (Density =%d, )\n" , pAd->MacTab.Content[BSSID_WCID ].MpduDensity));AsicSetBssid (pAd, pAd->CommonCfg.Bssid);
@@ -1587,12 +1587,12 @@ pAd->MacTab.Content[BSSID_WCID ].WepStatus = pAd->StaCfg.WepStatus;NdisReleaseSpinLock (&pAd->MacTabLock); -DBGPRINT (RT_DEBUG_TRACE , ("!!! LINK UP !!! ClientStatusFlags=%lx)\n" , +DBGPRINT (RT_DEBUG_TRACE , ("LINK UP ! ClientStatusFlags=%lx)\n" , pAd->MacTab.Content[BSSID_WCID ].ClientStatusFlags));MlmeUpdateTxRates (pAd, TRUE,BSS0 );MlmeUpdateHtTxRates (pAd,BSS0 ); -DBGPRINT (RT_DEBUG_TRACE , ("!!! LINK UP !! (StaActive.bHtEnable =%d, )\n" , pAd->StaActive.SupportedPhyInfo.bHtEnable)); +DBGPRINT (RT_DEBUG_TRACE , ("LINK UP ! (StaActive.bHtEnable =%d, )\n" , pAd->StaActive.SupportedPhyInfo.bHtEnable));if (pAd->CommonCfg.bAggregationCapable) {
@@ -1763,7 +1763,7 @@ pAd->CommonCfg.IOTestParm.bLastAtheros = FALSE;COPY_MAC_ADDR (pAd->CommonCfg.LastBssid, pAd->CommonCfg.Bssid); -DBGPRINT (RT_DEBUG_TRACE , ("!!!pAd->bNextDisableRxBA= %d \n" , pAd->CommonCfg.IOTestParm.bNextDisableRxBA)); +DBGPRINT (RT_DEBUG_TRACE , ("pAd->bNextDisableRxBA= %d \n" , pAd->CommonCfg.IOTestParm.bNextDisableRxBA));// BSSID add in one MAC entry too. Because in Tx, ASIC need to check Cipher and IV/EIV, BAbitmap // Pther information in MACTab.Content[BSSID_WCID] is not necessary for driver. // Note: As STA, The MACTab.Content[BSSID_WCID]. PairwiseKey and Shared Key for BSS0 are the same.
@@ -1848,7 +1848,7 @@RTMPSendWirelessEvent (pAd,IW_STA_LINKDOWN_EVENT_FLAG , pAd->MacTab.Content[BSSID_WCID ].Addr,BSS0 ,0 ); } -DBGPRINT (RT_DEBUG_TRACE , ("!!! LINK DOWN !!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("LINK DOWN !\n" ));OPSTATUS_CLEAR_FLAG (pAd, fOP_STATUS_AGGREGATION_INUSED);#ifdef RT2860
@@ -1871,7 +1871,7 @@#endif if (ADHOC_ON (pAd))// Adhoc mode link down { -DBGPRINT (RT_DEBUG_TRACE , ("!!! LINK DOWN 1!!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("LINK DOWN 1!\n" ));OPSTATUS_CLEAR_FLAG (pAd, fOP_STATUS_ADHOC_ON);OPSTATUS_CLEAR_FLAG (pAd, fOP_STATUS_MEDIA_STATE_CONNECTED);
@@ -1879,11 +1879,11 @@RTMP_IndicateMediaState (pAd); pAd->ExtraInfo =GENERAL_LINK_DOWN ;BssTableDeleteEntry (&pAd->ScanTab, pAd->CommonCfg.Bssid, pAd->CommonCfg.Channel); -DBGPRINT (RT_DEBUG_TRACE , ("!!! MacTab.Size=%d !!!\n" , pAd->MacTab.Size)); +DBGPRINT (RT_DEBUG_TRACE , ("MacTab.Size=%d !\n" , pAd->MacTab.Size)); }else // Infra structure mode { -DBGPRINT (RT_DEBUG_TRACE , ("!!! LINK DOWN 2!!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("LINK DOWN 2!\n" ));OPSTATUS_CLEAR_FLAG (pAd, fOP_STATUS_INFRA_ON);OPSTATUS_CLEAR_FLAG (pAd, fOP_STATUS_MEDIA_STATE_CONNECTED);
drivers/staging/rt2860/sta/rtmp_data.c +6 -6
@@ -137,7 +137,7 @@ pTmpBuf = pRxBlk->pData -LENGTH_802_11 ;NdisMoveMemory (pTmpBuf, pRxBlk->pHeader,LENGTH_802_11 );REPORT_MGMT_FRAME_TO_MLME (pAd, pRxWI->WirelessCliID, pTmpBuf, pRxBlk->DataSize +LENGTH_802_11 , pRxWI->RSSI0, pRxWI->RSSI1, pRxWI->RSSI2, pRxD->PlcpSignal); -DBGPRINT_RAW (RT_DEBUG_TRACE , ("!!! report EAPOL/AIRONET DATA to MLME (len=%d) !!!\n" , pRxBlk->DataSize)); +DBGPRINT_RAW (RT_DEBUG_TRACE , ("report EAPOL/AIRONET DATA to MLME (len=%d) !\n" , pRxBlk->DataSize)); } }
@@ -926,7 +926,7 @@if (pSrcBufVA ==NULL ) { -DBGPRINT (RT_DEBUG_ERROR ,("STASendPacket --> pSrcBufVA == NULL !!!SrcBufLen=%x\n" ,SrcBufLen)); +DBGPRINT (RT_DEBUG_ERROR ,("STASendPacket --> pSrcBufVA == NULL !SrcBufLen=%x\n" ,SrcBufLen));// Resourece is low, system did not allocate virtual address // return NDIS_STATUS_FAILURE directly to upper layer RELEASE_NDIS_PACKET (pAd, pPacket,NDIS_STATUS_FAILURE );
@@ -936,7 +936,7 @@if (SrcBufLen <14 ) { -DBGPRINT (RT_DEBUG_ERROR ,("STASendPacket --> Ndis Packet buffer error !!!\n" )); +DBGPRINT (RT_DEBUG_ERROR ,("STASendPacket --> Ndis Packet buffer error !\n" ));RELEASE_NDIS_PACKET (pAd, pPacket,NDIS_STATUS_FAILURE );return (NDIS_STATUS_FAILURE ); }
@@ -1002,7 +1002,7 @@ && (RTMP_GET_PACKET_EAPOL(pPacket)== FALSE) ) { -DBGPRINT (RT_DEBUG_TRACE ,("STASendPacket --> Drop packet before port secured !!!\n" )); +DBGPRINT (RT_DEBUG_TRACE ,("STASendPacket --> Drop packet before port secured !\n" ));RELEASE_NDIS_PACKET (pAd, pPacket,NDIS_STATUS_FAILURE );return (NDIS_STATUS_FAILURE );
@@ -1677,7 +1677,7 @@ pMacEntry = pTxBlk->pMacEntry;if (pMacEntry->isCached) { -// NOTE: Please make sure the size of pMacEntry->CachedBuf[] is smaller than pTxBlk->HeaderBuf[]!!!! +// NOTE: Please make sure the size of pMacEntry->CachedBuf[] is smaller than pTxBlk->HeaderBuf[]! NdisMoveMemory ((PUCHAR )&pTxBlk->HeaderBuf[TXINFO_SIZE ], (PUCHAR )&pMacEntry->CachedBuf[0 ],TXWI_SIZE +sizeof (HEADER_802_11 )); pHeaderBufPtr = (PUCHAR )(&pTxBlk->HeaderBuf[TXINFO_SIZE +TXWI_SIZE ]);STABuildCache802_11Header (pAd, pTxBlk, pHeaderBufPtr);
@@ -2470,7 +2470,7 @@default : {// It should not happened! -DBGPRINT (RT_DEBUG_ERROR , ("Send a pacekt was not classified!! It should not happen!\n" )); +DBGPRINT (RT_DEBUG_ERROR , ("Send a pacekt was not classified! It should not happen!\n" ));while (pTxBlk->TxPacketList.Number) { pQEntry =RemoveHeadQueue (&pTxBlk->TxPacketList);
drivers/staging/rt2860/sta/sanity.c +1 -1
@@ -169,7 +169,7 @@case IE_HT_CAP :case IE_HT_CAP2 : -if (pEid->Len >=SIZE_HT_CAP_IE )//Note: allow extension.!! +if (pEid->Len >=SIZE_HT_CAP_IE )//Note: allow extension.! {NdisMoveMemory (pHtCapability, pEid->Octet,SIZE_HT_CAP_IE );
drivers/staging/rt2860/sta/wpa.c +8 -8
@@ -800,13 +800,13 @@//if (!RTMPEqualMemory(pMsg3->KeyDesc.KeyData, pAd->MacTab.Content[BSSID_WCID].RSN_IE, pAd->MacTab.Content[BSSID_WCID].RSNIE_Len)) if (!CheckRSNIE (pAd, pMsg3->KeyDesc.KeyData, pMsg3->KeyDesc.KeyDataLen[1 ], &skip_offset)) { -DBGPRINT (RT_DEBUG_ERROR , ("RSN_IE Different in Msg 3 of WPA1 4-way handshake!! \n" )); +DBGPRINT (RT_DEBUG_ERROR , ("RSN_IE Different in Msg 3 of WPA1 4-way handshake! \n" ));hex_dump ("The original RSN_IE" , pAd->MacTab.Content[BSSID_WCID ].RSN_IE, pAd->MacTab.Content[BSSID_WCID ].RSNIE_Len);hex_dump ("The received RSN_IE" , pMsg3->KeyDesc.KeyData, pMsg3->KeyDesc.KeyDataLen[1 ]);return ; }else -DBGPRINT (RT_DEBUG_TRACE , ("RSN_IE VALID in Msg 3 of WPA1 4-way handshake!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , ("RSN_IE VALID in Msg 3 of WPA1 4-way handshake! \n" ));// 2. Check MIC value
@@ -828,11 +828,11 @@if (!NdisEqualMemory (OldMic, Mic,LEN_KEY_DESC_MIC )) { -DBGPRINT (RT_DEBUG_ERROR , (" MIC Different in msg 3 of 4-way handshake!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_ERROR , (" MIC Different in msg 3 of 4-way handshake! \n" ));return ; }else -DBGPRINT (RT_DEBUG_TRACE , (" MIC VALID in msg 3 of 4-way handshake!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , (" MIC VALID in msg 3 of 4-way handshake! \n" ));// 3. Check Replay Counter, it has to be larger than last one. No need to be exact one larger if (RTMPCompareMemory (pMsg3->KeyDesc.ReplayCounter, pAd->StaCfg.ReplayCounter,LEN_KEY_DESC_REPLAY ) !=1 )
@@ -1032,12 +1032,12 @@if (!NdisEqualMemory (OldMic, Mic,LEN_KEY_DESC_MIC )) { -DBGPRINT (RT_DEBUG_ERROR , (" MIC Different in msg 3 of 4-way handshake!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_ERROR , (" MIC Different in msg 3 of 4-way handshake! \n" ));os_free_mem (pAd, (PUCHAR )mpool);return ; }else -DBGPRINT (RT_DEBUG_TRACE , (" MIC VALID in msg 3 of 4-way handshake!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , (" MIC VALID in msg 3 of 4-way handshake! \n" ));// 3. Check Replay Counter, it has to be larger than last one. No need to be exact one larger if (RTMPCompareMemory (pMsg3->KeyDesc.ReplayCounter, pAd->StaCfg.ReplayCounter,LEN_KEY_DESC_REPLAY ) !=1 )
@@ -1324,12 +1324,12 @@if (!NdisEqualMemory (OldMic, Mic,LEN_KEY_DESC_MIC )) { -DBGPRINT (RT_DEBUG_ERROR , (" MIC Different in group msg 1 of 2-way handshake!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_ERROR , (" MIC Different in group msg 1 of 2-way handshake! \n" ));MlmeFreeMemory (pAd, (PUCHAR )mpool);return ; }else -DBGPRINT (RT_DEBUG_TRACE , (" MIC VALID in group msg 1 of 2-way handshake!!!!!!!!!! \n" )); +DBGPRINT (RT_DEBUG_TRACE , (" MIC VALID in group msg 1 of 2-way handshake! \n" ));// 3. Decrypt GTK from Key Data
drivers/staging/rt2860/sta_ioctl.c +8 -8
@@ -709,7 +709,7 @@if (pAdapter->Mlme.CntlMachine.CurrState !=CNTL_IDLE ) {RT28XX_MLME_RESET_STATE_MACHINE (pAdapter); -DBGPRINT (RT_DEBUG_TRACE , ("!!! MLME busy, reset MLME state machine !!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("MLME busy, reset MLME state machine !\n" )); }// tell CNTL state machine to call NdisMSetInformationComplete() after completing
@@ -851,7 +851,7 @@if (MONITOR_ON (pAdapter)) { -DBGPRINT (RT_DEBUG_TRACE , ("!!! Driver is in Monitor Mode now !!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("Driver is in Monitor Mode now !\n" ));return -EINVAL ; }#ifdef RT2860
@@ -879,7 +879,7 @@if ((pAdapter->StaCfg.WpaSupplicantUP ==WPA_SUPPLICANT_ENABLE ) && (pAdapter->StaCfg.WpaSupplicantScanCount >3 )) { -DBGPRINT (RT_DEBUG_TRACE , ("!!! WpaSupplicantScanCount > 3\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("WpaSupplicantScanCount > 3\n" )); Status =NDIS_STATUS_SUCCESS ;break ; }
@@ -889,7 +889,7 @@ (pAdapter->StaCfg.AuthMode == Ndis802_11AuthModeWPAPSK)) && (pAdapter->StaCfg.PortSecured == WPA_802_1X_PORT_NOT_SECURED)) { -DBGPRINT (RT_DEBUG_TRACE , ("!!! Link UP, Port Not Secured! ignore this set::OID_802_11_BSSID_LIST_SCAN\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("Link UP, Port Not Secured! ignore this set::OID_802_11_BSSID_LIST_SCAN\n" )); Status =NDIS_STATUS_SUCCESS ;break ; }
@@ -897,7 +897,7 @@if (pAdapter->Mlme.CntlMachine.CurrState !=CNTL_IDLE ) {RT28XX_MLME_RESET_STATE_MACHINE (pAdapter); -DBGPRINT (RT_DEBUG_TRACE , ("!!! MLME busy, reset MLME state machine !!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("MLME busy, reset MLME state machine !\n" )); }// tell CNTL state machine to call NdisMSetInformationComplete() after completing
@@ -2464,7 +2464,7 @@DBGPRINT (RT_DEBUG_TRACE ,("rt_ioctl_siwpmksa - IW_PMKSA_ADD\n" ));break ;default : -DBGPRINT (RT_DEBUG_TRACE ,("rt_ioctl_siwpmksa - Unknow Command!!\n" )); +DBGPRINT (RT_DEBUG_TRACE ,("rt_ioctl_siwpmksa - Unknow Command!\n" ));break ; }
@@ -2907,7 +2907,7 @@if (pAdapter->Mlme.CntlMachine.CurrState !=CNTL_IDLE ) {RT28XX_MLME_RESET_STATE_MACHINE (pAdapter); -DBGPRINT (RT_DEBUG_TRACE , ("!!! MLME busy, reset MLME state machine !!!\n" )); +DBGPRINT (RT_DEBUG_TRACE , ("MLME busy, reset MLME state machine !\n" )); } pAdapter->MlmeAux.CurrReqIsFromNdis = TRUE;
@@ -3620,7 +3620,7 @@if ((strlen (arg) <8 ) || (strlen (arg) >64 )) { -DBGPRINT (RT_DEBUG_TRACE , ("Set failed!!(WPAPSK=%s), WPAPSK key-string required 8 ~ 64 characters \n" , arg)); +DBGPRINT (RT_DEBUG_TRACE , ("Set failed!(WPAPSK=%s), WPAPSK key-string required 8 ~ 64 characters \n" , arg));return FALSE; }