diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index cefae85899dd..90441b05d714 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -1429,12 +1429,9 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 			final_req_ie, (ssid_ie_len + reqRsnLength),
 			rspRsnIe, rspRsnLength, GFP_KERNEL);
 
-	if (pHddCtx->config->isRoamOffloadEnabled &&
-		pCsrRoamInfo->roamSynchInProgress)
-		wlan_hdd_send_roam_auth_event(pHddCtx,
-				pCsrRoamInfo->bssid.bytes,
-				reqRsnIe, reqRsnLength, rspRsnIe,
-				rspRsnLength, pCsrRoamInfo);
+	wlan_hdd_send_roam_auth_event(pHddCtx, pCsrRoamInfo->bssid.bytes,
+			reqRsnIe, reqRsnLength, rspRsnIe, rspRsnLength,
+			pCsrRoamInfo);
 done:
 	sme_roam_free_connect_profile(hal_handle, &roam_profile);
 	if (final_req_ie)
@@ -1945,15 +1942,14 @@ defined(FEATURE_WLAN_LFR)
 								pFTAssocRsp,
 								assocRsplen,
 								GFP_KERNEL);
-						if (pRoamInfo->roamSynchInProgress)
-							wlan_hdd_send_roam_auth_event(
-							 pHddCtx,
-							 pRoamInfo->bssid.bytes,
-							 pFTAssocReq,
-							 assocReqlen,
-							 pFTAssocRsp,
-							 assocRsplen,
-							 pRoamInfo);
+						wlan_hdd_send_roam_auth_event(
+								pHddCtx,
+								pRoamInfo->bssid.bytes,
+								pFTAssocReq,
+								assocReqlen,
+								pFTAssocRsp,
+								assocRsplen,
+								pRoamInfo);
 					}
 					if (sme_get_ftptk_state
 						    (WLAN_HDD_GET_HAL_CTX(pAdapter),
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index d6a5143e8fc3..3ae8264033e6 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -2975,6 +2975,10 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid,
 		return -EINVAL;
 	}
 
+	if (!hdd_ctx_ptr->config->isRoamOffloadEnabled ||
+			!roam_info_ptr->roamSynchInProgress)
+		return 0;
+
 	skb = cfg80211_vendor_event_alloc(hdd_ctx_ptr->wiphy,
 			NULL,
 			ETH_ALEN + req_rsn_len + rsp_rsn_len +
@@ -3032,7 +3036,7 @@ nla_put_failure:
 	kfree_skb(skb);
 	return -EINVAL;
 }
-#endif
+#endif /* WLAN_FEATURE_ROAM_OFFLOAD */
 
 static const struct nla_policy
 wlan_hdd_wifi_config_policy[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1] = {
diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h
index f8cdd9001751..23e604a56c77 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.h
+++ b/core/hdd/src/wlan_hdd_cfg80211.h
@@ -2253,9 +2253,17 @@ void wlan_hdd_cfg80211_acs_ch_select_evt(hdd_adapter_t *adapter);
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid,
-				uint8_t *req_rsn_ie, uint32_t req_rsn_length,
-				uint8_t *rsp_rsn_ie, uint32_t rsp_rsn_length,
-				tCsrRoamInfo *roam_info_ptr);
+		uint8_t *req_rsn_ie, uint32_t req_rsn_length, uint8_t
+		*rsp_rsn_ie, uint32_t rsp_rsn_length, tCsrRoamInfo
+		*roam_info_ptr);
+#else
+static inline int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr,
+		uint8_t *bssid, uint8_t *req_rsn_ie, uint32_t req_rsn_length,
+		uint8_t *rsp_rsn_ie, uint32_t rsp_rsn_length, tCsrRoamInfo
+		*roam_info_ptr)
+{
+	return 0;
+}
 #endif
 
 int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *adapter);
diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c
index b217c402ee96..2f13a411640d 100644
--- a/core/mac/src/pe/lim/lim_admit_control.c
+++ b/core/mac/src/pe/lim/lim_admit_control.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -917,7 +917,6 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
 	tSirMsgQ msg;
 	tpAddTsParams pAddTsParam;
 
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	tpPESession psessionEntry = pe_find_session_by_session_id(pMac, sessionId);
 	if (psessionEntry == NULL) {
 		lim_log(pMac, LOGP,
@@ -925,7 +924,7 @@ lim_send_hal_msg_add_ts(tpAniSirGlobal pMac,
 			sessionId);
 		return eSIR_FAILURE;
 	}
-#endif
+
 	pAddTsParam = cdf_mem_malloc(sizeof(tAddTsParams));
 	if (NULL == pAddTsParam) {
 		PELOGW(lim_log(pMac, LOGW, FL("AllocateMemory() failed"));)
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 6e5632dab844..a2b0eec48634 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -13514,6 +13514,7 @@ CDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal,
 
 	return status;
 }
+#endif
 
 /* ---------------------------------------------------------------------------
    \fn sme_get_temperature
@@ -13589,7 +13590,6 @@ CDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui
 	}
 	return status;
 }
-#endif
 
 #ifdef DHCP_SERVER_OFFLOAD
 /* ---------------------------------------------------------------------------