diff --git a/core/src/wlan_p2p_main.c b/core/src/wlan_p2p_main.c
index 3669a4fb2dd9..32c9fb0b5b76 100644
--- a/core/src/wlan_p2p_main.c
+++ b/core/src/wlan_p2p_main.c
@@ -191,7 +191,7 @@ static QDF_STATUS p2p_vdev_obj_create_notification(
 {
 	struct p2p_vdev_priv_obj *p2p_vdev_obj;
 	QDF_STATUS status;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	if (!vdev) {
 		p2p_err("vdev context passed is NULL");
@@ -246,7 +246,7 @@ static QDF_STATUS p2p_vdev_obj_destroy_notification(
 {
 	struct p2p_vdev_priv_obj *p2p_vdev_obj;
 	QDF_STATUS status;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	if (!vdev) {
 		p2p_err("vdev context passed is NULL");
@@ -302,7 +302,7 @@ static QDF_STATUS p2p_peer_obj_create_notification(
 {
 	struct wlan_objmgr_vdev *vdev;
 	struct p2p_vdev_priv_obj *p2p_vdev_obj;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 	enum wlan_peer_type peer_type;
 
 	if (!peer) {
@@ -344,7 +344,7 @@ static QDF_STATUS p2p_peer_obj_destroy_notification(
 	struct wlan_objmgr_vdev *vdev;
 	struct p2p_vdev_priv_obj *p2p_vdev_obj;
 	struct wlan_objmgr_psoc *psoc;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 	enum wlan_peer_type peer_type;
 	uint8_t vdev_id;
 
@@ -471,7 +471,7 @@ static QDF_STATUS process_peer_for_noa(struct wlan_objmgr_vdev *vdev,
 				struct wlan_objmgr_peer *peer)
 {
 	struct p2p_vdev_priv_obj *p2p_vdev_obj = NULL;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 	enum wlan_peer_type peer_type;
 	bool disable_noa;
 	uint8_t vdev_id;
@@ -1104,7 +1104,7 @@ QDF_STATUS p2p_process_noa(struct p2p_noa_event *noa_event)
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct wlan_objmgr_vdev *vdev;
 	struct wlan_objmgr_psoc *psoc;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	if (!noa_event) {
 		p2p_err("invalid noa event");
@@ -1217,7 +1217,7 @@ get_p2p_soc_obj_by_vdev(struct wlan_objmgr_vdev *vdev)
 QDF_STATUS p2p_status_scan(struct wlan_objmgr_vdev *vdev)
 {
 	struct p2p_soc_priv_obj *p2p_soc_obj;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	p2p_soc_obj = get_p2p_soc_obj_by_vdev(vdev);
 	if (!p2p_soc_obj) {
@@ -1258,7 +1258,7 @@ QDF_STATUS p2p_status_scan(struct wlan_objmgr_vdev *vdev)
 QDF_STATUS p2p_status_connect(struct wlan_objmgr_vdev *vdev)
 {
 	struct p2p_soc_priv_obj *p2p_soc_obj;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	p2p_soc_obj = get_p2p_soc_obj_by_vdev(vdev);
 	if (!p2p_soc_obj) {
@@ -1300,7 +1300,7 @@ QDF_STATUS p2p_status_connect(struct wlan_objmgr_vdev *vdev)
 QDF_STATUS p2p_status_disconnect(struct wlan_objmgr_vdev *vdev)
 {
 	struct p2p_soc_priv_obj *p2p_soc_obj;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	p2p_soc_obj = get_p2p_soc_obj_by_vdev(vdev);
 	if (!p2p_soc_obj) {
@@ -1335,7 +1335,7 @@ QDF_STATUS p2p_status_disconnect(struct wlan_objmgr_vdev *vdev)
 QDF_STATUS p2p_status_start_bss(struct wlan_objmgr_vdev *vdev)
 {
 	struct p2p_soc_priv_obj *p2p_soc_obj;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	p2p_soc_obj = get_p2p_soc_obj_by_vdev(vdev);
 	if (!p2p_soc_obj) {
@@ -1371,7 +1371,7 @@ QDF_STATUS p2p_status_start_bss(struct wlan_objmgr_vdev *vdev)
 QDF_STATUS p2p_status_stop_bss(struct wlan_objmgr_vdev *vdev)
 {
 	struct p2p_soc_priv_obj *p2p_soc_obj;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	p2p_soc_obj = get_p2p_soc_obj_by_vdev(vdev);
 	if (!p2p_soc_obj) {
diff --git a/core/src/wlan_p2p_off_chan_tx.c b/core/src/wlan_p2p_off_chan_tx.c
index f75742627d36..f97937275aa8 100644
--- a/core/src/wlan_p2p_off_chan_tx.c
+++ b/core/src/wlan_p2p_off_chan_tx.c
@@ -80,7 +80,7 @@ static QDF_STATUS p2p_tx_context_check_valid(struct tx_action_context *tx_ctx)
  */
 static QDF_STATUS p2p_vdev_check_valid(struct tx_action_context *tx_ctx)
 {
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 	struct wlan_objmgr_vdev *vdev;
 	struct wlan_objmgr_psoc *psoc;
 	struct p2p_soc_priv_obj *p2p_soc_obj;
@@ -263,7 +263,7 @@ static struct p2p_noa_info *p2p_get_vdev_noa_info(
 	struct p2p_soc_priv_obj *p2p_soc_obj;
 	struct wlan_objmgr_vdev *vdev;
 	struct wlan_objmgr_psoc *psoc;
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 	struct p2p_noa_info *noa_info = NULL;
 
 	p2p_soc_obj = tx_ctx->p2p_soc_obj;