diff --git a/drivers/net/wireless/bcmdhd/wl_cfgvendor.c b/drivers/net/wireless/bcmdhd/wl_cfgvendor.c index 823676307cc9763cdf08e5fed8b4f4bf61cd8df8..1000ec95fae074c26208bfce5dfb39999f398f5c 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)