[7570] wlbt: Backout WiFi HAL changes for LLS
Backout WiFi HAL changes for LLS
Change-Id: Ideceb1e531a520758fbc7b31975e6114919743a2
SCSC-Bug-Id: SSB-20705
Signed-off-by: Srinivas Chowdavarapu <s.chowdav@samsung.com>
diff --git a/common.h b/common.h
index ad6c96a..6e3fc07 100755
--- a/common.h
+++ b/common.h
@@ -83,10 +83,7 @@
SLSI_NL80211_VENDOR_SUBCMD_SET_EPNO_LIST,
SLSI_NL80211_VENDOR_SUBCMD_SET_HS_LIST,
SLSI_NL80211_VENDOR_SUBCMD_RESET_HS_LIST,
- SLSI_NL80211_VENDOR_SUBCMD_SET_RSSI_MONITOR,
- SLSI_NL80211_VENDOR_SUBCMD_LLS_SET_INFO,
- SLSI_NL80211_VENDOR_SUBCMD_LLS_GET_INFO,
- SLSI_NL80211_VENDOR_SUBCMD_LLS_CLEAR_INFO
+ SLSI_NL80211_VENDOR_SUBCMD_SET_RSSI_MONITOR
} WIFI_SUB_COMMAND;
typedef enum {
diff --git a/link_layer_stats.cpp b/link_layer_stats.cpp
index 4e172b9..27cc055 100755
--- a/link_layer_stats.cpp
+++ b/link_layer_stats.cpp
@@ -25,231 +25,10 @@
#include "common.h"
#include "cpp_bindings.h"
-typedef enum {
-
- LSTATS_ATTRIBUTE_SET_MPDU_SIZE_THRESHOLD = 1,
- LSTATS_ATTRIBUTE_SET_AGGR_STATISTICS_GATHERING,
- LSTATS_ATTRIBUTE_CLEAR_STOP_REQUEST_MASK,
- LSTATS_ATTRIBUTE_CLEAR_STOP_REQUEST,
-
- LSTATS_ATTRIBUTE_MAX
-
-} LSTATS_ATTRIBUTE;
-
-class LinkLayerStatsCommand : public WifiCommand
-{
- wifi_link_layer_params mParams;
- u32 mStatsClearReqMask;
- u32 *mStatsClearRspMask;
- u8 mStopReq;
- u8 *mStopRsp;
-public:
- LinkLayerStatsCommand(wifi_interface_handle handle, wifi_link_layer_params params)
- : WifiCommand(handle, 0), mParams(params)
- { }
-
- LinkLayerStatsCommand(wifi_interface_handle handle,
- u32 stats_clear_req_mask, u32 *stats_clear_rsp_mask, u8 stop_req, u8 *stop_rsp)
- : WifiCommand(handle, 0), mStatsClearReqMask(stats_clear_req_mask), mStatsClearRspMask(stats_clear_rsp_mask),
- mStopReq(stop_req), mStopRsp(stop_rsp)
- { }
-
- int createSetRequest(WifiRequest& request) {
- int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_LLS_SET_INFO);
- if (result < 0) {
- return result;
- }
-
- nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);
-
- result = request.put_u32(LSTATS_ATTRIBUTE_SET_MPDU_SIZE_THRESHOLD, mParams.mpdu_size_threshold);
- if (result < 0) {
- return result;
- }
-
- result = request.put_u32(LSTATS_ATTRIBUTE_SET_AGGR_STATISTICS_GATHERING, mParams.aggressive_statistics_gathering);
- if (result < 0) {
- return result;
- }
- request.attr_end(data);
- return result;
- }
-
- int createClearRequest(WifiRequest& request) {
- int result = request.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_LLS_CLEAR_INFO);
- if (result < 0) {
- return result;
- }
- nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);
-
- result = request.put_u32(LSTATS_ATTRIBUTE_CLEAR_STOP_REQUEST_MASK, mStatsClearReqMask);
- if (result < 0) {
- return result;
- }
-
- result = request.put_u32(LSTATS_ATTRIBUTE_CLEAR_STOP_REQUEST, mStopReq);
- if (result < 0) {
- return result;
- }
- request.attr_end(data);
- return result;
- }
-
- int start() {
- ALOGD("Starting Link Layer Statistics measurement (%d, %d)", mParams.mpdu_size_threshold, mParams.aggressive_statistics_gathering);
- WifiRequest request(familyId(), ifaceId());
- int result = createSetRequest(request);
- if (result < 0) {
- ALOGE("failed to set Link Layer Statistics (result:%d)", result);
- return result;
- }
-
- result = requestResponse(request);
- if (result < 0) {
- ALOGE("failed to Set Link Layer Statistics (result:%d)", result);
- return result;
- }
-
- ALOGD("Successfully set Link Layer Statistics measurement");
- return result;
- }
-
- virtual int clear() {
- ALOGD("Clearing Link Layer Statistics (%d, %d)", mStatsClearReqMask, mStopReq);
- WifiRequest request(familyId(), ifaceId());
- int result = createClearRequest(request);
- if (result < 0) {
- ALOGE("failed to clear Link Layer Statistics (result:%d)", result);
- return result;
- }
-
- result = requestResponse(request);
- if (result < 0) {
- ALOGE("failed to clear Link Layer Statistics (result:%d)", result);
- return result;
- }
-
- ALOGD("Successfully clear Link Layer Statistics measurement");
- return result;
- }
-
- virtual int handleResponse(WifiEvent& reply) {
- /* Nothing to do on response! */
- return NL_SKIP;
- }
-};
-
-
-wifi_error wifi_set_link_stats(wifi_interface_handle iface, wifi_link_layer_params params)
-{
- LinkLayerStatsCommand *command = new LinkLayerStatsCommand(iface, params);
- wifi_error result = (wifi_error)command->start();
- if (result != WIFI_SUCCESS) {
- ALOGE("failed to Set link layer stats", result);
- }
- return result;
-}
-
-wifi_error wifi_clear_link_stats(wifi_interface_handle iface,
- u32 stats_clear_req_mask, u32 *stats_clear_rsp_mask, u8 stop_req, u8 *stop_rsp)
-{
- LinkLayerStatsCommand *command = new LinkLayerStatsCommand(iface, stats_clear_req_mask, stats_clear_rsp_mask, stop_req, stop_rsp);
- wifi_error result = (wifi_error)command->clear();
- if (result != WIFI_SUCCESS) {
- ALOGE("failed to Clear link layer stats", result);
- *stats_clear_rsp_mask = 0;
- *stop_rsp = 0;
- } else {
- *stats_clear_rsp_mask = stats_clear_req_mask;
- *stop_rsp = stop_req;
- }
- return result;
-}
-
-
-class GetLinkStatsCommand : public WifiCommand
-{
- wifi_stats_result_handler mHandler;
- wifi_interface_handle iface;
-public:
- GetLinkStatsCommand(wifi_interface_handle iface, wifi_stats_result_handler handler)
- : WifiCommand(iface, 0), mHandler(handler)
- {
- this->iface = iface;
- }
-
- virtual int create() {
- ALOGI("Creating message to get link statistics");
-
- int ret = mMsg.create(GOOGLE_OUI, SLSI_NL80211_VENDOR_SUBCMD_LLS_GET_INFO);
- if (ret < 0) {
- ALOGE("Failed to create %x - %d", SLSI_NL80211_VENDOR_SUBCMD_LLS_GET_INFO, ret);
- return ret;
- }
-
- return ret;
- }
-
-protected:
- virtual int handleResponse(WifiEvent& reply) {
-
- ALOGI("In GetLinkStatsCommand::handleResponse");
-
- if (reply.get_cmd() != NL80211_CMD_VENDOR) {
- ALOGD("Ignoring reply with cmd = %d", reply.get_cmd());
- return NL_SKIP;
- }
-
- int id = reply.get_vendor_id();
- int subcmd = reply.get_vendor_subcmd();
-
- ALOGI("Id = %0x, subcmd = %d", id, subcmd);
-
- u8 *data = (u8 *)reply.get_vendor_data();
- int len = reply.get_vendor_data_len();
-
- // assuming max peers is 16
- wifi_iface_stat *iface_stat = (wifi_iface_stat *) malloc(sizeof(wifi_iface_stat) + sizeof(wifi_peer_info) * 16);
- // max channel is 38 (14 2.4GHz and 24 5GHz)
- wifi_radio_stat *radio_stat = (wifi_radio_stat *) malloc(sizeof(wifi_radio_stat) + sizeof(wifi_channel_stat) * 38);
-
- if (!iface_stat || !radio_stat) {
- ALOGE("Memory alloc failed in response handler!!!");
- return NL_SKIP;
- }
-
- //kernel is 64 bit. if userspace is 64 bit, typecastting buffer works else, make corrections
- if (sizeof(iface_stat->iface) == 8) {
- memcpy(iface_stat, data, sizeof(wifi_iface_stat) + sizeof(wifi_peer_info) * ((wifi_iface_stat *)data)->num_peers);
- data += sizeof(wifi_iface_stat) + sizeof(wifi_peer_info) * ((wifi_iface_stat *)data)->num_peers;
- memcpy(radio_stat, data, sizeof(wifi_radio_stat) + sizeof(wifi_channel_stat)* ((wifi_radio_stat *)data)->num_channels);
- } else {
- /* for 64 bit kernel ad 32 bit user space, there is 4 byte extra at the beging and another 4 byte pad after 80 bytes
- * so remove first 4 and 81-84 bytes from NL buffer.*/
- data += 4;
- memcpy(iface_stat, data, 80);
- data += 80 + 4; //for allignment skip 4 bytes
- memcpy(((u8 *)iface_stat) + 80, data, sizeof(wifi_iface_stat) - 80);
- data += sizeof(wifi_iface_stat) - 80;
- memcpy(iface_stat->peer_info, data, sizeof(wifi_peer_info) * iface_stat->num_peers);
- data += sizeof(wifi_peer_info) * iface_stat->num_peers;
- memcpy(radio_stat, data, sizeof(wifi_radio_stat));
- data += sizeof(wifi_radio_stat);
- memcpy(radio_stat->channels, data, sizeof(wifi_channel_stat) * radio_stat->num_channels);
- }
- iface_stat->iface = iface;
- (*mHandler.on_link_stats_results)(id, iface_stat, 1, radio_stat);
- free(iface_stat);
- free(radio_stat);
- return NL_OK;
- }
-};
-
wifi_error wifi_get_link_stats(wifi_request_id id,
wifi_interface_handle iface, wifi_stats_result_handler handler)
{
- GetLinkStatsCommand command(iface, handler);
- return (wifi_error) command.requestResponse();
+ return WIFI_ERROR_NOT_SUPPORTED;
}
diff --git a/wifi_hal.cpp b/wifi_hal.cpp
index a45fa62..c184273 100755
--- a/wifi_hal.cpp
+++ b/wifi_hal.cpp
@@ -127,9 +127,7 @@
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_set_link_stats = wifi_set_link_stats;
fn->wifi_get_link_stats = wifi_get_link_stats;
- fn->wifi_clear_link_stats = wifi_clear_link_stats;
return WIFI_SUCCESS;
}