diff --git a/components/p2p/core/src/wlan_p2p_off_chan_tx.c b/components/p2p/core/src/wlan_p2p_off_chan_tx.c
index b3b47f6aed..a9ca57f872 100644
--- a/components/p2p/core/src/wlan_p2p_off_chan_tx.c
+++ b/components/p2p/core/src/wlan_p2p_off_chan_tx.c
@@ -1085,7 +1085,7 @@ static QDF_STATUS p2p_mgmt_tx(struct tx_action_context *tx_ctx,
 	}
 
 	if (tx_ctx->chan)
-		chanfreq = wlan_reg_legacy_chan_to_freq(pdev, tx_ctx->chan);
+		chanfreq = tx_ctx->chan;
 
 	mgmt_param.chanfreq = chanfreq;
 
diff --git a/components/p2p/core/src/wlan_p2p_off_chan_tx.h b/components/p2p/core/src/wlan_p2p_off_chan_tx.h
index 35c3da4360..671782c62c 100644
--- a/components/p2p/core/src/wlan_p2p_off_chan_tx.h
+++ b/components/p2p/core/src/wlan_p2p_off_chan_tx.h
@@ -173,7 +173,7 @@ struct tx_action_context {
 	int scan_id;
 	uint64_t roc_cookie;
 	int32_t id;
-	uint8_t chan;
+	qdf_freq_t chan;
 	uint8_t *buf;
 	int buf_len;
 	bool off_chan;
diff --git a/components/p2p/core/src/wlan_p2p_roc.c b/components/p2p/core/src/wlan_p2p_roc.c
index 41400f83a1..60752a8329 100644
--- a/components/p2p/core/src/wlan_p2p_roc.c
+++ b/components/p2p/core/src/wlan_p2p_roc.c
@@ -113,9 +113,7 @@ static QDF_STATUS p2p_scan_start(struct p2p_roc_context *roc_ctx)
 	req->scan_req.scan_type = SCAN_TYPE_P2P_LISTEN;
 	req->scan_req.scan_req_id = p2p_soc_obj->scan_req_id;
 	req->scan_req.chan_list.num_chan = 1;
-	req->scan_req.chan_list.chan[0].freq = wlan_reg_legacy_chan_to_freq(
-								pdev,
-								roc_ctx->chan);
+	req->scan_req.chan_list.chan[0].freq = roc_ctx->chan;
 	req->scan_req.dwell_time_passive = roc_ctx->duration;
 	req->scan_req.dwell_time_active = 0;
 	req->scan_req.scan_priority = SCAN_PRIORITY_HIGH;
diff --git a/components/p2p/core/src/wlan_p2p_roc.h b/components/p2p/core/src/wlan_p2p_roc.h
index bcd67fc2cd..eb5dcdcbf6 100644
--- a/components/p2p/core/src/wlan_p2p_roc.h
+++ b/components/p2p/core/src/wlan_p2p_roc.h
@@ -90,7 +90,7 @@ struct p2p_roc_context {
 	uint32_t vdev_id;
 	uint32_t scan_id;
 	void *tx_ctx;
-	uint8_t chan;
+	qdf_freq_t chan;
 	uint8_t phy_mode;
 	uint32_t duration;
 	enum roc_type roc_type;
diff --git a/components/p2p/dispatcher/inc/wlan_p2p_public_struct.h b/components/p2p/dispatcher/inc/wlan_p2p_public_struct.h
index 33fd71c70b..d273c192f0 100644
--- a/components/p2p/dispatcher/inc/wlan_p2p_public_struct.h
+++ b/components/p2p/dispatcher/inc/wlan_p2p_public_struct.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2019, 2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -67,7 +67,7 @@ struct p2p_ps_params {
  */
 struct p2p_roc_req {
 	uint32_t vdev_id;
-	uint32_t chan;
+	qdf_freq_t chan;
 	uint32_t phy_mode;
 	uint32_t duration;
 };
@@ -96,7 +96,7 @@ struct p2p_event {
 	uint32_t vdev_id;
 	enum p2p_roc_event roc_event;
 	uint64_t cookie;
-	uint32_t chan;
+	qdf_freq_t chan;
 	uint32_t duration;
 };
 
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index ba9925cb41..a8e12601e0 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -285,15 +285,16 @@ wlan_hdd_validate_and_override_offchan(struct hdd_adapter *adapter,
 				       struct ieee80211_channel *chan,
 				       bool *offchan)
 {
-	uint8_t home_ch;
+	qdf_freq_t home_ch_freq;
 
 	if (!offchan || !chan || !(*offchan))
 		return;
 
-	home_ch = hdd_get_adapter_home_channel(adapter);
+	home_ch_freq = hdd_get_adapter_home_channel(adapter);
 
-	if (ieee80211_frequency_to_channel(chan->center_freq) == home_ch) {
-		hdd_debug("override offchan to 0 at home channel %d", home_ch);
+	if (chan->center_freq == home_ch_freq) {
+		hdd_debug("override offchan to 0 at home channel %d",
+			  home_ch_freq);
 		*offchan = false;
 	}
 }
diff --git a/os_if/p2p/src/wlan_cfg80211_p2p.c b/os_if/p2p/src/wlan_cfg80211_p2p.c
index 93373c9d13..2f0d6a1c57 100644
--- a/os_if/p2p/src/wlan_cfg80211_p2p.c
+++ b/os_if/p2p/src/wlan_cfg80211_p2p.c
@@ -283,10 +283,7 @@ static void wlan_p2p_event_callback(void *user_data,
 	}
 
 	pdev = wlan_vdev_get_pdev(vdev);
-	chan = ieee80211_get_channel(wdev->wiphy,
-				     wlan_reg_legacy_chan_to_freq(
-							pdev,
-							p2p_event->chan));
+	chan = ieee80211_get_channel(wdev->wiphy, p2p_event->chan);
 	if (!chan) {
 		osif_err("channel conversion failed");
 		goto fail;
@@ -367,7 +364,7 @@ int wlan_cfg80211_roc(struct wlan_objmgr_vdev *vdev,
 		return -EINVAL;
 	}
 
-	roc_req.chan = (uint32_t)wlan_reg_freq_to_chan(pdev, chan->center_freq);
+	roc_req.chan = chan->center_freq;
 	roc_req.duration = duration;
 	roc_req.vdev_id = (uint32_t)vdev_id;
 
@@ -416,7 +413,7 @@ int wlan_cfg80211_mgmt_tx(struct wlan_objmgr_vdev *vdev,
 	struct p2p_mgmt_tx mgmt_tx = {0};
 	struct wlan_objmgr_psoc *psoc;
 	uint8_t vdev_id;
-	uint32_t channel = 0;
+	qdf_freq_t chan_freq = 0;
 	struct wlan_objmgr_pdev *pdev = NULL;
 	if (!vdev) {
 		osif_err("invalid vdev object");
@@ -425,8 +422,7 @@ int wlan_cfg80211_mgmt_tx(struct wlan_objmgr_vdev *vdev,
 
 	pdev = wlan_vdev_get_pdev(vdev);
 	if (chan)
-		channel = (uint32_t)wlan_reg_freq_to_chan(pdev,
-							  chan->center_freq);
+		chan_freq = chan->center_freq;
 	else
 		osif_debug("NULL chan, set channel to 0");
 
@@ -445,10 +441,7 @@ int wlan_cfg80211_mgmt_tx(struct wlan_objmgr_vdev *vdev,
 		int ret;
 		bool ok;
 
-		ret = policy_mgr_is_chan_ok_for_dnbs(
-				psoc, wlan_reg_legacy_chan_to_freq(pdev,
-								   channel),
-								   &ok);
+		ret = policy_mgr_is_chan_ok_for_dnbs(psoc, chan_freq, &ok);
 		if (QDF_IS_STATUS_ERROR(ret)) {
 			osif_err("policy_mgr_is_chan_ok_for_dnbs():ret:%d",
 				 ret);
@@ -456,13 +449,13 @@ int wlan_cfg80211_mgmt_tx(struct wlan_objmgr_vdev *vdev,
 		}
 		if (!ok) {
 			osif_err("Rejecting mgmt_tx for channel:%d as DNSC is set",
-				 channel);
+				 chan_freq);
 			return -EINVAL;
 		}
 	}
 
 	mgmt_tx.vdev_id = (uint32_t)vdev_id;
-	mgmt_tx.chan = channel;
+	mgmt_tx.chan = chan_freq;
 	mgmt_tx.wait = wait;
 	mgmt_tx.len = len;
 	mgmt_tx.no_cck = (uint32_t)no_cck;