diff --git a/dp/inc/cdp_txrx_stats_struct.h b/dp/inc/cdp_txrx_stats_struct.h
index 279b70c94a..31fbe75085 100644
--- a/dp/inc/cdp_txrx_stats_struct.h
+++ b/dp/inc/cdp_txrx_stats_struct.h
@@ -116,6 +116,17 @@
 
 #define INVALID_RSSI 255
 
+#define CDP_RSSI_MULTIPLIER BIT(8)
+#define CDP_RSSI_MUL(x, mul) ((x) * (mul))
+#define CDP_RSSI_RND(x, mul) ((((x) % (mul)) >= ((mul) / 2)) ?\
+	((x) + ((mul) - 1)) / (mul) : (x) / (mul))
+
+#define CDP_RSSI_OUT(x) (CDP_RSSI_RND((x), CDP_RSSI_MULTIPLIER))
+#define CDP_RSSI_IN(x)  (CDP_RSSI_MUL((x), CDP_RSSI_MULTIPLIER))
+#define CDP_RSSI_AVG(x, y) ((((x) << 2) + (y) - (x)) >> 2)
+
+#define CDP_RSSI_UPDATE_AVG(x, y) x = CDP_RSSI_AVG((x), CDP_RSSI_IN((y)))
+
 /*Max SU EVM count */
 #define DP_RX_MAX_SU_EVM_COUNT 32
 
diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c
index e23f4694b4..fc98f13c96 100644
--- a/dp/wifi3.0/dp_rx_mon_status.c
+++ b/dp/wifi3.0/dp_rx_mon_status.c
@@ -506,11 +506,11 @@ static void dp_rx_stats_update(struct dp_pdev *pdev,
 		DP_STATS_UPD(peer, rx.rssi, (ppdu->rssi + pkt_bw_offset));
 
 		if (peer->stats.rx.avg_rssi == INVALID_RSSI)
-			peer->stats.rx.avg_rssi = ppdu->rssi;
-		else
 			peer->stats.rx.avg_rssi =
-				DP_GET_AVG_RSSI(peer->stats.rx.avg_rssi,
-						ppdu->rssi);
+				CDP_RSSI_IN(peer->stats.rx.rssi);
+		else
+			CDP_RSSI_UPDATE_AVG(peer->stats.rx.avg_rssi,
+					    peer->stats.rx.rssi);
 
 		if ((preamble == DOT11_A) || (preamble == DOT11_B))
 			nss = 1;