diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c
index ecd4925..8a6882f 100644
--- a/drivers/net/wireless/bcmdhd/dhd_common.c
+++ b/drivers/net/wireless/bcmdhd/dhd_common.c
@@ -107,8 +107,10 @@
 extern int dhd_get_concurrent_capabilites(dhd_pub_t *dhd);
 #endif
 extern int dhd_socram_dump(struct dhd_bus *bus);
+#ifdef DNGL_EVENT_SUPPORT
 static void dngl_host_event_process(dhd_pub_t *dhdp, bcm_dngl_event_t *event);
 static int dngl_host_event(dhd_pub_t *dhdp, void *pktdata);
+#endif /* DNGL_EVENT_SUPPORT */
 bool ap_cfg_running = FALSE;
 bool ap_fw_loaded = FALSE;
 
@@ -1375,6 +1377,7 @@
 }
 #endif /* SHOW_EVENTS */
 
+#ifdef DNGL_EVENT_SUPPORT
 /* Check whether packet is a BRCM dngl event pkt. If it is, process event data. */
 int
 dngl_host_event(dhd_pub_t *dhdp, void *pktdata)
@@ -1494,6 +1497,8 @@
 	break;
 	}
 }
+#endif /* DNGL_EVENT_SUPPORT */
+
 int wl_host_event(dhd_pub_t *dhd_pub, int *ifidx, void *pktdata,
 	wl_event_msg_t *event, void **data_ptr, void *raw_event)
 {
@@ -1505,10 +1510,13 @@
 	int evlen;
 	int hostidx;
 
+#ifdef DNGL_EVENT_SUPPORT
 	/* If it is a DNGL event process it first */
 	if (dngl_host_event(dhd_pub, pktdata) == BCME_OK) {
-		return BCME_OK;
+		/* Return error purposely to prevent DNGL event being processed as BRCM event */
+		return BCME_ERROR;
 	}
+#endif /* DNGL_EVENT_SUPPORT */
 
 	if (bcmp(BRCM_OUI, &pvt_data->bcm_hdr.oui[0], DOT11_OUI_LEN)) {
 		DHD_ERROR(("%s: mismatched OUI, bailing\n", __FUNCTION__));