diff --git a/nic/que_mgt.c b/nic/que_mgt.c
index 7e63990..ba8460c 100644
--- a/nic/que_mgt.c
+++ b/nic/que_mgt.c
@@ -2422,14 +2422,14 @@
 				QUEUE_INSERT_TAIL(prReturnedQue, (P_QUE_ENTRY_T) prCurrSwRfb);
 				continue;
 			}
-		}
-		if (fgIsBMC
-			&& prBssInfoRly
-			&& (IS_BSS_AIS(prBssInfoRly) || IS_BSS_P2P(prBssInfoRly))
-			&& qmHandleRxReplay(prAdapter, prCurrSwRfb)) {
-			prCurrSwRfb->eDst = RX_PKT_DESTINATION_NULL;
-			QUEUE_INSERT_TAIL(prReturnedQue, (P_QUE_ENTRY_T) prCurrSwRfb);
-			continue;
+			if (fgIsBMC
+				&& prBssInfoRly
+				&& (IS_BSS_AIS(prBssInfoRly) || IS_BSS_P2P(prBssInfoRly))
+				&& qmHandleRxReplay(prAdapter, prCurrSwRfb)) {
+				prCurrSwRfb->eDst = RX_PKT_DESTINATION_NULL;
+				QUEUE_INSERT_TAIL(prReturnedQue, (P_QUE_ENTRY_T) prCurrSwRfb);
+				continue;
+			}
 		}
 #endif
 
@@ -5960,7 +5960,7 @@
 {
 	UINT_8 ucCount = 0;
 	UINT_64 u8Data = 0;
-	UINT_8 ucTmp = 0;
+	UINT_64 ucTmp = 0;
 
 	if (!pu8Rets) {
 		DBGLOG(QM, ERROR, "Please input valid pu8Rets\n");