From d919889a135c636281febe705e436ad6ac467526 Mon Sep 17 00:00:00 2001 From: Pragya Gupta Date: Wed, 20 Jul 2016 21:41:47 +0900 Subject: [PATCH] [7570] wlbt: Revert changes for Roam BSSID Blacklist This reverts commit ef9baaa57ab6cc6c4108e624937bea58c0cec836 Since this is a dual band feature , this will be pushed into dual band branch . SCSC-Bug-Id: SSB-19140 Change-Id: If4bbb73e1ea08bf0c525839af67bc0ac768eccd8 Signed-off-by: Pragya Gupta --- common.h | 5 +--- gscan.cpp | 74 +--------------------------------------------------- wifi_hal.cpp | 1 - 3 files changed, 2 insertions(+), 78 deletions(-) diff --git a/common.h b/common.h index dc2cfcf..61d12dc 100755 --- a/common.h +++ b/common.h @@ -76,11 +76,8 @@ typedef enum { SLSI_NL80211_VENDOR_SUBCMD_RESET_SIGNIFICANT_CHANGE, SLSI_NL80211_VENDOR_SUBCMD_SET_GSCAN_OUI, SLSI_NL80211_VENDOR_SUBCMD_SET_NODFS, - SLSI_NL80211_VENDOR_SUBCMD_SET_BSSID_BLACKLIST, - /*Add any GSCAN subcmds before this*/ SLSI_NL80211_VENDOR_SUBCMD_START_KEEP_ALIVE_OFFLOAD, - SLSI_NL80211_VENDOR_SUBCMD_STOP_KEEP_ALIVE_OFFLOAD, - + SLSI_NL80211_VENDOR_SUBCMD_STOP_KEEP_ALIVE_OFFLOAD } WIFI_SUB_COMMAND; typedef enum { diff --git a/gscan.cpp b/gscan.cpp index 55c5dbc..46929f0 100755 --- a/gscan.cpp +++ b/gscan.cpp @@ -82,9 +82,6 @@ typedef enum { GSCAN_ATTRIBUTE_BUCKET_EXPONENT, GSCAN_ATTRIBUTE_BUCKET_MAX_PERIOD, - GSCAN_ATTRIBUTE_NUM_BSSID, - GSCAN_ATTRIBUTE_BLACKLIST_BSSID, - GSCAN_ATTRIBUTE_MAX } GSCAN_ATTRIBUTE; @@ -431,7 +428,7 @@ public: return result; } - + return result; } @@ -1085,72 +1082,3 @@ wifi_error wifi_reset_significant_change_handler(wifi_request_id id, wifi_interf return WIFI_ERROR_INVALID_ARGS; } - -class BssidBlacklistCommand : public WifiCommand -{ -private: - wifi_bssid_params *mParams; -public: - BssidBlacklistCommand(wifi_interface_handle handle, int id, - wifi_bssid_params *params) - : WifiCommand(handle, id), mParams(params) - { } - int createRequest(WifiRequest& request) { - int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_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; - } - - 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() { - ALOGD("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); - 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); - wifi_error result = (wifi_error)cmd->start(); - //release the reference of command as well - cmd->releaseRef(); - return result; -} - diff --git a/wifi_hal.cpp b/wifi_hal.cpp index 723d0d3..e3b78bf 100755 --- a/wifi_hal.cpp +++ b/wifi_hal.cpp @@ -111,7 +111,6 @@ wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn) fn->wifi_set_nodfs_flag = wifi_set_nodfs_flag; fn->wifi_start_sending_offloaded_packet = wifi_start_sending_offloaded_packet; fn->wifi_stop_sending_offloaded_packet = wifi_stop_sending_offloaded_packet; - fn->wifi_set_bssid_blacklist = wifi_set_bssid_blacklist; return WIFI_SUCCESS; } -- 2.20.1