Merge "fix to enable lazy roam" into m-wireless-dev

2 files changed, 10 insertions, 6 deletions

diff --git a/bcmdhd/wifi_hal/gscan.cpp b/bcmdhd/wifi_hal/gscan.cpp
index 3ece5bf..8acc498 100644
--- a/bcmdhd/wifi_hal/gscan.cpp
+++ b/bcmdhd/wifi_hal/gscan.cpp
@@ -1683,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) {
@@ -1773,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 1d94e71..a1d37e1 100644
--- a/bcmdhd/wifi_hal/wifi_hal.cpp
+++ b/bcmdhd/wifi_hal/wifi_hal.cpp
@@ -139,6 +139,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;
 }