[network/wlan/WDI] Fix Mismatched Type Comparisons (#715)

* fix wider type comparisons
* fix resulting mismatched types

22 files changed, 106 insertions, 94 deletions

diff --git a/network/wlan/WDI/COMMON/ApEngine.c b/network/wlan/WDI/COMMON/ApEngine.c
index 1fe215eb..b4151482 100644
--- a/network/wlan/WDI/COMMON/ApEngine.c
+++ b/network/wlan/WDI/COMMON/ApEngine.c
@@ -3667,7 +3667,7 @@ AP_CheckRSNIE(
 	}
 
 	if(RSNIE.Length != 0){
-		u1Byte	count;
+		u2Byte	count;
 		
 		//2004/09/15, kcwu, parse WPA2 packet
 		if(pEntry->perSTAKeyInfo.SecLvl == RT_SEC_LVL_WPA)
diff --git a/network/wlan/WDI/COMMON/DFS.c b/network/wlan/WDI/COMMON/DFS.c
index 98a3e8ec..eb1b8279 100644
--- a/network/wlan/WDI/COMMON/DFS.c
+++ b/network/wlan/WDI/COMMON/DFS.c
@@ -918,7 +918,8 @@ DFS_StaConstructAssociateReq(
 	PRT_CHANNEL_LIST		pChannelList;
 	OCTET_STRING			SupportChannelIE;
 	u1Byte					SupportChannelConnent[48];
-	u1Byte					i=0,j=0;
+	u2Byte					i=0;
+	u2Byte					j=0;
 
 	if (Adapter->DFSSupport == FALSE)
 		return;
@@ -943,7 +944,7 @@ DFS_StaConstructAssociateReq(
 		for(i = 0; i < pChannelList->ChannelLen; i ++)
 			RT_TRACE(COMP_SCAN, DBG_LOUD, (" %d ", pChannelList->ChnlListEntry[i].ChannelNum));
 		RT_TRACE(COMP_SCAN, DBG_LOUD, ("\n"));
-		for(i=0;i < pChannelList->ChannelLen*2;i++)
+		for(i=0;i < (u2Byte)(pChannelList->ChannelLen*2);i++)
 		{
 			if(i%2 == 0)
 				SupportChannelConnent[i] = pChannelList->ChnlListEntry[i/2].ChannelNum;
diff --git a/network/wlan/WDI/COMMON/Dot11d.c b/network/wlan/WDI/COMMON/Dot11d.c
index 9a415fc6..be55b3f4 100644
--- a/network/wlan/WDI/COMMON/Dot11d.c
+++ b/network/wlan/WDI/COMMON/Dot11d.c
@@ -1133,11 +1133,13 @@ _ForcedChannelPlan(
 	pu1Byte				pChannelLen
 	)
 {
-	ps1Byte s =  (ps1Byte)((bIs5G) ? 
pMgntInfo->RegChannelPlan5G.Octet : 
+	ps1Byte s =  (ps1Byte)((bIs5G) ? 
+pMgntInfo->RegChannelPlan5G.Octet : 
 		                             pMgntInfo->RegChannelPlan2G.Octet);
-	u2Byte  len = ((bIs5G) ? 
pMgntInfo->RegChannelPlan5G.Length : 
+	u2Byte  len = ((bIs5G) ? 
+pMgntInfo->RegChannelPlan5G.Length : 
 		                     pMgntInfo->RegChannelPlan2G.Length); 
-	u1Byte  c = 0, n = 0, i = 0;
+	u2Byte  c = 0, n = 0, i = 0;
 
 	RT_TRACE( COMP_INIT, DBG_LOUD, ("===> _ForcedChannelPlan\n"));
 	
@@ -1156,11 +1158,11 @@ _ForcedChannelPlan(
 			c = 10 * c + (*s - '0');
 			s++, i++;
 		}
-		pChnlList[n++] = c;
+		pChnlList[n++] = (u1Byte)c;
 		c = 0;
 	}
 
-	*pChannelLen = n;
+	*pChannelLen = (u1Byte)n;
 	
 	RT_TRACE( COMP_INIT, DBG_LOUD, ("<=== _ForcedChannelPlan\n"));	
 }
diff --git a/network/wlan/WDI/COMMON/MgntActQueryParam.c b/network/wlan/WDI/COMMON/MgntActQueryParam.c
index 1a2279f1..efbc4dd5 100644
--- a/network/wlan/WDI/COMMON/MgntActQueryParam.c
+++ b/network/wlan/WDI/COMMON/MgntActQueryParam.c
@@ -13,9 +13,9 @@ u1Byte SS_Rate_Map_B[2][2]= {{7, MGN_11M}, {0, MGN_5_5M}};
 //
 
 u1Byte SS_Rate_Map_AC_1SS_MCS9[10][2]= {{46, MGN_VHT1SS_MCS9},{43, MGN_VHT1SS_MCS8},{39, MGN_VHT1SS_MCS7}, {35, MGN_VHT1SS_MCS5}, {29, MGN_VHT1SS_MCS4}, {25, MGN_VHT1SS_MCS3}, {20, MGN_VHT1SS_MCS2}, {15, MGN_VHT1SS_MCS1}, {10, MGN_VHT1SS_MCS0},{0, MGN_6M}};
-//(10�H�U�����6M in 5G)
+//(10以下請顯示6M in 5G)
 u1Byte SS_Rate_Map_AC_1SS_MCS7[8][2]= {{41, MGN_VHT1SS_MCS7}, {35, MGN_VHT1SS_MCS5}, {29, MGN_VHT1SS_MCS4}, {25, MGN_VHT1SS_MCS3}, {20, MGN_VHT1SS_MCS2}, {15, MGN_VHT1SS_MCS1}, {10, MGN_VHT1SS_MCS0},{0, MGN_6M}};
-//(10�H�U�����6M in 5G)
+//(10以下請顯示6M in 5G)
 
 u1Byte SS_Rate_Map_N_MCS7[7][2]= {{40, MGN_MCS7}, {30, MGN_MCS5}, {25, MGN_MCS4}, {23, MGN_MCS3}, {19, MGN_MCS2}, {8, MGN_MCS1}, {0, MGN_MCS0}};
 u1Byte SS_Rate_Map_N_MCS7_Lv1[7][2]= {{40, MGN_MCS7}, {30, MGN_MCS5}, {25, MGN_MCS4}, {19, MGN_MCS3}, {8, MGN_MCS2}, {5, MGN_MCS1}, {2, MGN_MCS0}};
@@ -35,7 +35,7 @@ u1Byte SS_Rate_Map_AC_2SS_MCS9_Lv4[7][2]= {{50, MGN_VHT2SS_MCS9}, {47, MGN_VHT2S
 u1Byte SS_Rate_Map_AC_2SS_MCS9_Lv5[5][2]= {{50, MGN_VHT2SS_MCS9}, {47, MGN_VHT2SS_MCS8}, {30, MGN_VHT2SS_MCS7}, {15, MGN_VHT2SS_MCS4}, {0, MGN_VHT1SS_MCS2}}; 
 u1Byte SS_Rate_Map_AC_2SS_MCS9_Lv6[5][2]= {{45, MGN_VHT2SS_MCS9}, {40, MGN_VHT2SS_MCS8}, {30, MGN_VHT2SS_MCS7}, {10, MGN_VHT2SS_MCS6}, {0, MGN_VHT2SS_MCS4}}; 
 
-//(10�H�U�����6M in 5G)
+//(10以下請顯示6M in 5G)
 u1Byte SS_Rate_Map_AC_2SS_MCS7[12][2]= {{44, MGN_VHT2SS_MCS7}, {40, MGN_VHT2SS_MCS6}, {36, MGN_VHT2SS_MCS5}, {32, MGN_VHT2SS_MCS4}, {28, MGN_VHT1SS_MCS5}, {24, MGN_VHT1SS_MCS4},  {21, MGN_VHT1SS_MCS3}, {18, MGN_VHT1SS_MCS2}, {14, MGN_VHT1SS_MCS1}, {10, MGN_VHT1SS_MCS0}, {0, MGN_6M}}; 
 // Lvl1 replace as original value.
 u1Byte SS_Rate_Map_AC_2SS_MCS7_Lv1[12][2]= {{44, MGN_VHT2SS_MCS7}, {40, MGN_VHT2SS_MCS6}, {36, MGN_VHT2SS_MCS4}, {32, MGN_VHT1SS_MCS6}, {28, MGN_VHT1SS_MCS4}, {24, MGN_VHT1SS_MCS3},  {21, MGN_VHT1SS_MCS2}, {18, MGN_VHT1SS_MCS1}, {14, MGN_VHT1SS_MCS0}, {10, MGN_12M}, {0, MGN_6M}}; 
@@ -47,7 +47,7 @@ u1Byte SS_Rate_Map_AC_2SS_MCS7_Lv6[3][2]= {{36, MGN_VHT2SS_MCS7}, {20, MGN_VHT2S
 
 u1Byte SS_Rate_Map_AC_3SS_MCS9[12][2]= {{50, MGN_VHT3SS_MCS9}, {47, MGN_VHT3SS_MCS8}, {44, MGN_VHT3SS_MCS7}, {40, MGN_VHT3SS_MCS6}, {36, MGN_VHT3SS_MCS5}, {32, MGN_VHT3SS_MCS4}, {28, MGN_VHT3SS_MCS3}, {24, MGN_VHT3SS_MCS2}, {21, MGN_VHT3SS_MCS1}, {18, MGN_VHT3SS_MCS0}, {10, MGN_12M}, {0, MGN_6M}}; 
 
-//(10�H�U�����6M in 5G)
+//(10以下請顯示6M in 5G)
 
 u1Byte SS_Rate_Map_N_MCS15[7][2]= {{40, MGN_MCS15}, {35, MGN_MCS14}, {31, MGN_MCS12}, {28, MGN_MCS7}, {25, MGN_MCS5}, {23, MGN_MCS3}, {10, MGN_MCS0}};
 u1Byte SS_Rate_Map_N_MCS15_Lv1[12][2]= {{40, MGN_MCS15}, {37, MGN_MCS14}, {35, MGN_MCS13}, {31, MGN_MCS12}, {28, MGN_MCS7}, {25, MGN_MCS6}, {22, MGN_MCS5}, {20, MGN_MCS4}, {15, MGN_MCS3}, {12, MGN_MCS2}, {8, MGN_MCS1},  {4, MGN_MCS0}};
@@ -365,10 +365,10 @@ MgntActQuery_802_11_BSSID_LIST(
 	PRT_WLAN_BSS		pBSSDesc = NULL;
 		
 	u1Byte	Rssibuf[MAX_BSS_DESC];
-	u2Byte	idxBuf[MAX_BSS_DESC];
+	u4Byte	idxBuf[MAX_BSS_DESC];
 
 	u1Byte	MaxRSSI=0;
-	u2Byte	a=0, idx=0, findidx =0, tmpidx=0;
+	u4Byte	a=0, idx=0, findidx=0, tmpidx=0;
 
 	RT_TRACE(COMP_SCAN, DBG_LOUD, ("[REDX]: MgntActQuery_802_11_BSSID_LIST() ===> \n"));
 	//
@@ -1086,7 +1086,7 @@ DecorateTxRateBySingalStrength(
 	u1Byte	MapSize
 )
 {
-	u1Byte index = 0;
+	int index = 0;
 	
 	for(index=0; index<(MapSize*2); index+=2)
 	{
diff --git a/network/wlan/WDI/COMMON/MgntEngine.c b/network/wlan/WDI/COMMON/MgntEngine.c
index 60296a83..0e10f7f6 100644
--- a/network/wlan/WDI/COMMON/MgntEngine.c
+++ b/network/wlan/WDI/COMMON/MgntEngine.c
@@ -200,7 +200,8 @@ AsocEntry_AddIbssPeerSta(
 	pEntry = AsocEntry_GetEntry(pMgntInfo, pTaddr);
 	if(pEntry != NULL)
 	{
-		u1Byte			i, rate;
+		u2Byte i;
+		u1Byte rate;
 
 		pEntry->AID = AsocEntry_AssignAvailableAID(pMgntInfo, pTaddr);
 		pEntry->IOTPeer = pBssDesc->Vender;
diff --git a/network/wlan/WDI/COMMON/MgntGen.c b/network/wlan/WDI/COMMON/MgntGen.c
index ebcb3dae..f45a22cb 100644
--- a/network/wlan/WDI/COMMON/MgntGen.c
+++ b/network/wlan/WDI/COMMON/MgntGen.c
@@ -33,7 +33,7 @@ MgntIsRateSupport(
 	OCTET_STRING	osRateSet
 	)
 {
-	u1Byte	i;
+	u2Byte	i;
 	for(i = 0; i < osRateSet.Length; i++)
 	{
 		if((nRate & 0x7f) == (osRateSet.Octet[i] & 0x7f))
diff --git a/network/wlan/WDI/COMMON/MgntLink.c b/network/wlan/WDI/COMMON/MgntLink.c
index fb65065a..d58faf28 100644
--- a/network/wlan/WDI/COMMON/MgntLink.c
+++ b/network/wlan/WDI/COMMON/MgntLink.c
@@ -493,7 +493,8 @@ CheckRateSet(
 	POCTET_STRING	pSuppRateSet
 	)
 {
-	u1Byte	index0 = 0, index1=0, index2=0;
+	u2Byte	index0 = 0;
+	u1Byte	index1=0, index2=0;
 	u1Byte	AvailRateTable[] = {0x2, 0x4, 0xb, 0x16, 0xc, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c};
 
 	// Trace each rate in the SuppRateSet.
@@ -1907,7 +1908,7 @@ GetValueFromBeaconOrProbeRsp(
 	if(RSNIE.Length != 0)
 	{
 		u1Byte	*pCurr;
-		u1Byte	count;
+		u2Byte	count;
 		u4Byte	Readlength =0;
 		
 		pCurr = RSNIE.Octet;
@@ -3765,7 +3766,7 @@ IncludedInSupportedRates(
 	PMGNT_INFO		pMgntInfo = &(Adapter->MgntInfo);
 	POCTET_STRING	pSupRateSet = &(pMgntInfo->SupportedRates);
 	u1Byte			RateMask = 0x7F;
-	u1Byte			idx;
+	u2Byte			idx;
 	BOOLEAN			Found = FALSE;
 	u1Byte			NaiveTxRate = TxRate&RateMask;
 
@@ -9233,7 +9234,7 @@ MgntLinkStatusUpdateRxCounts(
 {
 	PMGNT_INFO		pMgntInfo=&Adapter->MgntInfo;
 	u2Byte 			SlotIndex;
-	u1Byte			i;
+	u2Byte			i;
 
 	*TotalRxBcnNum = 0;
 	*TotalRxDataNum = 0;
diff --git a/network/wlan/WDI/COMMON/P2P.c b/network/wlan/WDI/COMMON/P2P.c
index 2e456fc4..02e5b01e 100644
--- a/network/wlan/WDI/COMMON/P2P.c
+++ b/network/wlan/WDI/COMMON/P2P.c
@@ -1628,7 +1628,7 @@ P2PDumpScanList(
 	IN u4Byte nDevDescriptors
 	)
 {
-	u1Byte i;
+	u4Byte i;
 
 	for(i = 0; i < nDevDescriptors; i++)
 	{
@@ -1934,7 +1934,7 @@ P2PScanListFind(
 	OUT pu4Byte pScanListIndex
 	)
 {
-	u1Byte i;
+	u4Byte i;
 	BOOLEAN bFound = FALSE;
 	pu1Byte KeyAddr = (DeviceAddress) ? (DeviceAddress) : ((InterfaceAddress) ? (InterfaceAddress) : (NULL));
 	BOOLEAN bDevAddressAsKey = (DeviceAddress) ? (TRUE) : (FALSE);
@@ -1968,7 +1968,8 @@ P2PScanListAllFound(
 	IN PP2P_INFO pP2PInfo
 	)
 {
-	u1Byte i = 0,j=0,uNumOfDeviceFoud=0;
+	ULONG i = 0;
+	u1Byte j = 0, uNumOfDevicesFound = 0;
 	BOOLEAN bAllFound = FALSE;
 
 	if(pP2PInfo->ScanDeviceIDs.uNumOfDeviceIDs == 0 ||pP2PInfo->DeviceListForQuery.uNumberOfDevices ==0)
@@ -1983,13 +1984,13 @@ P2PScanListAllFound(
 			if(eqMacAddr(pP2PInfo->ScanDeviceIDs.DeviceIDs[i], pP2PInfo->DeviceListForQuery.DeviceEntry[j].DeviceAddress) 
 				&&pP2PInfo->DeviceListForQuery.DeviceEntry[j].ProbeResponseHostTimestamp != 0)
 			{
-				uNumOfDeviceFoud ++;
+				uNumOfDevicesFound ++;
 			}
 		}
 	}
 	}
 
-	if(uNumOfDeviceFoud == pP2PInfo->ScanDeviceIDs.uNumOfDeviceIDs)
+	if(uNumOfDevicesFound == pP2PInfo->ScanDeviceIDs.uNumOfDeviceIDs)
 	{	
 		bAllFound =TRUE;
 		RT_TRACE(COMP_P2P, DBG_LOUD, ("%s: All of DeviceID Found : Terminate Device Discovery!! !\n", __FUNCTION__));						
@@ -2008,7 +2009,8 @@ P2PScanListFindClient(
 	OUT PP2P_CLIENT_INFO_DISCRIPTOR *ppClientInfoDesc
 	)
 {
-	u1Byte i, j;
+	u4Byte i;
+	u1Byte j;
 	BOOLEAN bFound = FALSE;
 	pu1Byte KeyAddr = (DeviceAddress) ? (DeviceAddress) : ((InterfaceAddress) ? (InterfaceAddress) : (NULL));
 	BOOLEAN bDevAddressAsKey = (DeviceAddress) ? (TRUE) : (FALSE);
@@ -2709,7 +2711,7 @@ P2PHasNon11BRateAsSupportingRate(
 {
 	OCTET_STRING BratesBeacon, ExtratesBeacon;
 	BOOLEAN bHasNon11bRate = FALSE;
-	u1Byte i;
+	u2Byte i;
 
 	//
 	// Note: if no supported rate IE in osPacket, FALSE is returned.
diff --git a/network/wlan/WDI/COMMON/Protocol802_11.c b/network/wlan/WDI/COMMON/Protocol802_11.c
index 176c6528..2943422c 100644
--- a/network/wlan/WDI/COMMON/Protocol802_11.c
+++ b/network/wlan/WDI/COMMON/Protocol802_11.c
@@ -942,7 +942,7 @@ NullSSID(
 	)
 {
 	OCTET_STRING	ssIdBeacon;
-	u1Byte			i;
+	u2Byte			i;
 	BOOLEAN			athHdnAP;	//sean,20030410, fix for linksys BEFW11S4
 
 //	ssIdBeacon = PacketGetElement( bcnPkt, EID_SsId );		// Rewrited for new added parameter. Annie, 2005-11-08.
diff --git a/network/wlan/WDI/COMMON/QosGen.c b/network/wlan/WDI/COMMON/QosGen.c
index 652dd442..fabb19f1 100644
--- a/network/wlan/WDI/COMMON/QosGen.c
+++ b/network/wlan/WDI/COMMON/QosGen.c
@@ -487,7 +487,7 @@ QosFillHeader(
 	IN	PRT_TCB		pTcb
 )
 {
-	u1Byte		i;
+	u2Byte		i;
 	u2Byte		FragIndex = 0;
 	u2Byte		FragBufferIndex = 0;
 	pu1Byte		pHeader = (pu1Byte)(GET_FRAME_OF_FIRST_FRAG(Adapter, pTcb));
diff --git a/network/wlan/WDI/COMMON/Receive.c b/network/wlan/WDI/COMMON/Receive.c
index 66cd1fe6..ee7ca86b 100644
--- a/network/wlan/WDI/COMMON/Receive.c
+++ b/network/wlan/WDI/COMMON/Receive.c
@@ -76,7 +76,7 @@ ChkValidRFDs(
 	u2Byte		RfdIdx;
 	
 	
-	for(RfdIdx = 0; RfdIdx < Adapter->NumRfd + 1; RfdIdx++)
+	for(RfdIdx = 0; RfdIdx < (u2Byte)(Adapter->NumRfd + 1); RfdIdx++)
 	{
 		if(Adapter->RfdListAddr[RfdIdx] == pRfdAddr)
 			return TRUE;
diff --git a/network/wlan/WDI/COMMON/Transmit.c b/network/wlan/WDI/COMMON/Transmit.c
index 226b7a1a..d90f662e 100644
--- a/network/wlan/WDI/COMMON/Transmit.c
+++ b/network/wlan/WDI/COMMON/Transmit.c
@@ -1296,7 +1296,7 @@ CheckSpecialTxPktContentFromHighLayer(
 		if(IP_Src_Port == 7236 || IP_Dst_Port == 7236 ||
 		    IP_Src_Port == 8554 || IP_Dst_Port == 8554)
 		{
-			u1Byte	offset = Check_Buf_Index;
+			u2Byte	offset = Check_Buf_Index;
 			RT_TRACE_F(COMP_P2P, DBG_LOUD, ("[MIRACAST/P2P] Tx Display Packet:\n"));
 			for(offset = Check_Buf_Index; offset < pTcb->BufferCount; offset ++)
 			{
@@ -2415,7 +2415,8 @@ FragmentTCB(
 	PRT_TCB				pTcb
 	)
 {
-	u2Byte			i, AddLen, Length, Offset=0;
+	u2Byte			i, AddLen, Length;
+	u4Byte			Offset=0;
 	u2Byte			FragThreshold;
 	u2Byte			FragIndex=0, FragLen, FragBufferCount;
 	u2Byte			ReadBufferIndex, WriteBufferIndex=0;
@@ -3629,7 +3630,7 @@ TCB_CopySystemPacketToLocal(
 	)
 {
 	PRT_TX_LOCAL_BUFFER		pBuf;
-	u1Byte					i = 0;
+	u2Byte					i = 0;
 	SHARED_MEMORY			tmpBufferList[MAX_PER_PACKET_BUFFER_LIST_LENGTH];
 	u4Byte					localBufOffset = 0;
 
diff --git a/network/wlan/WDI/COMMON/TransmitDesc.c b/network/wlan/WDI/COMMON/TransmitDesc.c
index 7c460c5d..fdb08d63 100644
--- a/network/wlan/WDI/COMMON/TransmitDesc.c
+++ b/network/wlan/WDI/COMMON/TransmitDesc.c
@@ -372,9 +372,9 @@ MgntQuery_TxTime(
 	)
 {
 	u2Byte	ThisFrameTime;
-	u1Byte	AckRate	= 0, CtsRate 	= 0;
-	u2Byte	AckTime= 0,	RtsTime	= 0, CtsTime	= 0;
-	u1Byte	FragIndex = 0;
+	u1Byte	AckRate = 0, CtsRate = 0;
+	u2Byte	AckTime = 0, RtsTime = 0, CtsTime = 0;
+	u2Byte	FragIndex = 0;
 
 	if(pTcb->bTxCalculatedSwDur == FALSE)
 		return;
@@ -1250,7 +1250,8 @@ FillFrameField(
 	u2Byte		SeqNum
 	)
 {
-	u1Byte 	FragIndex, BufferIndex;
+	u2Byte 	FragIndex;
+	u1Byte	BufferIndex;
 	pu1Byte	pFrame = GET_FRAME_OF_FIRST_FRAG(Adapter, pTcb);
 	u1Byte	HwDescOffset =0;
 
diff --git a/network/wlan/WDI/COMMON/WOLPattern.c b/network/wlan/WDI/COMMON/WOLPattern.c
index af01f65c..5946768a 100644
--- a/network/wlan/WDI/COMMON/WOLPattern.c
+++ b/network/wlan/WDI/COMMON/WOLPattern.c
@@ -264,7 +264,7 @@ ResetWoLPara(
 	PMGNT_INFO				pMgntInfo = &(Adapter->MgntInfo);
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO	pPmWOLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
-	u1Byte	i;
+	int	i;
 
 	PlatformZeroMemory(pPmWOLPatternInfo, 
 		sizeof(RT_PM_WOL_PATTERN_INFO)*(MAX_SUPPORT_WOL_PATTERN_NUM(Adapter)));
@@ -289,7 +289,7 @@ ConstructUserDefinedWakeUpPattern(
 	OCTET_STRING	AuthChallengetext;
 	u1Byte		AuthMaskBuf;
 	u1Byte		AuthMaskBufLen;
-	u1Byte		Index;
+	int		Index;
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO pPmWoLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
 	pu1Byte 		AuthBuf;
@@ -349,7 +349,7 @@ ConstructUserDefinedWakeUpPattern(
 			AuthMaskBufLen,
 			AuthBuf,
 			AuthBufLen,
-			Index,
+			(u1Byte)Index,
 			TRUE);
 
 		pPSC->WoLPatternNum++;
@@ -404,7 +404,7 @@ RemoveUserDefinedWoLPattern(
 	PMGNT_INFO	pMgntInfo = &(Adapter->MgntInfo);
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO	pPmWoLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
-	u1Byte		Index;
+	int		Index;
 
 	for(Index=0; Index<MAX_SUPPORT_WOL_PATTERN_NUM(Adapter); Index++)
 	{
@@ -444,7 +444,8 @@ AddWoLPatternEntry(
 	PMGNT_INFO				pMgntInfo = &(Adapter->MgntInfo);
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO	pWoLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
-	u1Byte	i, j;
+	u4Byte	i;
+	u1Byte	j;
 
 	// Reset the entry.
 	PlatformZeroMemory(&(pWoLPatternInfo[Index].FwPattern),sizeof(H2C_WOL_PATTERN_MATCH_INFO));
@@ -490,7 +491,7 @@ GetWoLPatternMatchOffloadEntries(
 	PMGNT_INFO				pMgntInfo = &(Adapter->MgntInfo);
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO	pWoLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
-	u1Byte	i=0;
+	int	i=0;
 	u1Byte	MinNum = 0xFF, NextMinNum=0xFF;
 	u1Byte	NumOfSelected=0;
 
@@ -650,7 +651,8 @@ WoL_IsMagicPacket(
 {
 	OCTET_STRING	frame = {NULL, 0};
 	pu1Byte 			pHeader;
-	u1Byte			offset=0, i, j;
+	u1Byte			offset = 0;
+	u2Byte			i, j;
 	u2Byte			PayloadLen;
 	BOOLEAN			bMatchPacket=FALSE;
 	
@@ -765,7 +767,8 @@ WoL_IsPatternMatchPacket(
 	PMGNT_INFO		pMgntInfo = &(Adapter->MgntInfo);
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO	pPmWoLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
-	u1Byte			Index, i, j;
+	int				Index;
+	u1Byte			i, j;
 	BOOLEAN			bMatchPacket=TRUE;
 	u1Byte			offset = 0;
 	pu1Byte			pDot3Packet;
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/N62C_SetOID.c b/network/wlan/WDI/PLATFORM/NDIS6/N62C_SetOID.c
index dbee3ad0..13f705ad 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/N62C_SetOID.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/N62C_SetOID.c
@@ -369,10 +369,10 @@ N62C_SET_OID_PM_ADD_WOL_PATTERN(
 {
 	NDIS_STATUS	 	ndisStatus = NDIS_STATUS_SUCCESS;
 	NDIS_PM_WOL_PATTERN WOLPatternStructure = *((PNDIS_PM_WOL_PATTERN)InformationBuffer);
-	u1Byte	WoLBitMapPatternMask[MAX_WOL_BIT_MASK_SIZE];
-	u1Byte	WoLBitMapPatternContent[MAX_WOL_PATTERN_SIZE];
-	u1Byte	WoLBitMapPattern[MAX_WOL_PATTERN_SIZE];
-	u1Byte	Index;
+	u1Byte WoLBitMapPatternMask[MAX_WOL_BIT_MASK_SIZE];
+	u1Byte WoLBitMapPatternContent[MAX_WOL_PATTERN_SIZE];
+	u1Byte WoLBitMapPattern[MAX_WOL_PATTERN_SIZE];
+	int Index;
 	PMGNT_INFO				pMgntInfo = &(pTargetAdapter->MgntInfo);
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO	pPmWoLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
@@ -464,7 +464,7 @@ N62C_SET_OID_PM_ADD_WOL_PATTERN(
 						WOLPatternStructure.WoLPattern.WoLBitMapPattern.MaskSize, 
 						(pu1Byte)&WoLBitMapPatternContent, 
 						WOLPatternStructure.WoLPattern.WoLBitMapPattern.PatternSize,
-						Index,
+						(u1Byte)Index,
 						FALSE
 					);
 
@@ -541,9 +541,9 @@ N62C_SET_OID_PM_REMOVE_WOL_PATTERN(
 	OUT	PULONG			BytesNeeded
 )
 {
-	NDIS_STATUS	 	ndisStatus = NDIS_STATUS_SUCCESS;
-	u4Byte	RemovePatternId = *((pu4Byte)InformationBuffer);
-	u1Byte	Index;
+	NDIS_STATUS ndisStatus = NDIS_STATUS_SUCCESS;
+	u4Byte RemovePatternId = *((pu4Byte)InformationBuffer);
+	int Index;
 	PMGNT_INFO				pMgntInfo = &(pTargetAdapter->MgntInfo);
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO	pPmWoLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
@@ -1131,16 +1131,16 @@ N62C_QUERYSET_OID_RECEIVE_FILTER_SET_FILTER(
 	OUT   PULONG			BytesNeeded	
 )
 {
-	NDIS_STATUS	 								ndisStatus = NDIS_STATUS_SUCCESS;
-	PMGNT_INFO 									pMgntInfo = &pTargetAdapter->MgntInfo;
+	NDIS_STATUS	 							ndisStatus = NDIS_STATUS_SUCCESS;
+	PMGNT_INFO 								pMgntInfo = &pTargetAdapter->MgntInfo;
 	PNDIS_RECEIVE_FILTER_PARAMETERS			pRxFilterPara = NULL;
-	PNDIS_RECEIVE_FILTER_FIELD_PARAMETERS		pRxFilterFieldPara = NULL;
-	u1Byte										Currindex =0;
+	PNDIS_RECEIVE_FILTER_FIELD_PARAMETERS	pRxFilterFieldPara = NULL;
+	u4Byte									Currindex =0;
 	PRT_DO_COALESICING_FILTER_PARAMETER		pCurrRTCoPa = NULL;
-	PRT_DO_COALESICING_FIELD_INFO				pCurrRTCoField = NULL;
-	ULONG										FieldOffset;
-	pu1Byte										pFieldParametersArray;
-	ULONG										FieldElementSize;
+	PRT_DO_COALESICING_FIELD_INFO			pCurrRTCoField = NULL;
+	ULONG									FieldOffset;
+	pu1Byte									pFieldParametersArray;
+	ULONG									FieldElementSize;
 	//FieldParametersArrayElementSize
 
 	// Output variables (Currently no use)
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/N6C_OidQuery.c b/network/wlan/WDI/PLATFORM/NDIS6/N6C_OidQuery.c
index 63a07391..3be46288 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/N6C_OidQuery.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/N6C_OidQuery.c
@@ -693,7 +693,7 @@ N6CQuery_DOT11_PMKID_LIST(
 {
 	PMGNT_INFO					pMgntInfo = &(Adapter->MgntInfo);
 	PRT_SECURITY_T				pSecInfo = &(pMgntInfo->SecurityInfo);
-	u1Byte						idx;
+	u4Byte						idx;
 
 	RT_TRACE( COMP_OID_QUERY|COMP_SEC, DBG_TRACE, ("==> N6CQuery_DOT11_PMKID_LIST()\n") );
 
@@ -1736,7 +1736,7 @@ N6CQuery_DOT11_SUPPORTED_PHY_TYPES(
 	PRT_NDIS6_COMMON	pNdisCommon = Adapter->pNdisCommon;
 	PDOT11_SUPPORTED_PHY_TYPES	pDot11SupportedPhyTypes = (PDOT11_SUPPORTED_PHY_TYPES)InformationBuffer;
 	ULONG	uNumMaxEntries = 0;
-	USHORT	Index;
+	ULONG	Index;
 
 	//
 	// <RJ_NW_TODO> Reivse PHY related in N6usbInitializeNative80211MIBs().
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/N6C_OidSet.c b/network/wlan/WDI/PLATFORM/NDIS6/N6C_OidSet.c
index cb3ae108..28655464 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/N6C_OidSet.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/N6C_OidSet.c
@@ -659,7 +659,7 @@ N6CSet_DOT11_ENABLED_AUTHENTICATION_ALGORITHM(
 
 	if(pAuthAlgoList->uNumOfEntries > 1)
 	{
-		u1Byte	i = 0;
+		ULONG	i = 0;
 		RT_TRACE( COMP_OID_SET, DBG_WARNING, ("%s pAuthAlgoList->uNumOfEntries > 1, but we don't support now!\n", __FUNCTION__) );
 		for(i = 0; i < pAuthAlgoList->uNumOfEntries; i ++)
 		{
@@ -3236,7 +3236,7 @@ N6CSet_DOT11_DESIRED_PHY_LIST(
 	PDOT11_PHY_ID_LIST	pPhyIdList = (PDOT11_PHY_ID_LIST)InformationBuffer;
 	PRT_NDIS6_COMMON	pNdisCommon = Adapter->pNdisCommon;
 	BOOLEAN			AnyPhyId = FALSE;
-	u1Byte			index;
+	ULONG			index;
 	
 	*BytesRead = 0;
 	*BytesNeeded =0;
@@ -4498,9 +4498,9 @@ N6C_SET_OID_PNP_ADD_WAKE_UP_PATTERN(
 	NDIS_STATUS	 	ndisStatus = NDIS_STATUS_SUCCESS;
 	NDIS_PM_PACKET_PATTERN PMPacketPattern = *((PNDIS_PM_PACKET_PATTERN)InformationBuffer);	
 				
-	u1Byte	WoLBitMapPatternMask[MAX_WOL_BIT_MASK_SIZE];
-	u1Byte	WoLBitMapPatternContent[MAX_WOL_PATTERN_SIZE];
-	u1Byte	Index;
+	u1Byte WoLBitMapPatternMask[MAX_WOL_BIT_MASK_SIZE];
+	u1Byte WoLBitMapPatternContent[MAX_WOL_PATTERN_SIZE];
+	int Index;
 	PMGNT_INFO				pMgntInfo = &(pTargetAdapter->MgntInfo);
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO pPmWoLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
@@ -4596,7 +4596,7 @@ N6C_SET_OID_PNP_ADD_WAKE_UP_PATTERN(
 					PMPacketPattern.MaskSize, 
 					(pu1Byte)&WoLBitMapPatternContent, 
 					PMPacketPattern.PatternSize,
-					Index,
+					(u1Byte)Index,
 					FALSE);
 						
 				pPSC->WoLPatternNum++;	
@@ -4618,9 +4618,9 @@ N6C_SET_OID_PNP_REMOVE_WAKE_UP_PATTERN(
 	OUT	PULONG			BytesNeeded
 )
 {
-	NDIS_STATUS	 	ndisStatus = NDIS_STATUS_SUCCESS;
+	NDIS_STATUS ndisStatus = NDIS_STATUS_SUCCESS;
 	NDIS_PM_PACKET_PATTERN PMPacketPattern = *((PNDIS_PM_PACKET_PATTERN)InformationBuffer);
-	u1Byte	Index;
+	int Index;
 	PMGNT_INFO				pMgntInfo = &(pTargetAdapter->MgntInfo);
 	PRT_POWER_SAVE_CONTROL	pPSC = GET_POWER_SAVE_CONTROL(pMgntInfo);
 	PRT_PM_WOL_PATTERN_INFO pPmWoLPatternInfo = &(pPSC->PmWoLPatternInfo[0]);
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c b/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c
index 0eb30b9e..d122f0c0 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c
@@ -3349,7 +3349,7 @@ N6ReceiveCoalescingFilter(
 	BOOLEAN						bBufferPkt = FALSE;
 	PMGNT_INFO 					pMgntInfo = &Adapter->MgntInfo;
 	u1Byte						ColseParIndex = 0;
-	u1Byte						ColseFieldIndex = 0;
+	u4Byte						ColseFieldIndex = 0;
 	BOOLEAN						bFiledMatch = TRUE;
 	PRT_DO_COALESICING_FILTER_PARAMETER		pCurrFilterPar =NULL;
 	PRT_DO_COALESICING_FIELD_INFO			pCurrFieldInfo = NULL;
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6SdioPlatformWindows.c b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6SdioPlatformWindows.c
index 86a16e03..ee13422e 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6SdioPlatformWindows.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6SdioPlatformWindows.c
@@ -1664,7 +1664,7 @@ PlatformSdioCmd52ReadWrite(
 	PVOID			buffer
     )
 {
-	u1Byte	i = 0;
+	ULONG	i = 0;
 	u4Byte	TargetAddr = registerIndex;
 	PADAPTER	pAdapter = (PADAPTER)sdiodevice->pAdapter;
 	RT_STATUS	status = RT_STATUS_FAILURE;
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6Sdio_WdiMain.c b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6Sdio_WdiMain.c
index 2bacda78..f9631683 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6Sdio_WdiMain.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6Sdio_WdiMain.c
@@ -590,7 +590,7 @@ n6sdioWdi_FillPhyInfoAttr(
 	)
 {
 	PRT_NDIS6_COMMON	pNdisCommon = pAdapter->pNdisCommon;
-	u1Byte				count = 0;
+	ULONG				count = 0;
 
 	static WDI_DATA_RATE_LIST DataRateListHrDsss[] = {
 		{ WDI_DATA_RATE_RX_RATE | WDI_DATA_RATE_TX_RATE, 2 },
@@ -3127,7 +3127,7 @@ N6SdioWdi_PnPSetPower(
 		{
 			if( pNLOInfo->NumDot11OffloadNetwork != 0 && Adapter->bInHctTest)
 			{
-				u1Byte i = 0;
+				ULONG i = 0;
 				BOOLEAN bTargetInNLO = FALSE;
 				
 				if(Adapter->MgntInfo.bMediaConnect || pNdisCommon->bDissociateBeforeSleep)
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6Sdio_main.c b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6Sdio_main.c
index 1165eed1..38ca8510 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6Sdio_main.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/N6Sdio_main.c
@@ -1542,7 +1542,7 @@ N6SdioDumpDeviceProperty(
 	IN PRT_SDIO_DEVICE	pDevice
 )
 {
-	u2Byte	Idx = 0;
+	int	Idx = 0;
 	u1Byte	Data;
 	NTSTATUS ntStatus = STATUS_SUCCESS;	
 	RT_STATUS	rtstatus = RT_STATUS_SUCCESS;
@@ -2651,7 +2651,7 @@ Routine Description:
 	that the device has been removed and cancel any pending Requests
 	that it sent down to the underlying bus driver. After calling
 	the MiniportPnPEventNotify function to indicate the surprise
-	removal, NDIS calls the miniport�� MiniportHalt function.
+	removal, NDIS calls the miniport�� MiniportHalt function.
 	If the miniport driver receives any requests to send packets
 	or query or set OIDs before its MiniportHalt function is
 	called, it should immediately complete such requests with a
@@ -5872,11 +5872,11 @@ PnpWorkItemCallback(
 		{
 			if( pNLOInfo->NumDot11OffloadNetwork != 0 && Adapter->bInHctTest)
 			{
-				u1Byte i = 0;
+				ULONG i = 0;
 				BOOLEAN bTargetInNLO = FALSE;
 				
 				if(Adapter->MgntInfo.bMediaConnect || pNdisCommon->bDissociateBeforeSleep)
-				{				
+				{
 					for(i=0; i<pNLOInfo->NumDot11OffloadNetwork; i++)
 					{
 						if(pMgntInfo->Ssid.Length && (pMgntInfo->Ssid.Length == pNLOInfo->dDot11OffloadNetworkList[i].ssidlen))
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c b/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c
index 983c81c9..75df79b2 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/WDI_Cmds.c
@@ -902,9 +902,9 @@ Wdi_Task_Connect(
 		= (PWDI_MESSAGE_HEADER)pOidHandle->pInputBuffer;
 
 	//Save PMKID
-	u4Byte					ulIndex, i, j;
+	int						ulIndex, i, j;
 	BOOLEAN					blInserted;
-	u1Byte 					bssidcount=0;
+	int 					bssidcount=0;
 	int 					NumPreferredBSSID = Params->PreferredBSSEntryList.ElementCount;
 
 	RT_TRACE(COMP_MLME, DBG_LOUD, ("==> Wdi_Task_Connect()\n"));
@@ -914,7 +914,7 @@ Wdi_Task_Connect(
 	if(NDIS_STATUS_SUCCESS == ndisStatus)
 	{
 		DOT11_SSID_LIST	SsidList;
-		u1Byte			i = 0;
+		ULONG			i = 0;
 
 		N6_ASSIGN_OBJECT_HEADER(
 			SsidList.Header,
@@ -1656,7 +1656,7 @@ Wdi_Task_Roam(
 	PWDI_MESSAGE_HEADER					pWdiHeader = (PWDI_MESSAGE_HEADER)pOidHandle->pInputBuffer;
 	u4Byte								ulIndex, i, j;
 	BOOLEAN								blInserted;
-	u1Byte 								bssidcount=0;
+	int 								bssidcount=0;
 	int 								NumPreferredBSSID = Params->PreferredBSSEntryList.ElementCount;
 
 
@@ -1667,7 +1667,7 @@ Wdi_Task_Roam(
 	if(NDIS_STATUS_SUCCESS == ndisStatus)
 	{
 		DOT11_SSID_LIST	SsidList;
-		u1Byte			i = 0;
+		ULONG			i = 0;
 
 		N6_ASSIGN_OBJECT_HEADER(
 			SsidList.Header,
@@ -2585,7 +2585,7 @@ Wdi_Set_Network_List_Offload(
 	u4Byte				ChannelIndex 	= 0;
 	u4Byte				Index			= 0;
 	u4Byte				ItemCnt			= 0;
-	u1Byte				i				= 0;
+	UINT32				i				= 0;
 
 	RT_TRACE( COMP_POWER, DBG_LOUD , (" ===>Wdi_Set_Network_List_Offload\n") );
 
@@ -2872,7 +2872,7 @@ Wdi_Set_Add_Wol_Pattern(
 	u1Byte	WoLBitMapPatternMask[MAX_WOL_BIT_MASK_SIZE];
 	u1Byte	WoLBitMapPatternContent[MAX_WOL_PATTERN_SIZE];
 	u1Byte	WoLBitMapPattern[MAX_WOL_PATTERN_SIZE];
-	u1Byte	Index, ptnIndex;
+	int		Index, ptnIndex;
 
 	RT_TRACE(COMP_OID_SET, DBG_LOUD, ("==> Wdi_Set_Add_Wol_Pattern()\n"));
 
@@ -2892,7 +2892,7 @@ Wdi_Set_Add_Wol_Pattern(
 
 	//2 Wake Packet Pattern
 	pPatternElements = Params->WakePacketPattern.pElements;
-	for(Index = 0; Index < Params->WakePacketPattern.ElementCount; Index++, pPatternElements++)
+	for(Index = 0; Index < (u1Byte)Params->WakePacketPattern.ElementCount; Index++, pPatternElements++)
 	{
 		RT_TRACE(COMP_OID_SET, DBG_LOUD, ("SET OID_PM_ADD_WOL_PATTERN[%d]:\n", Index));
 
@@ -2969,7 +2969,7 @@ Wdi_Set_Add_Wol_Pattern(
 						pPatternElements->PacketPatternMask.ElementCount,
 						(pu1Byte)&WoLBitMapPatternContent,
 						pPatternElements->PacketPattern.ElementCount,
-						Index,
+						(u1Byte)Index,
 						FALSE
 					);
 
@@ -2993,7 +2993,7 @@ Wdi_Set_Add_Wol_Pattern(
 
 	//2 Wake Packet Ipv4 Tcp Sync: Not verify
 	pIPv4Elements = Params->WakePacketIpv4TcpSync.pElements;
-	for(Index = 0; Index < Params->WakePacketIpv4TcpSync.ElementCount; Index++, pIPv4Elements++)
+	for(Index = 0; Index < (u1Byte)Params->WakePacketIpv4TcpSync.ElementCount; Index++, pIPv4Elements++)
 	{
 		if(!pPSC->IPv4TcpSynPatternId)
 		{
@@ -3005,7 +3005,7 @@ Wdi_Set_Add_Wol_Pattern(
 
 	//2 Wake Packet Ipv6 Tcp Sync: Not verify
 	pIPv6Elements = Params->WakePacketIpv6TcpSync.pElements;
-	for(Index = 0; Index < Params->WakePacketIpv6TcpSync.ElementCount; Index++, pIPv6Elements++)
+	for(Index = 0; Index < (u1Byte)Params->WakePacketIpv6TcpSync.ElementCount; Index++, pIPv6Elements++)
 	{
 		if(!pPSC->IPv6TcpSynPatternId)
 		{
@@ -3086,7 +3086,7 @@ Wdi_Set_Remove_Wol_Pattern(
 	}
 	else
 	{
-		u1Byte	Index;
+		int	Index;
 
 		for(Index = 0; Index < MAX_SUPPORT_WOL_PATTERN_NUM(pAdapter); Index++)
 		{
@@ -3539,7 +3539,7 @@ Wdi_IHV_Request(
 #if 	1
 	PCCX_NIC_SPECIFIC_EXTENSION	ccxData;
 	PIHV_CCX_TLV				pTlv = NULL;
-	u1Byte i = 0;
+	ULONG i = 0;
 #endif
 	RT_TRACE(COMP_OID_SET, DBG_LOUD, ("==> Wdi_IHV_Request()\n"));
 	pWdiHeader->Status = NDIS_STATUS_SUCCESS;
@@ -3729,7 +3729,7 @@ Wdi_Get_Statistics(
 	}
 	else
 	{
-		u1Byte	count = 0;
+		ULONG count = 0;
 
 		PlatformZeroMemory(&MacStatistics[0], sizeof(WDI_MAC_STATISTICS_CONTAINER)*2);
 		cpMacAddr(MacStatistics[0].MACAddress.Address, BroadcastAddress);