From 16642d4dc5b5d8342f1e2a3cfe12195badc88c17 Mon Sep 17 00:00:00 2001
From: Mohit Ghuley <mohit.ghuley@samsung.com>
Date: Thu, 13 Aug 2020 01:49:05 +0530
Subject: [PATCH] wlbt: Fix for nl attribute index match for Batch-2 commands.

Changes are done to match index of nl attribute
in scsc driver and wifi-hal.

SCSC-Bug-Id: HOST-13256
Signed-off-by: Mohit Ghuley <mohit.ghuley@samsung.com>
Change-Id: I75aeb366f4d4447ed4a4ccdbe53902d0fd2c2761
---
 gscan.cpp    |  4 ++--
 rtt.cpp      |  5 +++--
 wifi_hal.cpp | 11 +++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gscan.cpp b/gscan.cpp
index e3227e1..efd7cac 100755
--- a/gscan.cpp
+++ b/gscan.cpp
@@ -25,7 +25,7 @@
 #include "cpp_bindings.h"
 
 typedef enum {
-    EPNO_ATTRIBUTE_MINIMUM_5G_RSSI,
+    EPNO_ATTRIBUTE_MINIMUM_5G_RSSI = WIFI_HAL_ATTR_START,
     EPNO_ATTRIBUTE_MINIMUM_2G_RSSI,
     EPNO_ATTRIBUTE_INITIAL_SCORE_MAX,
     EPNO_ATTRIBUTE_CUR_CONN_BONUS,
@@ -42,7 +42,7 @@ typedef enum {
 } EPNO_ATTRIBUTE;
 
 typedef enum {
-    EPNO_ATTRIBUTE_HS_PARAM_LIST,
+    EPNO_ATTRIBUTE_HS_PARAM_LIST = WIFI_HAL_ATTR_START,
     EPNO_ATTRIBUTE_HS_NUM,
     EPNO_ATTRIBUTE_HS_ID,
     EPNO_ATTRIBUTE_HS_REALM,
diff --git a/rtt.cpp b/rtt.cpp
index 9a1ef3a..380c213 100755
--- a/rtt.cpp
+++ b/rtt.cpp
@@ -27,7 +27,7 @@
 using namespace std;
 
 typedef enum {
-    SLSI_RTT_ATTRIBUTE_TARGET_CNT = 0,
+    SLSI_RTT_ATTRIBUTE_TARGET_CNT = WIFI_HAL_ATTR_START,
     SLSI_RTT_ATTRIBUTE_TARGET_INFO,
     SLSI_RTT_ATTRIBUTE_TARGET_MAC,
     SLSI_RTT_ATTRIBUTE_TARGET_TYPE,
@@ -47,7 +47,8 @@ typedef enum {
     SLSI_RTT_ATTRIBUTE_RESULTS_PER_TARGET,
     SLSI_RTT_ATTRIBUTE_RESULT_CNT,
     SLSI_RTT_ATTRIBUTE_RESULT,
-    SLSI_RTT_ATTRIBUTE_TARGET_ID
+    SLSI_RTT_ATTRIBUTE_TARGET_ID,
+    SLSI_RTT_ATTRIBUTE_MAX
 } SLSI_RTT_ATTRIBUTE;
 
 enum slsi_rtt_event_attributes {
diff --git a/wifi_hal.cpp b/wifi_hal.cpp
index 1cf3116..2fde7ba 100755
--- a/wifi_hal.cpp
+++ b/wifi_hal.cpp
@@ -51,21 +51,24 @@ static int wifi_add_membership(wifi_handle handle, const char *group);
 static wifi_error wifi_init_interfaces(wifi_handle handle);
 
 typedef enum wifi_attr {
-    ANDR_WIFI_ATTRIBUTE_ND_OFFLOAD_CONFIG,
-    ANDR_WIFI_ATTRIBUTE_PNO_RANDOM_MAC_OUI
+    ANDR_WIFI_ATTRIBUTE_ND_OFFLOAD_CONFIG = WIFI_HAL_ATTR_START,
+    ANDR_WIFI_ATTRIBUTE_PNO_RANDOM_MAC_OUI,
+    ANDR_WIFI_ATTRIBUTE_GSCAN_OUI_MAX
 } wifi_attr_t;
 
 enum wifi_rssi_monitor_attr {
-    RSSI_MONITOR_ATTRIBUTE_MAX_RSSI,
+    RSSI_MONITOR_ATTRIBUTE_MAX_RSSI = WIFI_HAL_ATTR_START,
     RSSI_MONITOR_ATTRIBUTE_MIN_RSSI,
     RSSI_MONITOR_ATTRIBUTE_START,
+    RSSI_MONITOR_ATTRIBUTE_MAX
 };
 
 enum wifi_apf_attr {
     APF_ATTRIBUTE_VERSION,
     APF_ATTRIBUTE_MAX_LEN,
     APF_ATTRIBUTE_PROGRAM,
-    APF_ATTRIBUTE_PROGRAM_LEN
+    APF_ATTRIBUTE_PROGRAM_LEN,
+    APF_ATTRIBUTE_MAX
 };
 
 enum apf_request_type {
-- 
2.20.1