Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into merging

Change-Id: I24f1ac9e60f09d3771ee6fb99daf75ade7c659eb

4 files changed, 21 insertions, 21 deletions

diff --git a/bcmdhd/wifi_hal/common.h b/bcmdhd/wifi_hal/common.h
index ac5af91..3259f62 100644
--- a/bcmdhd/wifi_hal/common.h
+++ b/bcmdhd/wifi_hal/common.h
@@ -112,9 +112,9 @@ typedef enum {
     GSCAN_EVENT_COMPLETE_SCAN,
     GSCAN_EVENT_HOTLIST_RESULTS_LOST,
     GSCAN_EVENT_EPNO_EVENT,
-    GSCAN_EVENT_ANQPO_HOTSPOT_MATCH,
     GOOGLE_DEBUG_RING_EVENT,
-    GOOGLE_DEBUG_MEM_DUMP_EVENT
+    GOOGLE_DEBUG_MEM_DUMP_EVENT,
+    GSCAN_EVENT_ANQPO_HOTSPOT_MATCH
 } WIFI_EVENT;
 
 typedef void (*wifi_internal_event_handler) (wifi_handle handle, int events);
diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp
index e3ed685..556baea 100644
--- a/bcmdhd/wifi_hal/gscan.cpp
+++ b/bcmdhd/wifi_hal/gscan.cpp
@@ -1565,22 +1565,19 @@ wifi_error wifi_reset_epno_list(wifi_request_id id, wifi_interface_handle iface)
         cmd->releaseRef();
         return WIFI_SUCCESS;
     }
-
     return WIFI_ERROR_INVALID_ARGS;
 }
 
 wifi_error wifi_set_epno_list(wifi_request_id id, wifi_interface_handle iface,
         int num_networks, wifi_epno_network *networks, wifi_epno_handler handler)
 {
-
-     if (num_networks == 0 || networks == NULL) {
-         return wifi_reset_epno_list(id, iface);
-     }
-
      wifi_handle handle = getWifiHandle(iface);
 
      ePNOCommand *cmd = new ePNOCommand(iface, id, num_networks, networks, handler);
      wifi_register_cmd(handle, id, cmd);
+     if (num_networks == 0 || networks == NULL) {
+         return wifi_reset_epno_list(id, iface);
+     }
      return (wifi_error)cmd->start();
 }
 
@@ -1686,7 +1683,7 @@ public:
             return result;
         }
 
-        nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);
+    nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);
 
     result = request.put_u32(GSCAN_ATTRIBUTE_A_BAND_BOOST_THRESHOLD, mParams->A_band_boost_threshold);
     if (result < 0) {
@@ -1776,16 +1773,15 @@ public:
 
         nlattr *data = request.attr_start(NL80211_ATTR_VENDOR_DATA);
 
-    result = request.put_u32(GSCAN_ATTRIBUTE_LAZY_ROAM_ENABLE, mEnable);
-    if (result < 0) {
-        return result;
-    }
+        result = request.put_u32(GSCAN_ATTRIBUTE_LAZY_ROAM_ENABLE, mEnable);
+        if (result < 0) {
+            return result;
+        }
         request.attr_end(data);
         return result;
     }
 
     int start() {
-        ALOGI("Enabling Lazy roam");
         WifiRequest request(familyId(), ifaceId());
         int result = createRequest(request);
         if (result < 0) {
diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp
index b7342e2..0bb904d 100644
--- a/bcmdhd/wifi_hal/wifi_hal.cpp
+++ b/bcmdhd/wifi_hal/wifi_hal.cpp
@@ -140,6 +140,11 @@ 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_ssid_white_list = wifi_set_ssid_white_list;
+    fn->wifi_set_gscan_roam_params = wifi_set_gscan_roam_params;
+    fn->wifi_set_bssid_preference = wifi_set_bssid_preference;
+    fn->wifi_set_bssid_blacklist = wifi_set_bssid_blacklist;
+    fn->wifi_enable_lazy_roam = wifi_enable_lazy_roam;
     return WIFI_SUCCESS;
 }
 
diff --git a/bcmdhd/wifi_hal/wifi_logger.cpp b/bcmdhd/wifi_hal/wifi_logger.cpp
index d7d60ae..b401429 100644
--- a/bcmdhd/wifi_hal/wifi_logger.cpp
+++ b/bcmdhd/wifi_hal/wifi_logger.cpp
@@ -618,14 +618,14 @@ public:
                     ALOGE("Failed to put get memory dump request; result = %d", result);
                     return result;
                 }
-                /* BUG: 1. should not be passing pointer to data, 2. should not assume pointer is 32 bits
-                result = request.put_u32(LOGGER_ATTRIBUTE_FW_DUMP_DATA,
-                        (uint32_t)(mBuff+buffer_size));
+
+                result = request.put_u64(LOGGER_ATTRIBUTE_FW_DUMP_DATA,
+                         (uint64_t)(mBuff+buffer_size));
                 if (result != WIFI_SUCCESS) {
                     ALOGE("Failed to put get memory dump request; result = %d", result);
                     return result;
                 }
-                */
+
                 request.attr_end(data);
                 mBuffSize += buffer_size;
 
@@ -726,13 +726,12 @@ public:
                     ALOGE("Failed to put get memory dump request; result = %d", result);
                     return result;
                 }
-                /* BUG: 1. should not be passing pointer to data, 2. should not assume pointer is 32 bits
-                result = request.put_u32(LOGGER_ATTRIBUTE_FW_DUMP_DATA, (uint32_t)mBuff);
+
+                result = request.put_u64(LOGGER_ATTRIBUTE_FW_DUMP_DATA, (uint64_t)mBuff);
                 if (result != WIFI_SUCCESS) {
                     ALOGE("Failed to put get memory dump request; result = %d", result);
                     return result;
                 }
-                */
                 request.attr_end(data);
 
                 result = requestResponse(request);