diff options
author | Randy Pan <zpan@google.com> | 2016-11-16 17:12:08 -0800 |
---|---|---|
committer | Randy Pan <zpan@google.com> | 2016-12-12 23:36:52 +0000 |
commit | b5dfb120494cebe2198ee3989c54968f5c49ba44 (patch) | |
tree | d14aabbd7470c482d22202625ba55d7167878ea9 | |
parent | a6bfb2d6f3ab9ce61b153b53edded246fe32e4f0 (diff) | |
download | wlan-b5dfb120494cebe2198ee3989c54968f5c49ba44.tar.gz |
Remove support for obsoleted API set_blacklist_bssid
Bug: 32954427
Test: Build.
Change-Id: I96ac4b5d2ef4cc1f07dd7980b5d24c8d6dc093ce
Merged-In: I96ac4b5d2ef4cc1f07dd7980b5d24c8d6dc093ce
-rw-r--r-- | bcmdhd/wifi_hal/gscan.cpp | 76 | ||||
-rw-r--r-- | bcmdhd/wifi_hal/wifi_hal.cpp | 1 |
2 files changed, 0 insertions, 77 deletions
diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp index 620fbe4..a86a454 100644 --- a/bcmdhd/wifi_hal/gscan.cpp +++ b/bcmdhd/wifi_hal/gscan.cpp @@ -1637,82 +1637,6 @@ wifi_error wifi_set_epno_list(wifi_request_id id, wifi_interface_handle iface, return result; } -class BssidBlacklistCommand : public WifiCommand -{ -private: - wifi_bssid_params *mParams; -public: - BssidBlacklistCommand(wifi_interface_handle handle, int id, - wifi_bssid_params *params) - : WifiCommand("BssidBlacklistCommand", handle, id), mParams(params) - { } - int createRequest(WifiRequest& request) { - int result = request.create(GOOGLE_OUI, WIFI_SUBCMD_SET_BSSID_BLACKLIST); - if (result < 0) { - return result; - } - - nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA); - result = request.put_u32(GSCAN_ATTRIBUTE_NUM_BSSID, mParams->num_bssid); - if (result < 0) { - return result; - } - if (!mParams->num_bssid) { - result = request.put_u32(GSCAN_ATTRIBUTE_BSSID_BLACKLIST_FLUSH, 1); - if (result < 0) { - return result; - } - } - for (int i = 0; i < mParams->num_bssid; i++) { - result = request.put_addr(GSCAN_ATTRIBUTE_BLACKLIST_BSSID, mParams->bssids[i]); - if (result < 0) { - return result; - } - } - request.attr_end(data); - return result; - } - - int start() { - ALOGV("Executing bssid blacklist request, num = %d", mParams->num_bssid); - WifiRequest request(familyId(), ifaceId()); - int result = createRequest(request); - if (result < 0) { - return result; - } - - result = requestResponse(request); - if (result < 0) { - ALOGE("Failed to execute bssid blacklist request, result = %d", result); - return result; - } - - ALOGI("Successfully added %d blacklist bssids", mParams->num_bssid); - if (result < 0) { - return result; - } - return result; - } - - - virtual int handleResponse(WifiEvent& reply) { - /* Nothing to do on response! */ - return NL_SKIP; - } -}; - -wifi_error wifi_set_bssid_blacklist(wifi_request_id id, wifi_interface_handle iface, - wifi_bssid_params params) -{ - wifi_handle handle = getWifiHandle(iface); - - BssidBlacklistCommand *cmd = new BssidBlacklistCommand(iface, id, ¶ms); - NULL_CHECK_RETURN(cmd, "memory allocation failure", WIFI_ERROR_OUT_OF_MEMORY); - wifi_error result = (wifi_error)cmd->start(); - //release the reference of command as well - cmd->releaseRef(); - return result; -} //////////////////////////////////////////////////////////////////////////////// diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp index 251414b..d975e51 100644 --- a/bcmdhd/wifi_hal/wifi_hal.cpp +++ b/bcmdhd/wifi_hal/wifi_hal.cpp @@ -171,7 +171,6 @@ wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn) fn->wifi_get_logger_supported_feature_set = wifi_get_logger_supported_feature_set; fn->wifi_get_ring_data = wifi_get_ring_data; fn->wifi_get_driver_version = wifi_get_driver_version; - fn->wifi_set_bssid_blacklist = wifi_set_bssid_blacklist; fn->wifi_start_rssi_monitoring = wifi_start_rssi_monitoring; fn->wifi_stop_rssi_monitoring = wifi_stop_rssi_monitoring; fn->wifi_configure_nd_offload = wifi_configure_nd_offload; |