From 6577fb45237e1db32c019fe47118aeb57cfe9053 Mon Sep 17 00:00:00 2001
From: Ashwin <ashwin.bhat@broadcom.com>
Date: Wed, 22 Jul 2015 17:12:37 -0700
Subject: [PATCH] net: wireless: bcmdhd: Keep all vendor events in right order
Do not conditionally compile the individual vendor events
because the removal of one can cause __cfg80211_alloc_event_skb()
to put the next event's ID from vendor_events[] array.
Bug: 23556192
Change-Id: Ib187c17756b81ceab02f42bc797ff9ff37b2a3c8
Signed-off-by: Ashwin <ashwin.bhat@broadcom.com>
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---
drivers/net/wireless/bcmdhd/wl_cfgvendor.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/bcmdhd/wl_cfgvendor.c b/drivers/net/wireless/bcmdhd/wl_cfgvendor.c
index 823676307cc9..1000ec95fae0 100644
--- a/drivers/net/wireless/bcmdhd/wl_cfgvendor.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfgvendor.c
@@ -2572,29 +2572,19 @@ static const struct wiphy_vendor_command wl_vendor_cmds [] = {
static const struct nl80211_vendor_cmd_info wl_vendor_events [] = {
{ OUI_BRCM, BRCM_VENDOR_EVENT_UNSPEC },
{ OUI_BRCM, BRCM_VENDOR_EVENT_PRIV_STR },
-#ifdef GSCAN_SUPPORT
{ OUI_GOOGLE, GOOGLE_GSCAN_SIGNIFICANT_EVENT },
{ OUI_GOOGLE, GOOGLE_GSCAN_GEOFENCE_FOUND_EVENT },
{ OUI_GOOGLE, GOOGLE_GSCAN_BATCH_SCAN_EVENT },
{ OUI_GOOGLE, GOOGLE_SCAN_FULL_RESULTS_EVENT },
-#endif /* GSCAN_SUPPORT */
-#ifdef RTT_SUPPORT
{ OUI_GOOGLE, GOOGLE_RTT_COMPLETE_EVENT },
-#endif /* RTT_SUPPORT */
-#ifdef GSCAN_SUPPORT
{ OUI_GOOGLE, GOOGLE_SCAN_COMPLETE_EVENT },
{ OUI_GOOGLE, GOOGLE_GSCAN_GEOFENCE_LOST_EVENT },
{ OUI_GOOGLE, GOOGLE_SCAN_EPNO_EVENT },
-#endif /* GSCAN_SUPPORT */
{ OUI_GOOGLE, GOOGLE_DEBUG_RING_EVENT },
{ OUI_GOOGLE, GOOGLE_FW_DUMP_EVENT },
-#ifdef GSCAN_SUPPORT
{ OUI_GOOGLE, GOOGLE_PNO_HOTSPOT_FOUND_EVENT },
-#endif /* GSCAN_SUPPORT */
-#ifdef KEEP_ALIVE
- { OUI_GOOGLE, GOOGLE_MKEEP_ALIVE_EVENT },
-#endif /* KEEP_ALIVE */
- { OUI_GOOGLE, GOOGLE_RSSI_MONITOR_EVENT }
+ { OUI_GOOGLE, GOOGLE_RSSI_MONITOR_EVENT },
+ { OUI_GOOGLE, GOOGLE_MKEEP_ALIVE_EVENT }
};
int wl_cfgvendor_attach(struct wiphy *wiphy, dhd_pub_t *dhd)
--
GitLab