diff --git a/os_if/linux/cp_stats/src/wlan_cfg80211_ic_cp_stats.c b/os_if/linux/cp_stats/src/wlan_cfg80211_ic_cp_stats.c
index 4dcc0d5c8c..df38bb1ad8 100644
--- a/os_if/linux/cp_stats/src/wlan_cfg80211_ic_cp_stats.c
+++ b/os_if/linux/cp_stats/src/wlan_cfg80211_ic_cp_stats.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2019 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
@@ -32,19 +32,19 @@ int wlan_cfg80211_get_peer_cp_stats(struct wlan_objmgr_peer *peer_obj,
 	QDF_STATUS status;
 
 	if (!peer_obj) {
-		cfg80211_err("Invalid input, peer obj NULL");
+		osif_err("Invalid input, peer obj NULL");
 		return -EINVAL;
 	}
 
 	if (!peer_cp_stats) {
-		cfg80211_err("Invalid input, peer cp obj is NULL");
+		osif_err("Invalid input, peer cp obj is NULL");
 		return -EINVAL;
 	}
 
 	status = wlan_ucfg_get_peer_cp_stats(peer_obj, peer_cp_stats);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("wlan_cfg80211_get_peer_cp_stats status: %d",
-			     status);
+		osif_err("wlan_cfg80211_get_peer_cp_stats status: %d",
+			 status);
 	}
 
 	return qdf_status_to_os_return(status);
@@ -56,19 +56,19 @@ int wlan_cfg80211_get_vdev_cp_stats(struct wlan_objmgr_vdev *vdev_obj,
 	QDF_STATUS status;
 
 	if (!vdev_obj) {
-		cfg80211_err("Invalid input, vdev obj is NULL");
+		osif_err("Invalid input, vdev obj is NULL");
 		return -EINVAL;
 	}
 
 	if (!vdev_cp_stats) {
-		cfg80211_err("Invalid input, vdev cp obj is NULL");
+		osif_err("Invalid input, vdev cp obj is NULL");
 		return -EINVAL;
 	}
 
 	status = wlan_ucfg_get_vdev_cp_stats(vdev_obj, vdev_cp_stats);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("wlan_cfg80211_get_vdev_cp_stats status: %d",
-			     status);
+		osif_err("wlan_cfg80211_get_vdev_cp_stats status: %d",
+			 status);
 	}
 
 	return qdf_status_to_os_return(status);
@@ -80,19 +80,19 @@ int wlan_cfg80211_get_pdev_cp_stats(struct wlan_objmgr_pdev *pdev_obj,
 	QDF_STATUS status;
 
 	if (!pdev_obj) {
-		cfg80211_err("Invalid input, pdev obj is NULL");
+		osif_err("Invalid input, pdev obj is NULL");
 		return -EINVAL;
 	}
 
 	if (!pdev_cp_stats) {
-		cfg80211_err("Invalid input, pdev cp obj is NULL");
+		osif_err("Invalid input, pdev cp obj is NULL");
 		return -EINVAL;
 	}
 
 	status = wlan_ucfg_get_pdev_cp_stats(pdev_obj, pdev_cp_stats);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("wlan_cfg80211_get_pdev_cp_stats status: %d",
-			     status);
+		osif_err("wlan_cfg80211_get_pdev_cp_stats status: %d",
+			 status);
 	}
 
 	return qdf_status_to_os_return(status);
@@ -108,19 +108,19 @@ wlan_cfg80211_get_atf_peer_cp_stats(struct wlan_objmgr_peer *peer_obj,
 	QDF_STATUS status;
 
 	if (!peer_obj) {
-		cfg80211_err("Invalid input, peer obj is NULL");
+		osif_err("Invalid input, peer obj is NULL");
 		return -EINVAL;
 	}
 
 	if (!atf_cp_stats) {
-		cfg80211_err("Invalid input, ATF peer cp obj is NULL!");
+		osif_err("Invalid input, ATF peer cp obj is NULL!");
 		return -EINVAL;
 	}
 
 	status = wlan_ucfg_get_atf_peer_cp_stats(peer_obj, atf_cp_stats);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("wlan_cfg80211_get_atf_peer_cp_stats status: %d",
-			     status);
+		osif_err("wlan_cfg80211_get_atf_peer_cp_stats status: %d",
+			 status);
 	}
 
 	return qdf_status_to_os_return(status);
@@ -134,25 +134,25 @@ int wlan_cfg80211_get_atf_peer_cp_stats_from_mac(
 	QDF_STATUS status;
 
 	if (!vdev_obj) {
-		cfg80211_err("Invalid input, vdev obj is NULL");
+		osif_err("Invalid input, vdev obj is NULL");
 		return -EINVAL;
 	}
 
 	if (!mac) {
-		cfg80211_err("Invalid input, peer mac is NULL");
+		osif_err("Invalid input, peer mac is NULL");
 		return -EINVAL;
 	}
 
 	if (!atf_cp_stats) {
-		cfg80211_err("Invalid input, ATF peer cp stats obj is NULL");
+		osif_err("Invalid input, ATF peer cp stats obj is NULL");
 		return -EINVAL;
 	}
 
 	status = wlan_ucfg_get_atf_peer_cp_stats_from_mac(vdev_obj, mac,
 							  atf_cp_stats);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("wlan_cfg80211_get_cp_stats_from_mac status: %d",
-			     status);
+		osif_err("wlan_cfg80211_get_cp_stats_from_mac status: %d",
+			 status);
 	}
 
 	return qdf_status_to_os_return(status);
@@ -166,19 +166,19 @@ wlan_cfg80211_get_dcs_pdev_cp_stats(struct wlan_objmgr_pdev *pdev_obj,
 	QDF_STATUS status;
 
 	if (!pdev_obj) {
-		cfg80211_err("Invalid input, pdev obj is NULL");
+		osif_err("Invalid input, pdev obj is NULL");
 		return -EINVAL;
 	}
 
 	if (!dcs_chan_stats) {
-		cfg80211_err("Invalid input, dcs chan stats is NULL");
+		osif_err("Invalid input, dcs chan stats is NULL");
 		return -EINVAL;
 	}
 
 	status = wlan_ucfg_get_dcs_chan_stats(pdev_obj, dcs_chan_stats);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("wlan_cfg80211_get_dcs_pdev_cp_stats status: %d",
-			     status);
+		osif_err("wlan_cfg80211_get_dcs_pdev_cp_stats status: %d",
+			 status);
 	}
 
 	return qdf_status_to_os_return(status);
diff --git a/os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c b/os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c
index 77e40eade0..24bbb13195 100644
--- a/os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c
+++ b/os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c
@@ -77,38 +77,38 @@ static int wlan_cfg80211_mc_cp_stats_send_wake_lock_stats(struct wiphy *wiphy,
 	skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, nl_buf_len);
 
 	if (!skb) {
-		cfg80211_err("cfg80211_vendor_cmd_alloc_reply_skb failed");
+		osif_err("cfg80211_vendor_cmd_alloc_reply_skb failed");
 		return -ENOMEM;
 	}
 
-	cfg80211_debug("wow_ucast_wake_up_count %d",
-		       stats->ucast_wake_up_count);
-	cfg80211_debug("wow_bcast_wake_up_count %d",
-		       stats->bcast_wake_up_count);
-	cfg80211_debug("wow_ipv4_mcast_wake_up_count %d",
-		       stats->ipv4_mcast_wake_up_count);
-	cfg80211_debug("wow_ipv6_mcast_wake_up_count %d",
-		       stats->ipv6_mcast_wake_up_count);
-	cfg80211_debug("wow_ipv6_mcast_ra_stats %d",
-		       stats->ipv6_mcast_ra_stats);
-	cfg80211_debug("wow_ipv6_mcast_ns_stats %d",
-		       stats->ipv6_mcast_ns_stats);
-	cfg80211_debug("wow_ipv6_mcast_na_stats %d",
-		       stats->ipv6_mcast_na_stats);
-	cfg80211_debug("wow_icmpv4_count %d",
-		       stats->icmpv4_count);
-	cfg80211_debug("wow_icmpv6_count %d",
-		       stats->icmpv6_count);
-	cfg80211_debug("wow_rssi_breach_wake_up_count %d",
-		       stats->rssi_breach_wake_up_count);
-	cfg80211_debug("wow_low_rssi_wake_up_count %d",
-		       stats->low_rssi_wake_up_count);
-	cfg80211_debug("wow_gscan_wake_up_count %d",
-		       stats->gscan_wake_up_count);
-	cfg80211_debug("wow_pno_complete_wake_up_count %d",
-		       stats->pno_complete_wake_up_count);
-	cfg80211_debug("wow_pno_match_wake_up_count %d",
-		       stats->pno_match_wake_up_count);
+	osif_debug("wow_ucast_wake_up_count %d",
+		   stats->ucast_wake_up_count);
+	osif_debug("wow_bcast_wake_up_count %d",
+		   stats->bcast_wake_up_count);
+	osif_debug("wow_ipv4_mcast_wake_up_count %d",
+		   stats->ipv4_mcast_wake_up_count);
+	osif_debug("wow_ipv6_mcast_wake_up_count %d",
+		   stats->ipv6_mcast_wake_up_count);
+	osif_debug("wow_ipv6_mcast_ra_stats %d",
+		   stats->ipv6_mcast_ra_stats);
+	osif_debug("wow_ipv6_mcast_ns_stats %d",
+		   stats->ipv6_mcast_ns_stats);
+	osif_debug("wow_ipv6_mcast_na_stats %d",
+		   stats->ipv6_mcast_na_stats);
+	osif_debug("wow_icmpv4_count %d",
+		   stats->icmpv4_count);
+	osif_debug("wow_icmpv6_count %d",
+		   stats->icmpv6_count);
+	osif_debug("wow_rssi_breach_wake_up_count %d",
+		   stats->rssi_breach_wake_up_count);
+	osif_debug("wow_low_rssi_wake_up_count %d",
+		   stats->low_rssi_wake_up_count);
+	osif_debug("wow_gscan_wake_up_count %d",
+		   stats->gscan_wake_up_count);
+	osif_debug("wow_pno_complete_wake_up_count %d",
+		   stats->pno_complete_wake_up_count);
+	osif_debug("wow_pno_match_wake_up_count %d",
+		   stats->pno_match_wake_up_count);
 
 	ipv6_rx_multicast_addr_cnt = stats->ipv6_mcast_wake_up_count;
 	icmpv6_cnt = stats->icmpv6_count;
@@ -174,7 +174,7 @@ static int wlan_cfg80211_mc_cp_stats_send_wake_lock_stats(struct wiphy *wiphy,
 	    nla_put_u32(skb,
 			QCA_WLAN_VENDOR_ATTR_PNO_MATCH_CNT,
 			stats->pno_match_wake_up_count)) {
-		cfg80211_err("nla put fail");
+		osif_err("nla put fail");
 		goto nla_put_failure;
 	}
 
@@ -218,7 +218,7 @@ static void get_tx_power_cb(int tx_power, void *cookie)
 
 	request = osif_request_get(cookie);
 	if (!request) {
-		cfg80211_err("Obsolete request");
+		osif_err("Obsolete request");
 		return;
 	}
 
@@ -245,7 +245,7 @@ int wlan_cfg80211_mc_cp_stats_get_tx_power(struct wlan_objmgr_vdev *vdev,
 
 	request = osif_request_alloc(&params);
 	if (!request) {
-		cfg80211_err("Request allocation failure, return cached value");
+		osif_err("Request allocation failure, return cached value");
 		goto fetch_tx_power;
 	}
 
@@ -267,13 +267,13 @@ int wlan_cfg80211_mc_cp_stats_get_tx_power(struct wlan_objmgr_vdev *vdev,
 						     TYPE_CONNECTION_TX_POWER,
 						     &info);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("wlan_mc_cp_stats_request_tx_power status: %d",
-			     status);
+		osif_err("wlan_mc_cp_stats_request_tx_power status: %d",
+			 status);
 		ret = qdf_status_to_os_return(status);
 	} else {
 		ret = osif_request_wait_for_response(request);
 		if (ret)
-			cfg80211_err("wait failed or timed out ret: %d", ret);
+			osif_err("wait failed or timed out ret: %d", ret);
 		else
 			priv = osif_request_priv(request);
 	}
@@ -284,8 +284,8 @@ fetch_tx_power:
 	} else {
 		status = ucfg_mc_cp_stats_get_tx_power(vdev, dbm);
 		if (QDF_IS_STATUS_ERROR(status)) {
-			cfg80211_err("ucfg_mc_cp_stats_get_tx_power status: %d",
-				     status);
+			osif_err("ucfg_mc_cp_stats_get_tx_power status: %d",
+				 status);
 			ret = qdf_status_to_os_return(status);
 		}
 	}
@@ -317,14 +317,14 @@ static void get_peer_rssi_cb(struct stats_event *ev, void *cookie)
 
 	request = osif_request_get(cookie);
 	if (!request) {
-		cfg80211_err("Obsolete request");
+		osif_err("Obsolete request");
 		return;
 	}
 
 	priv = osif_request_priv(request);
 	rssi_size = sizeof(*ev->peer_stats) * ev->num_peer_stats;
 	if (rssi_size == 0) {
-		cfg80211_err("Invalid rssi stats");
+		osif_err("Invalid rssi stats");
 		goto get_peer_rssi_cb_fail;
 	}
 
@@ -364,7 +364,7 @@ wlan_cfg80211_mc_cp_stats_get_peer_rssi(struct wlan_objmgr_vdev *vdev,
 
 	request = osif_request_alloc(&params);
 	if (!request) {
-		cfg80211_err("Request allocation failure, return cached value");
+		osif_err("Request allocation failure, return cached value");
 		*errno = -ENOMEM;
 		qdf_mem_free(out);
 		return NULL;
@@ -380,20 +380,20 @@ wlan_cfg80211_mc_cp_stats_get_peer_rssi(struct wlan_objmgr_vdev *vdev,
 	status = ucfg_mc_cp_stats_send_stats_request(vdev, TYPE_PEER_STATS,
 						     &info);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("stats req failed: %d", status);
+		osif_err("stats req failed: %d", status);
 		*errno = qdf_status_to_os_return(status);
 		goto get_peer_rssi_fail;
 	}
 
 	*errno = osif_request_wait_for_response(request);
 	if (*errno) {
-		cfg80211_err("wait failed or timed out ret: %d", *errno);
+		osif_err("wait failed or timed out ret: %d", *errno);
 		goto get_peer_rssi_fail;
 	}
 
 	if (!priv->peer_stats || priv->num_peer_stats == 0) {
-		cfg80211_err("Invalid peer stats, count %d, data %pK",
-			     priv->num_peer_stats, priv->peer_stats);
+		osif_err("Invalid peer stats, count %d, data %pK",
+			 priv->num_peer_stats, priv->peer_stats);
 		*errno = -EINVAL;
 		goto get_peer_rssi_fail;
 	}
@@ -426,7 +426,7 @@ static void get_station_stats_cb(struct stats_event *ev, void *cookie)
 
 	request = osif_request_get(cookie);
 	if (!request) {
-		cfg80211_err("Obsolete request");
+		osif_err("Obsolete request");
 		return;
 	}
 
@@ -436,8 +436,8 @@ static void get_station_stats_cb(struct stats_event *ev, void *cookie)
 	peer_adv_size = sizeof(*ev->peer_adv_stats) * ev->num_peer_adv_stats;
 
 	if (summary_size == 0 || rssi_size == 0) {
-		cfg80211_err("Invalid stats, summary %d rssi %d",
-			     summary_size, rssi_size);
+		osif_err("Invalid stats, summary %d rssi %d",
+			 summary_size, rssi_size);
 		goto station_stats_cb_fail;
 	}
 
@@ -510,7 +510,7 @@ wlan_cfg80211_mc_cp_stats_get_station_stats(struct wlan_objmgr_vdev *vdev,
 	info.pdev_id = wlan_objmgr_pdev_get_pdev_id(wlan_vdev_get_pdev(vdev));
 	peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_CP_STATS_ID);
 	if (!peer) {
-		cfg80211_err("peer is null");
+		osif_err("peer is null");
 		*errno = -EINVAL;
 		goto get_station_stats_fail;
 	}
@@ -521,23 +521,23 @@ wlan_cfg80211_mc_cp_stats_get_station_stats(struct wlan_objmgr_vdev *vdev,
 	status = ucfg_mc_cp_stats_send_stats_request(vdev, TYPE_STATION_STATS,
 						     &info);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("Failed to send stats request status: %d", status);
+		osif_err("Failed to send stats request status: %d", status);
 		*errno = qdf_status_to_os_return(status);
 		goto get_station_stats_fail;
 	}
 
 	*errno = osif_request_wait_for_response(request);
 	if (*errno) {
-		cfg80211_err("wait failed or timed out ret: %d", *errno);
+		osif_err("wait failed or timed out ret: %d", *errno);
 		goto get_station_stats_fail;
 	}
 
 	if (!priv->vdev_summary_stats || !priv->vdev_chain_rssi ||
 	    priv->num_summary_stats == 0 || priv->num_chain_rssi_stats == 0) {
-		cfg80211_err("Invalid stats");
-		cfg80211_err("summary %d:%pK, rssi %d:%pK",
-			     priv->num_summary_stats, priv->vdev_summary_stats,
-			     priv->num_chain_rssi_stats, priv->vdev_chain_rssi);
+		osif_err("Invalid stats");
+		osif_err("summary %d:%pK, rssi %d:%pK",
+			 priv->num_summary_stats, priv->vdev_summary_stats,
+			 priv->num_chain_rssi_stats, priv->vdev_chain_rssi);
 		*errno = -EINVAL;
 		goto get_station_stats_fail;
 	}
diff --git a/os_if/linux/crypto/src/wlan_cfg80211_crypto.c b/os_if/linux/crypto/src/wlan_cfg80211_crypto.c
index c059cf146e..0d76068f3a 100644
--- a/os_if/linux/crypto/src/wlan_cfg80211_crypto.c
+++ b/os_if/linux/crypto/src/wlan_cfg80211_crypto.c
@@ -38,9 +38,9 @@ static void wlan_cfg80211_translate_key(struct wlan_objmgr_vdev *vdev,
 	qdf_mem_zero(crypto_key, sizeof(*crypto_key));
 	crypto_key->keylen = params->key_len;
 	crypto_key->keyix = key_index;
-	cfg80211_debug("key_type %d, opmode %d, key_len %d, seq_len %d",
-		       key_type, vdev->vdev_mlme.vdev_opmode,
-		       params->key_len, params->seq_len);
+	osif_debug("key_type %d, opmode %d, key_len %d, seq_len %d",
+		   key_type, vdev->vdev_mlme.vdev_opmode,
+		   params->key_len, params->seq_len);
 	qdf_mem_copy(&crypto_key->keyval[0], params->key, params->key_len);
 	qdf_mem_copy(&crypto_key->keyrsc[0], params->seq, params->seq_len);
 
@@ -52,7 +52,7 @@ static void wlan_cfg80211_translate_key(struct wlan_objmgr_vdev *vdev,
 		 * but since we did not connect yet, so we do not know the peer
 		 * address yet.
 		 */
-		cfg80211_debug("No Mac Address to copy");
+		osif_debug("No Mac Address to copy");
 		return;
 	}
 	if (key_type == WLAN_CRYPTO_KEY_TYPE_UNICAST) {
@@ -67,7 +67,7 @@ static void wlan_cfg80211_translate_key(struct wlan_objmgr_vdev *vdev,
 				     vdev->vdev_mlme.macaddr,
 				     QDF_MAC_ADDR_SIZE);
 	}
-	cfg80211_debug("mac %pM", crypto_key->macaddr);
+	osif_debug("mac %pM", crypto_key->macaddr);
 }
 
 int wlan_cfg80211_store_key(struct wlan_objmgr_vdev *vdev,
@@ -81,24 +81,24 @@ int wlan_cfg80211_store_key(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status;
 
 	if (!vdev) {
-		cfg80211_err("vdev is NULL");
+		osif_err("vdev is NULL");
 		return -EINVAL;
 	}
 	if (!params) {
-		cfg80211_err("Key params is NULL");
+		osif_err("Key params is NULL");
 		return -EINVAL;
 	}
 	cipher_len = osif_nl_to_crypto_cipher_len(params->cipher);
 	if (cipher_len < 0 || params->key_len < cipher_len) {
-		cfg80211_err("cipher length %d less than reqd len %d",
-			     params->key_len, cipher_len);
+		osif_err("cipher length %d less than reqd len %d",
+			 params->key_len, cipher_len);
 		return -EINVAL;
 	}
 	cipher = osif_nl_to_crypto_cipher_type(params->cipher);
 	if (!IS_WEP_CIPHER(cipher)) {
 		if ((key_type == WLAN_CRYPTO_KEY_TYPE_UNICAST) &&
 		    !mac_addr) {
-			cfg80211_err("mac_addr is NULL for pairwise Key");
+			osif_err("mac_addr is NULL for pairwise Key");
 			return -EINVAL;
 		}
 	}
@@ -106,7 +106,7 @@ int wlan_cfg80211_store_key(struct wlan_objmgr_vdev *vdev,
 						 params->key_len,
 						 params->seq_len);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("Invalid key params");
+		osif_err("Invalid key params");
 		return -EINVAL;
 	}
 
@@ -121,7 +121,7 @@ int wlan_cfg80211_store_key(struct wlan_objmgr_vdev *vdev,
 			return -EINVAL;
 		status = wlan_crypto_save_key(vdev, key_index, crypto_key);
 		if (QDF_IS_STATUS_ERROR(status)) {
-			cfg80211_err("Failed to save key");
+			osif_err("Failed to save key");
 			qdf_mem_free(crypto_key);
 			return -EINVAL;
 		}
@@ -142,7 +142,7 @@ int wlan_cfg80211_crypto_add_key(struct wlan_objmgr_vdev *vdev,
 
 	crypto_key = wlan_crypto_get_key(vdev, key_index);
 	if (!crypto_key) {
-		cfg80211_err("Crypto KEY is NULL");
+		osif_err("Crypto KEY is NULL");
 		return -EINVAL;
 	}
 	status  = ucfg_crypto_set_key_req(vdev, crypto_key, key_type);
diff --git a/os_if/linux/mlme/src/wlan_cfg80211_vdev_mlme.c b/os_if/linux/mlme/src/wlan_cfg80211_vdev_mlme.c
index 54eecf5855..16a6a0cd85 100644
--- a/os_if/linux/mlme/src/wlan_cfg80211_vdev_mlme.c
+++ b/os_if/linux/mlme/src/wlan_cfg80211_vdev_mlme.c
@@ -31,7 +31,7 @@ wlan_cfg80211_vdev_mlme_get_param_ssid(struct wlan_objmgr_vdev *vdev,
 				       uint8_t *ssid_len)
 {
 	if (!vdev) {
-		cfg80211_err("VDEV is NULL!!!!");
+		osif_err("VDEV is NULL!!!!");
 		return qdf_status_to_os_return(QDF_STATUS_E_FAILURE);
 	}
 
@@ -44,7 +44,7 @@ wlan_cfg80211_vdev_mlme_get_trans_bssid(struct wlan_objmgr_vdev *vdev,
 					uint8_t *addr)
 {
 	if (!vdev) {
-		cfg80211_err("VDEV is NULL!!!!");
+		osif_err("VDEV is NULL!!!!");
 		return qdf_status_to_os_return(QDF_STATUS_E_FAILURE);
 	}
 
@@ -58,7 +58,7 @@ wlan_cfg80211_vdev_mlme_set_param(struct wlan_objmgr_vdev *vdev,
 				  struct wlan_vdev_mgr_cfg mlme_cfg)
 {
 	if (!vdev) {
-		cfg80211_err("VDEV is NULL!!!!");
+		osif_err("VDEV is NULL!!!!");
 		return;
 	}
 
@@ -71,7 +71,7 @@ wlan_cfg80211_vdev_mlme_get_param(struct wlan_objmgr_vdev *vdev,
 				  uint32_t *value)
 {
 	if (!vdev) {
-		cfg80211_err("VDEV is NULL!!!!");
+		osif_err("VDEV is NULL!!!!");
 		return;
 	}
 
diff --git a/os_if/linux/scan/src/wlan_cfg80211_scan.c b/os_if/linux/scan/src/wlan_cfg80211_scan.c
index c6fda4ca75..441641bc66 100644
--- a/os_if/linux/scan/src/wlan_cfg80211_scan.c
+++ b/os_if/linux/scan/src/wlan_cfg80211_scan.c
@@ -85,8 +85,8 @@ static void wlan_fill_scan_rand_attrs(struct wlan_objmgr_vdev *vdev,
 	*randomize = true;
 	memcpy(addr, mac_addr, QDF_MAC_ADDR_SIZE);
 	memcpy(mask, mac_addr_mask, QDF_MAC_ADDR_SIZE);
-	cfg80211_debug("Random mac addr: %pM and Random mac mask: %pM",
-		       addr, mask);
+	osif_debug("Random mac addr: %pM and Random mac mask: %pM",
+		   addr, mask);
 }
 
 /**
@@ -176,8 +176,8 @@ wlan_config_sched_scan_plan(struct pno_scan_req_params *pno_req,
 		pno_req->slow_scan_period =
 			request->scan_plans[0].interval * MSEC_PER_SEC;
 	} else {
-		cfg80211_err("Invalid number of scan plans %d !!",
-			request->n_scan_plans);
+		osif_err("Invalid number of scan plans %d !!",
+			 request->n_scan_plans);
 	}
 }
 #else
@@ -198,8 +198,8 @@ __wlan_config_sched_scan_plan(struct pno_scan_req_params *pno_req,
 	pno_req->fast_scan_max_cycles = scan_timer_repeat_value;
 	pno_req->slow_scan_period =
 		(slow_scan_multiplier * pno_req->fast_scan_period);
-	cfg80211_debug("Base scan interval: %d sec PNO Scan Timer Repeat Value: %d",
-		  (request->interval / 1000), scan_timer_repeat_value);
+	osif_debug("Base scan interval: %d sec PNO Scan Timer Repeat Value: %d",
+		   (request->interval / 1000), scan_timer_repeat_value);
 }
 #endif
 
@@ -236,17 +236,17 @@ static void wlan_cfg80211_pno_callback(struct wlan_objmgr_vdev *vdev,
 	if (event->type != SCAN_EVENT_TYPE_NLO_COMPLETE)
 		return;
 
-	cfg80211_debug("vdev id = %d", event->vdev_id);
+	osif_debug("vdev id = %d", event->vdev_id);
 
 	pdev = wlan_vdev_get_pdev(vdev);
 	if (!pdev) {
-		cfg80211_err("pdev is NULL");
+		osif_err("pdev is NULL");
 		return;
 	}
 
 	pdev_ospriv = wlan_pdev_get_ospriv(pdev);
 	if (!pdev_ospriv) {
-		cfg80211_err("pdev_ospriv is NULL");
+		osif_err("pdev_ospriv is NULL");
 		return;
 	}
 	wlan_cfg80211_sched_scan_results(pdev_ospriv->wiphy, 0);
@@ -270,7 +270,7 @@ static QDF_STATUS wlan_cfg80211_is_chan_ok_for_dnbs(
 	QDF_STATUS status = policy_mgr_is_chan_ok_for_dnbs(psoc, channel, ok);
 
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("DNBS check failed");
+		osif_err("DNBS check failed");
 		return status;
 	}
 
@@ -402,7 +402,7 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 	bool enable_dfs_pno_chnl_scan;
 
 	if (ucfg_scan_get_pno_in_progress(vdev)) {
-		cfg80211_debug("pno is already in progress");
+		osif_debug("pno is already in progress");
 		return -EBUSY;
 	}
 
@@ -412,7 +412,7 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 				wlan_objmgr_pdev_get_pdev_id(pdev),
 				INVAL_VDEV_ID, INVAL_SCAN_ID, true);
 		if (QDF_IS_STATUS_ERROR(status)) {
-			cfg80211_err("aborting the existing scan is unsuccessful");
+			osif_err("aborting the existing scan is unsuccessful");
 			return -EBUSY;
 		}
 	}
@@ -430,15 +430,15 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 
 	if ((!req->networks_cnt) ||
 	    (req->networks_cnt > SCAN_PNO_MAX_SUPP_NETWORKS)) {
-		cfg80211_err("Network input is not correct %d",
-			req->networks_cnt);
+		osif_err("Network input is not correct %d",
+			 req->networks_cnt);
 		ret = -EINVAL;
 		goto error;
 	}
 
 	if (request->n_channels > SCAN_PNO_MAX_NETW_CHANNELS_EX) {
-		cfg80211_err("Incorrect number of channels %d",
-			request->n_channels);
+		osif_err("Incorrect number of channels %d",
+			 request->n_channels);
 		ret = -EINVAL;
 		goto error;
 	}
@@ -457,8 +457,8 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 			channel = request->channels[i]->hw_value;
 			if ((!enable_dfs_pno_chnl_scan) &&
 			    (wlan_reg_is_dfs_ch(pdev, channel))) {
-				cfg80211_debug("Dropping DFS channel :%d",
-					       channel);
+				osif_debug("Dropping DFS channel :%d",
+					   channel);
 				continue;
 			}
 			if (wlan_reg_is_dsrc_chan(pdev, channel))
@@ -472,7 +472,7 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 								  channel,
 								  &ok);
 				if (QDF_IS_STATUS_ERROR(status)) {
-					cfg80211_err("DNBS check failed");
+					osif_err("DNBS check failed");
 					qdf_mem_free(chl);
 					chl = NULL;
 					ret = -EINVAL;
@@ -484,15 +484,15 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 			len += snprintf(chl + len, 5, "%d ", channel);
 			valid_ch[num_chan++] = wlan_chan_to_freq(channel);
 		}
-		cfg80211_notice("No. of Scan Channels: %d", num_chan);
-		cfg80211_notice("Channel-List: %s", chl);
+		osif_notice("No. of Scan Channels: %d", num_chan);
+		osif_notice("Channel-List: %s", chl);
 		qdf_mem_free(chl);
 		chl = NULL;
 		/* If all channels are DFS and dropped,
 		 * then ignore the PNO request
 		 */
 		if (!num_chan) {
-			cfg80211_notice("Channel list empty due to filtering of DSRC");
+			osif_notice("Channel list empty due to filtering of DSRC");
 			ret = -EINVAL;
 			goto error;
 		}
@@ -505,8 +505,8 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 
 		if ((!req->networks_list[i].ssid.length) ||
 		    (req->networks_list[i].ssid.length > WLAN_SSID_MAX_LEN)) {
-			cfg80211_err(" SSID Len %d is not correct for network %d",
-				  req->networks_list[i].ssid.length, i);
+			osif_err(" SSID Len %d is not correct for network %d",
+				 req->networks_list[i].ssid.length, i);
 			ret = -EINVAL;
 			goto error;
 		}
@@ -518,9 +518,9 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 		req->networks_list[i].encryption = 0;       /*eED_ANY */
 		req->networks_list[i].bc_new_type = 0;    /*eBCAST_UNKNOWN */
 
-		cfg80211_notice("Received ssid:%.*s",
-			req->networks_list[i].ssid.length,
-			req->networks_list[i].ssid.ssid);
+		osif_notice("Received ssid:%.*s",
+			    req->networks_list[i].ssid.length,
+			    req->networks_list[i].ssid.ssid);
 
 		/*Copying list of valid channel into request */
 		qdf_mem_copy(req->networks_list[i].channels, valid_ch,
@@ -551,8 +551,8 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 			j++;
 		}
 	}
-	cfg80211_notice("Number of hidden networks being Configured = %d",
-		  request->n_ssids);
+	osif_notice("Number of hidden networks being Configured = %d",
+		    request->n_ssids);
 
 	/*
 	 * Before Kernel 4.4
@@ -574,9 +574,9 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 	wlan_config_sched_scan_plan(req, request);
 	req->delay_start_time = wlan_config_sched_scan_start_delay(request);
 	req->scan_backoff_multiplier = scan_backoff_multiplier;
-	cfg80211_notice("Base scan interval: %d sec, scan cycles: %d, slow scan interval %d",
-		req->fast_scan_period, req->fast_scan_max_cycles,
-		req->slow_scan_period);
+	osif_notice("Base scan interval: %d sec, scan cycles: %d, slow scan interval %d",
+		    req->fast_scan_period, req->fast_scan_max_cycles,
+		    req->slow_scan_period);
 	wlan_hdd_sched_scan_update_relative_rssi(req, request);
 
 	psoc = wlan_pdev_get_psoc(pdev);
@@ -591,12 +591,12 @@ int wlan_cfg80211_sched_scan_start(struct wlan_objmgr_vdev *vdev,
 		ucfg_copy_ie_whitelist_attrs(psoc, &req->ie_whitelist);
 	status = ucfg_scan_pno_start(vdev, req);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("Failed to enable PNO");
+		osif_err("Failed to enable PNO");
 		ret = -EINVAL;
 		goto error;
 	}
 
-	cfg80211_info("PNO scan request offloaded");
+	osif_info("PNO scan request offloaded");
 
 error:
 	qdf_mem_free(req);
@@ -609,9 +609,9 @@ int wlan_cfg80211_sched_scan_stop(struct wlan_objmgr_vdev *vdev)
 
 	status = ucfg_scan_pno_stop(vdev);
 	if (QDF_IS_STATUS_ERROR(status))
-		cfg80211_err("Failed to disabled PNO");
+		osif_err("Failed to disabled PNO");
 	else
-		cfg80211_info("PNO scan disabled");
+		osif_info("PNO scan disabled");
 
 	return 0;
 }
@@ -686,8 +686,8 @@ static int wlan_scan_request_enqueue(struct wlan_objmgr_pdev *pdev,
 		status = QDF_STATUS_E_RESOURCES;
 	qdf_mutex_release(&osif_scan->scan_req_q_lock);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_debug_rl("Failed to enqueue Scan Req as max scan %d already queued",
-			          qdf_list_size(&osif_scan->scan_req_q));
+		osif_rl_debug("Failed to enqueue Scan Req as max scan %d already queued",
+			      qdf_list_size(&osif_scan->scan_req_q));
 		qdf_mem_free(scan_req);
 		return -EINVAL;
 	}
@@ -716,23 +716,23 @@ static QDF_STATUS wlan_scan_request_dequeue(
 	struct pdev_osif_priv *osif_ctx;
 	struct osif_scan_pdev *scan_priv;
 
-	cfg80211_debug("Dequeue Scan id: %d", scan_id);
+	osif_debug("Dequeue Scan id: %d", scan_id);
 
 	if ((!source) || (!req)) {
-		cfg80211_err("source or request is NULL");
+		osif_err("source or request is NULL");
 		return QDF_STATUS_E_NULL_VALUE;
 	}
 
 	/* Get NL global context from objmgr*/
 	osif_ctx = wlan_pdev_get_ospriv(pdev);
 	if (!osif_ctx) {
-		cfg80211_err("Failed to retrieve osif context");
+		osif_err("Failed to retrieve osif context");
 		return status;
 	}
 	scan_priv = osif_ctx->osif_scan;
 
 	if (qdf_list_empty(&scan_priv->scan_req_q)) {
-		cfg80211_info("Scan List is empty");
+		osif_info("Scan List is empty");
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -740,40 +740,38 @@ static QDF_STATUS wlan_scan_request_dequeue(
 	if (QDF_STATUS_SUCCESS !=
 		qdf_list_peek_front(&scan_priv->scan_req_q, &next_node)) {
 		qdf_mutex_release(&scan_priv->scan_req_q_lock);
-		cfg80211_err("Failed to remove Scan Req from queue");
+		osif_err("Failed to remove Scan Req from queue");
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	do {
 		node = next_node;
-		scan_req = qdf_container_of(node, struct scan_req,
-					node);
+		scan_req = qdf_container_of(node, struct scan_req, node);
 		if (scan_req->scan_id == scan_id) {
 			status = qdf_list_remove_node(&scan_priv->scan_req_q,
-					node);
+						      node);
 			if (status == QDF_STATUS_SUCCESS) {
 				*req = scan_req->scan_request;
 				*source = scan_req->source;
 				*dev = scan_req->dev;
 				qdf_mem_free(scan_req);
 				qdf_mutex_release(&scan_priv->scan_req_q_lock);
-				cfg80211_debug("removed Scan id: %d, req = %pK, pending scans %d",
-					       scan_id, req,
-					       qdf_list_size(&scan_priv->
-							     scan_req_q));
+				osif_debug("removed Scan id: %d, req = %pK, pending scans %d",
+					   scan_id, req,
+					   qdf_list_size(&scan_priv->scan_req_q));
 				return QDF_STATUS_SUCCESS;
 			} else {
 				qdf_mutex_release(&scan_priv->scan_req_q_lock);
-				cfg80211_err("Failed to remove node scan id %d, pending scans %d",
-				      scan_id,
-				      qdf_list_size(&scan_priv->scan_req_q));
+				osif_err("Failed to remove node scan id %d, pending scans %d",
+					 scan_id,
+					 qdf_list_size(&scan_priv->scan_req_q));
 				return status;
 			}
 		}
 	} while (QDF_STATUS_SUCCESS ==
 		qdf_list_peek_next(&scan_priv->scan_req_q, node, &next_node));
 	qdf_mutex_release(&scan_priv->scan_req_q_lock);
-	cfg80211_err("Failed to find scan id %d", scan_id);
+	osif_err("Failed to find scan id %d", scan_id);
 
 	return status;
 }
@@ -845,7 +843,7 @@ static void wlan_vendor_scan_callback(struct cfg80211_scan_request *req,
 			GFP_ATOMIC);
 
 	if (!skb) {
-		cfg80211_err("skb alloc failed");
+		osif_err("skb alloc failed");
 		qdf_mem_free(req);
 		return;
 	}
@@ -980,31 +978,29 @@ static void wlan_cfg80211_scan_done_callback(
 	if (!util_is_scan_completed(event, &success))
 		return;
 
-	cfg80211_debug("scan ID = %d vdev id = %d, event type %s(%d) reason = %s(%d)",
-		       scan_id, event->vdev_id,
-		       util_scan_get_ev_type_name(event->type), event->type,
-		       util_scan_get_ev_reason_name(event->reason),
-		       event->reason);
+	osif_debug("scan ID = %d vdev id = %d, event type %s(%d) reason = %s(%d)",
+		   scan_id, event->vdev_id,
+		   util_scan_get_ev_type_name(event->type), event->type,
+		   util_scan_get_ev_reason_name(event->reason),
+		   event->reason);
 
 	pdev = wlan_vdev_get_pdev(vdev);
 	status = wlan_scan_request_dequeue(
 			pdev, scan_id, &req, &source, &netdev);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("Dequeue of scan request failed ID: %d", scan_id);
+		osif_err("Dequeue of scan request failed ID: %d", scan_id);
 		goto allow_suspend;
 	}
 
 	if (!netdev) {
-		cfg80211_err("net dev is NULL,Drop scan event Id: %d",
-				 scan_id);
+		osif_err("net dev is NULL,Drop scan event Id: %d", scan_id);
 		goto allow_suspend;
 	}
 
 	/* Make sure vdev is active */
 	status = wlan_objmgr_vdev_try_get_ref(vdev, WLAN_OSIF_ID);
 	if (QDF_IS_STATUS_ERROR(status)) {
-		cfg80211_err("Failed to get vdev reference: scan Id: %d",
-				 scan_id);
+		osif_err("Failed to get vdev reference: scan Id: %d", scan_id);
 		goto allow_suspend;
 	}
 
@@ -1173,7 +1169,7 @@ wlan_cfg80211_enqueue_for_cleanup(qdf_list_t *scan_cleanup_q,
 				qdf_list_remove_node(&scan_priv->scan_req_q,
 						     node)) {
 				qdf_mutex_release(&scan_priv->scan_req_q_lock);
-				cfg80211_err("Failed to remove scan request");
+				osif_err("Failed to remove scan request");
 				return;
 			}
 			qdf_mem_free(scan_req);
@@ -1196,7 +1192,7 @@ void wlan_cfg80211_cleanup_scan_queue(struct wlan_objmgr_pdev *pdev,
 	qdf_list_node_t *node = NULL;
 
 	if (!pdev) {
-		cfg80211_err("pdev is Null");
+		osif_err("pdev is Null");
 		return;
 	}
 
@@ -1214,7 +1210,7 @@ void wlan_cfg80211_cleanup_scan_queue(struct wlan_objmgr_pdev *pdev,
 	while (!qdf_list_empty(&scan_cleanup_q)) {
 		if (QDF_STATUS_SUCCESS != qdf_list_remove_front(&scan_cleanup_q,
 								&node)) {
-			cfg80211_err("Failed to remove scan request");
+			osif_err("Failed to remove scan request");
 			return;
 		}
 		scan_req = container_of(node, struct scan_req, node);
@@ -1298,14 +1294,14 @@ int wlan_cfg80211_scan(struct wlan_objmgr_vdev *vdev,
 
 	psoc = wlan_pdev_get_psoc(pdev);
 	if (!psoc) {
-		cfg80211_err("Invalid psoc object");
+		osif_err("Invalid psoc object");
 		return -EINVAL;
 	}
 
 	/* Get NL global context from objmgr*/
 	osif_priv = wlan_pdev_get_ospriv(pdev);
 	if (!osif_priv) {
-		cfg80211_err("Invalid osif priv object");
+		osif_err("Invalid osif priv object");
 		return -EINVAL;
 	}
 
@@ -1315,7 +1311,7 @@ int wlan_cfg80211_scan(struct wlan_objmgr_vdev *vdev,
 	 */
 	if (!wlan_cfg80211_allow_simultaneous_scan(psoc) &&
 	    !qdf_list_empty(&osif_priv->osif_scan->scan_req_q)) {
-		cfg80211_err("Simultaneous scan disabled, reject scan");
+		osif_err("Simultaneous scan disabled, reject scan");
 		return -EBUSY;
 	}
 
@@ -1329,7 +1325,7 @@ int wlan_cfg80211_scan(struct wlan_objmgr_vdev *vdev,
 	req_id = osif_priv->osif_scan->req_id;
 	scan_id = ucfg_scan_get_scan_id(psoc);
 	if (!scan_id) {
-		cfg80211_err("Invalid scan id");
+		osif_err("Invalid scan id");
 		qdf_mem_free(req);
 		return -EINVAL;
 	}
@@ -1366,9 +1362,9 @@ int wlan_cfg80211_scan(struct wlan_objmgr_vdev *vdev,
 		req->scan_req.num_ssids = request->n_ssids;
 
 		if (req->scan_req.num_ssids > WLAN_SCAN_MAX_NUM_SSID) {
-			cfg80211_info("number of ssid received %d is greater than MAX %d so copy only MAX nuber of SSIDs",
-				      req->scan_req.num_ssids,
-				      WLAN_SCAN_MAX_NUM_SSID);
+			osif_info("number of ssid received %d is greater than MAX %d so copy only MAX nuber of SSIDs",
+				  req->scan_req.num_ssids,
+				  WLAN_SCAN_MAX_NUM_SSID);
 			req->scan_req.num_ssids = WLAN_SCAN_MAX_NUM_SSID;
 		}
 		/* copy all the ssid's and their length */
@@ -1381,8 +1377,8 @@ int wlan_cfg80211_scan(struct wlan_objmgr_vdev *vdev,
 			qdf_mem_copy(pssid->ssid,
 				     &request->ssids[j].ssid[0],
 				     pssid->length);
-			cfg80211_info("SSID number %d: %.*s", j, pssid->length,
-				      pssid->ssid);
+			osif_info("SSID number %d: %.*s", j, pssid->length,
+				  pssid->ssid);
 		}
 	}
 	if (request->ssids ||
@@ -1454,7 +1450,7 @@ int wlan_cfg80211_scan(struct wlan_objmgr_vdev *vdev,
 								       &ok);
 
 				if (QDF_IS_STATUS_ERROR(qdf_status)) {
-					cfg80211_err("DNBS check failed");
+					osif_err("DNBS check failed");
 					qdf_mem_free(chl);
 					chl = NULL;
 					ret = -EINVAL;
@@ -1477,13 +1473,13 @@ int wlan_cfg80211_scan(struct wlan_objmgr_vdev *vdev,
 			if (num_chan >= WLAN_SCAN_MAX_NUM_CHANNELS)
 				break;
 		}
-		cfg80211_info("Channel-List: %s", chl);
+		osif_info("Channel-List: %s", chl);
 		qdf_mem_free(chl);
 		chl = NULL;
-		cfg80211_info("No. of Scan Channels: %d", num_chan);
+		osif_info("No. of Scan Channels: %d", num_chan);
 	}
 	if (!num_chan) {
-		cfg80211_err("Received zero non-dsrc channels");
+		osif_err("Received zero non-dsrc channels");
 		ret = -EINVAL;
 		goto err;
 	}
@@ -1557,9 +1553,9 @@ int wlan_cfg80211_scan(struct wlan_objmgr_vdev *vdev,
 
 	qdf_status = ucfg_scan_start(req);
 	if (QDF_IS_STATUS_ERROR(qdf_status)) {
-		cfg80211_err("ucfg_scan_start returned error %d", qdf_status);
+		osif_err("ucfg_scan_start returned error %d", qdf_status);
 		if (qdf_status == QDF_STATUS_E_RESOURCES)
-			cfg80211_err("HO is in progress.So defer the scan by informing busy");
+			osif_err("HO is in progress.So defer the scan by informing busy");
 		wlan_scan_request_dequeue(pdev, scan_id, &request,
 					  &params->source, &netdev);
 		if (qdf_list_empty(&osif_priv->osif_scan->scan_req_q)) {
@@ -1604,14 +1600,14 @@ static int wlan_get_scanid(struct wlan_objmgr_pdev *pdev,
 	/* Get NL global context from objmgr*/
 	osif_ctx = wlan_pdev_get_ospriv(pdev);
 	if (!osif_ctx) {
-		cfg80211_err("Failed to retrieve osif context");
+		osif_err("Failed to retrieve osif context");
 		return ret;
 	}
 	scan_priv = osif_ctx->osif_scan;
 	qdf_mutex_acquire(&scan_priv->scan_req_q_lock);
 	if (qdf_list_empty(&scan_priv->scan_req_q)) {
 		qdf_mutex_release(&scan_priv->scan_req_q_lock);
-		cfg80211_err("Failed to retrieve scan id");
+		osif_err("Failed to retrieve scan id");
 		return ret;
 	}
 
@@ -1657,7 +1653,7 @@ QDF_STATUS wlan_abort_scan(struct wlan_objmgr_pdev *pdev,
 	/* Get NL global context from objmgr*/
 	osif_ctx = wlan_pdev_get_ospriv(pdev);
 	if (!osif_ctx) {
-		cfg80211_err("Failed to retrieve osif context");
+		osif_err("Failed to retrieve osif context");
 		qdf_mem_free(req);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1668,7 +1664,7 @@ QDF_STATUS wlan_abort_scan(struct wlan_objmgr_pdev *pdev,
 				vdev_id, WLAN_OSIF_ID);
 
 	if (!vdev) {
-		cfg80211_err("Failed get vdev");
+		osif_err("Failed get vdev");
 		qdf_mem_free(req);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -1690,7 +1686,7 @@ QDF_STATUS wlan_abort_scan(struct wlan_objmgr_pdev *pdev,
 	else
 		status = ucfg_scan_cancel(req);
 	if (QDF_IS_STATUS_ERROR(status))
-		cfg80211_err("Cancel scan request failed");
+		osif_err("Cancel scan request failed");
 
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_OSIF_ID);
 
@@ -1723,7 +1719,7 @@ int wlan_vendor_abort_scan(struct wlan_objmgr_pdev *pdev,
 	pdev_id = wlan_objmgr_pdev_get_pdev_id(pdev);
 	if (wlan_cfg80211_nla_parse(tb, QCA_WLAN_VENDOR_ATTR_SCAN_MAX, data,
 				    data_len, scan_policy)) {
-		cfg80211_err("Invalid ATTR");
+		osif_err("Invalid ATTR");
 		return ret;
 	}
 
@@ -1752,8 +1748,7 @@ wlan_get_ieee80211_channel(struct wiphy *wiphy,
 	freq = wlan_reg_chan_to_freq(pdev, chan_no);
 	chan = ieee80211_get_channel(wiphy, freq);
 	if (!chan)
-		cfg80211_err("chan is NULL, chan_no: %d freq: %d",
-			chan_no, freq);
+		osif_err("chan is NULL, chan_no: %d freq: %d", chan_no, freq);
 
 	return chan;
 }
@@ -1824,7 +1819,7 @@ static void wlan_fill_per_chain_rssi(struct cfg80211_inform_bss *data,
 	uint32_t i;
 
 	if (!bss || !data) {
-		cfg80211_err("Received bss is NULL");
+		osif_err("Received bss is NULL");
 		return;
 	}
 	for (i = 0; i < WLAN_MGMT_TXRX_HOST_MAX_ANTENNA; i++) {
@@ -1850,7 +1845,7 @@ wlan_cfg80211_inform_bss_frame_data(struct wiphy *wiphy,
 	struct cfg80211_inform_bss data  = {0};
 
 	if (!bss) {
-		cfg80211_err("bss is null");
+		osif_err("bss is null");
 		return NULL;
 	}
 	wlan_fill_per_chain_rssi(&data, bss);
@@ -1896,7 +1891,7 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,
 	struct wlan_cfg80211_inform_bss bss_data = {0};
 
 	if (!pdev_ospriv) {
-		cfg80211_err("os_priv is NULL");
+		osif_err("os_priv is NULL");
 		return;
 	}
 
@@ -1905,8 +1900,8 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,
 	bss_data.frame_len = wlan_get_frame_len(scan_params);
 	bss_data.mgmt = qdf_mem_malloc_atomic(bss_data.frame_len);
 	if (!bss_data.mgmt) {
-		cfg80211_err("mem alloc failed for bss %pM seq %d",
-			     bss_data.mgmt->bssid, scan_params->seq_num);
+		osif_err("mem alloc failed for bss %pM seq %d",
+			 bss_data.mgmt->bssid, scan_params->seq_num);
 		return;
 	}
 	qdf_mem_copy(bss_data.mgmt,
@@ -1927,9 +1922,9 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,
 	bss_data.chan = wlan_get_ieee80211_channel(wiphy, pdev,
 		scan_params->channel.chan_idx);
 	if (!bss_data.chan) {
-		cfg80211_err("Channel not found for bss %pM seq %d chan %d",
-			     bss_data.mgmt->bssid, scan_params->seq_num,
-			     scan_params->channel.chan_idx);
+		osif_err("Channel not found for bss %pM seq %d chan %d",
+			 bss_data.mgmt->bssid, scan_params->seq_num,
+			 scan_params->channel.chan_idx);
 		qdf_mem_free(bss_data.mgmt);
 		return;
 	}
@@ -1947,8 +1942,8 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,
 
 	bss = wlan_cfg80211_inform_bss_frame_data(wiphy, &bss_data);
 	if (!bss)
-		cfg80211_err("failed to inform bss %pM seq %d",
-			     bss_data.mgmt->bssid, scan_params->seq_num);
+		osif_err("failed to inform bss %pM seq %d",
+			 bss_data.mgmt->bssid, scan_params->seq_num);
 	else
 		wlan_cfg80211_put_bss(wiphy, bss);
 
@@ -1988,7 +1983,7 @@ void wlan_cfg80211_unlink_bss_list(struct wlan_objmgr_pdev *pdev,
 	struct wiphy *wiphy;
 
 	if (!pdev_ospriv) {
-		cfg80211_err("os_priv is NULL");
+		osif_err("os_priv is NULL");
 		return;
 	}
 
@@ -1997,10 +1992,10 @@ void wlan_cfg80211_unlink_bss_list(struct wlan_objmgr_pdev *pdev,
 				    scan_entry->ssid.ssid,
 				    scan_entry->ssid.length);
 	if (!bss) {
-		cfg80211_err("BSS %pM not found", scan_entry->bssid.bytes);
+		osif_err("BSS %pM not found", scan_entry->bssid.bytes);
 	} else {
-		cfg80211_debug("cfg80211_unlink_bss called for BSSID %pM",
-			       scan_entry->bssid.bytes);
+		osif_debug("cfg80211_unlink_bss called for BSSID %pM",
+			   scan_entry->bssid.bytes);
 		cfg80211_unlink_bss(wiphy, bss);
 		wlan_cfg80211_put_bss(wiphy, bss);
 	}
diff --git a/os_if/linux/wifi_pos/src/os_if_wifi_pos.c b/os_if/linux/wifi_pos/src/os_if_wifi_pos.c
index 9c73562049..17762a085a 100644
--- a/os_if/linux/wifi_pos/src/os_if_wifi_pos.c
+++ b/os_if/linux/wifi_pos/src/os_if_wifi_pos.c
@@ -50,13 +50,13 @@ static void os_if_wifi_pos_send_rsp(uint32_t pid, uint32_t rsp_msg_type,
 
 	/* OEM msg is always to a specific process and cannot be a broadcast */
 	if (pid == 0) {
-		cfg80211_err("invalid dest pid");
+		osif_err("invalid dest pid");
 		return;
 	}
 
 	skb = alloc_skb(NLMSG_SPACE(sizeof(tAniMsgHdr) + buf_len), GFP_ATOMIC);
 	if (!skb) {
-		cfg80211_alert("alloc_skb failed");
+		osif_alert("alloc_skb failed");
 		return;
 	}
 
@@ -73,8 +73,8 @@ static void os_if_wifi_pos_send_rsp(uint32_t pid, uint32_t rsp_msg_type,
 	aniHdr->length = buf_len;
 
 	skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr) + buf_len));
-	cfg80211_debug("sending oem rsp: type: %d len(%d) to pid (%d)",
-		      rsp_msg_type, buf_len, pid);
+	osif_debug("sending oem rsp: type: %d len(%d) to pid (%d)",
+		   rsp_msg_type, buf_len, pid);
 	nl_srv_ucast_oem(skb, pid, MSG_DONTWAIT);
 }
 
@@ -86,18 +86,18 @@ static int  wifi_pos_parse_req(const void *data, int len, int pid,
 	struct nlattr *tb[CLD80211_ATTR_MAX + 1];
 
 	if (wlan_cfg80211_nla_parse(tb, CLD80211_ATTR_MAX, data, len, NULL)) {
-		cfg80211_err("invalid data in request");
+		osif_err("invalid data in request");
 		return OEM_ERR_INVALID_MESSAGE_TYPE;
 	}
 
 	if (!tb[CLD80211_ATTR_DATA]) {
-		cfg80211_err("CLD80211_ATTR_DATA not present");
+		osif_err("CLD80211_ATTR_DATA not present");
 		return OEM_ERR_INVALID_MESSAGE_TYPE;
 	}
 
 	msg_hdr = (tAniMsgHdr *)nla_data(tb[CLD80211_ATTR_DATA]);
 	if (!msg_hdr) {
-		cfg80211_err("msg_hdr null");
+		osif_err("msg_hdr null");
 		return OEM_ERR_NULL_MESSAGE_HEADER;
 	}
 
@@ -124,19 +124,19 @@ static int wifi_pos_parse_req(struct sk_buff *skb, struct wifi_pos_req_msg *req)
 
 	nlh = (struct nlmsghdr *)skb->data;
 	if (!nlh) {
-		cfg80211_err("Netlink header null");
+		osif_err("Netlink header null");
 		return OEM_ERR_NULL_MESSAGE_HEADER;
 	}
 
 	msg_hdr = NLMSG_DATA(nlh);
 	if (!msg_hdr) {
-		cfg80211_err("Message header null");
+		osif_err("Message header null");
 		return OEM_ERR_NULL_MESSAGE_HEADER;
 	}
 
 	if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*msg_hdr) + msg_hdr->length)) {
-		cfg80211_err("nlmsg_len(%d) and animsg_len(%d) mis-match",
-			nlh->nlmsg_len, msg_hdr->length);
+		osif_err("nlmsg_len(%d) and animsg_len(%d) mis-match",
+			 nlh->nlmsg_len, msg_hdr->length);
 		return OEM_ERR_INVALID_MESSAGE_LENGTH;
 	}
 
@@ -165,9 +165,9 @@ static void __os_if_wifi_pos_callback(const void *data, int data_len,
 	struct wifi_pos_req_msg req = {0};
 	struct wlan_objmgr_psoc *psoc = wifi_pos_get_psoc();
 
-	cfg80211_debug("enter: pid %d", pid);
+	osif_debug("enter: pid %d", pid);
 	if (!psoc) {
-		cfg80211_err("global psoc object not registered yet.");
+		osif_err("global psoc object not registered yet.");
 		return;
 	}
 
@@ -182,8 +182,8 @@ static void __os_if_wifi_pos_callback(const void *data, int data_len,
 
 	status = ucfg_wifi_pos_process_req(psoc, &req, os_if_wifi_pos_send_rsp);
 	if (QDF_IS_STATUS_ERROR(status))
-		cfg80211_err("ucfg_wifi_pos_process_req failed. status: %d",
-				status);
+		osif_err("ucfg_wifi_pos_process_req failed. status: %d",
+			 status);
 
 release_psoc_ref:
 	wlan_objmgr_psoc_release_ref(psoc, WLAN_WIFI_POS_OSIF_ID);
@@ -208,9 +208,9 @@ static int __os_if_wifi_pos_callback(struct sk_buff *skb)
 	struct wifi_pos_req_msg req = {0};
 	struct wlan_objmgr_psoc *psoc = wifi_pos_get_psoc();
 
-	cfg80211_debug("enter");
+	osif_debug("enter");
 	if (!psoc) {
-		cfg80211_err("global psoc object not registered yet.");
+		osif_err("global psoc object not registered yet.");
 		return -EINVAL;
 	}
 
@@ -225,8 +225,8 @@ static int __os_if_wifi_pos_callback(struct sk_buff *skb)
 
 	status = ucfg_wifi_pos_process_req(psoc, &req, os_if_wifi_pos_send_rsp);
 	if (QDF_IS_STATUS_ERROR(status))
-		cfg80211_err("ucfg_wifi_pos_process_req failed. status: %d",
-				status);
+		osif_err("ucfg_wifi_pos_process_req failed. status: %d",
+			 status);
 
 release_psoc_ref:
 	wlan_objmgr_psoc_release_ref(psoc, WLAN_WIFI_POS_OSIF_ID);
@@ -255,7 +255,7 @@ int os_if_wifi_pos_register_nl(void)
 	int ret = register_cld_cmd_cb(WLAN_NL_MSG_OEM,
 				os_if_wifi_pos_callback, NULL);
 	if (ret)
-		cfg80211_err("register_cld_cmd_cb failed");
+		osif_err("register_cld_cmd_cb failed");
 
 	return ret;
 }
@@ -271,7 +271,7 @@ int os_if_wifi_pos_deregister_nl(void)
 {
 	int ret = deregister_cld_cmd_cb(WLAN_NL_MSG_OEM);
 	if (ret)
-		cfg80211_err("deregister_cld_cmd_cb failed");
+		osif_err("deregister_cld_cmd_cb failed");
 
 	return ret;
 }
@@ -293,13 +293,13 @@ void os_if_wifi_pos_send_peer_status(struct qdf_mac_addr *peer_mac,
 	struct wmi_pos_peer_status_info *peer_info;
 
 	if (!psoc) {
-		cfg80211_err("global wifi_pos psoc object not registered");
+		osif_err("global wifi_pos psoc object not registered");
 		return;
 	}
 
 	if (!wifi_pos_is_app_registered(psoc) ||
 			wifi_pos_get_app_pid(psoc) == 0) {
-		cfg80211_debug("app is not registered or pid is invalid");
+		osif_debug("app is not registered or pid is invalid");
 		return;
 	}
 
@@ -340,7 +340,7 @@ int os_if_wifi_pos_populate_caps(struct wlan_objmgr_psoc *psoc,
 				   struct wifi_pos_driver_caps *caps)
 {
 	if (!psoc || !caps) {
-		cfg80211_err("psoc or caps buffer is null");
+		osif_err("psoc or caps buffer is null");
 		return -EINVAL;
 	}
 
diff --git a/os_if/linux/wlan_cfg80211.h b/os_if/linux/wlan_cfg80211.h
index 8b51c1dbd0..46f4d55760 100644
--- a/os_if/linux/wlan_cfg80211.h
+++ b/os_if/linux/wlan_cfg80211.h
@@ -30,19 +30,19 @@
 #include <net/cfg80211.h>
 #include <qca_vendor.h>
 
-#define cfg80211_alert(params...) \
+#define osif_alert(params...) \
 	QDF_TRACE_FATAL(QDF_MODULE_ID_OS_IF, params)
-#define cfg80211_err(params...) \
+#define osif_err(params...) \
 	QDF_TRACE_ERROR(QDF_MODULE_ID_OS_IF, params)
-#define cfg80211_warn(params...) \
+#define osif_warn(params...) \
 	QDF_TRACE_WARN(QDF_MODULE_ID_OS_IF, params)
-#define cfg80211_notice(params...) \
+#define osif_notice(params...) \
 	QDF_TRACE_INFO(QDF_MODULE_ID_OS_IF, params)
-#define cfg80211_info(params...) \
+#define osif_info(params...) \
 	QDF_TRACE_INFO(QDF_MODULE_ID_OS_IF, params)
-#define cfg80211_debug(params...) \
+#define osif_debug(params...) \
 	QDF_TRACE_DEBUG(QDF_MODULE_ID_OS_IF, params)
-#define cfg80211_debug_rl(params...) \
+#define osif_rl_debug(params...) \
 	QDF_TRACE_DEBUG_RL(QDF_MODULE_ID_OS_IF, params)
 
 #define osif_nofl_alert(params...) \
diff --git a/os_if/linux/wlan_osif_request_manager.c b/os_if/linux/wlan_osif_request_manager.c
index 08da108fc4..903d4f38fc 100644
--- a/os_if/linux/wlan_osif_request_manager.c
+++ b/os_if/linux/wlan_osif_request_manager.c
@@ -83,7 +83,7 @@ struct osif_request *osif_request_alloc(const struct osif_request_params *params
 	struct osif_request *request;
 
 	if (!is_initialized) {
-		cfg80211_err("invoked when not initialized");
+		osif_err("invoked when not initialized");
 		return NULL;
 	}
 
@@ -99,8 +99,7 @@ struct osif_request *osif_request_alloc(const struct osif_request_params *params
 	request->cookie = cookie++;
 	qdf_list_insert_back(&requests, &request->node);
 	qdf_spin_unlock_bh(&spinlock);
-	cfg80211_debug("request %pK, cookie %pK",
-		       request, request->cookie);
+	osif_debug("request %pK, cookie %pK", request, request->cookie);
 
 	return request;
 }
@@ -121,7 +120,7 @@ struct osif_request *osif_request_get(void *cookie)
 	struct osif_request *request;
 
 	if (!is_initialized) {
-		cfg80211_err("invoked when not initialized");
+		osif_err("invoked when not initialized");
 		return NULL;
 	}
 	qdf_spin_lock_bh(&spinlock);
@@ -129,8 +128,7 @@ struct osif_request *osif_request_get(void *cookie)
 	if (request)
 		request->reference_count++;
 	qdf_spin_unlock_bh(&spinlock);
-	cfg80211_debug("cookie %pK, request %pK",
-		       cookie, request);
+	osif_debug("cookie %pK, request %pK", cookie, request);
 
 	return request;
 }
@@ -139,8 +137,7 @@ void osif_request_put(struct osif_request *request)
 {
 	bool unlinked = false;
 
-	cfg80211_debug("request %pK, cookie %pK",
-		       request, request->cookie);
+	osif_debug("request %pK, cookie %pK", request, request->cookie);
 	qdf_spin_lock_bh(&spinlock);
 	request->reference_count--;
 	if (0 == request->reference_count) {