Merge commit 'c86b0f1' into merge_work

Change-Id: I7c4cb626c735523cfdc29051e3ad6b4a5ed08a25

2 files changed, 2 insertions, 3 deletions

diff --git a/bcmdhd/wifi_hal/rtt.cpp b/bcmdhd/wifi_hal/rtt.cpp
index 67c32cd..0d0b1e2 100755
--- a/bcmdhd/wifi_hal/rtt.cpp
+++ b/bcmdhd/wifi_hal/rtt.cpp
@@ -231,7 +231,7 @@ public:
             }
 
             result = request.put_u32(RTT_ATTRIBUTE_TARGET_NUM_RETRY_FTM,
-                    rttParams[i].num_retries_per_measurement_frame);
+                    rttParams[i].num_retries_per_rtt_frame);
             if (result < 0) {
                 return result;
             }
@@ -243,7 +243,7 @@ public:
             }
 
             result = request.put_u32(RTT_ATTRIBUTE_TARGET_BURST_TIMEOUT,
-                    rttParams[i].burst_timeout);
+                    rttParams[i].burst_duration);
             if (result < 0) {
                 return result;
             }
diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp
index 3d38802..1b019f4 100644
--- a/bcmdhd/wifi_hal/wifi_hal.cpp
+++ b/bcmdhd/wifi_hal/wifi_hal.cpp
@@ -136,7 +136,6 @@ wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn)
     return WIFI_SUCCESS;
 }
 
-
 wifi_error wifi_initialize(wifi_handle *handle)
 {
     srand(getpid());