diff options
| author | Ritter Yeh <ryeh@broadcom.com> | 2015-11-03 21:43:26 -0800 |
|---|---|---|
| committer | Ed Tam <etam@google.com> | 2015-11-05 01:42:34 +0000 |
| commit | 9741316071274429fb7f181aaa543fcef6f0cc8a (patch) | |
| tree | b51dd13111e8f4e8797c05d3cd5cf04313dc098c | |
| parent | b2f597882ff019c1edd492c751056112c30ab125 (diff) | |
net: wireless: bcmdhd: Disable DNGL event supportandroid-6.0.0_r0.13
1. Disable DNGL event support since debug-ability is disabled for production release
2. Fix bug in forwarding DNGL event
BUG=24469238
Change-Id: I146fe2f332f464ae5021905230ae7536cd00aab4
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_common.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_common.c b/drivers/net/wireless/bcmdhd/dhd_common.c index ecd492559164..8a6882f3ea4d 100644 --- a/drivers/net/wireless/bcmdhd/dhd_common.c +++ b/drivers/net/wireless/bcmdhd/dhd_common.c @@ -107,8 +107,10 @@ extern int dhd_change_mtu(dhd_pub_t *dhd, int new_mtu, int ifidx); 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 @@ wl_show_host_event(dhd_pub_t *dhd_pub, wl_event_msg_t *event, void *event_data, } #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 @@ dngl_host_event_process(dhd_pub_t *dhdp, bcm_dngl_event_t *event) 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 wl_host_event(dhd_pub_t *dhd_pub, int *ifidx, void *pktdata, 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__)); |