commit 3c0540a29b391f438e349741b2de3d4a6102bdb8
author Veerendranath Jakkam <quic_vjakkam@quicinc.com> Fri Mar 20 20:45:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 20 20:45:53 2020 +0000
tree 136d49516653ee557b9c058bb9f87ea7476f80f6
parent 4456c31a2fc39dda978fec2c205708baeb7b29d2
parent 24c9cf08542055ba659517d7ea7a85e12299c219

WiFi-HAL: get base wlan interface index from global handle am: 24c9cf0854

Change-Id: I78d5aac4d510c3063210ed3ad8f0140145331657

qcwcn/wifi_hal/wificonfig.cpp

diff --git a/qcwcn/wifi_hal/wificonfig.cpp b/qcwcn/wifi_hal/wificonfig.cpp
index 1bf71c6..7590f62 100644
--- a/qcwcn/wifi_hal/wificonfig.cpp
+++ b/qcwcn/wifi_hal/wificonfig.cpp
@@ -554,6 +554,13 @@
     WiFiConfigCommand *wifiConfigCommand;
     struct nlattr *nlData;
     u32 qca_vendor_thermal_level;
+    hal_info *info = getHalInfo(handle);
+
+    if (!info || info->num_interfaces < 1) {
+         ALOGE("%s: Error wifi_handle NULL or base wlan interface not present",
+               __FUNCTION__);
+         return WIFI_ERROR_UNKNOWN;
+    }
 
     wifiConfigCommand = new WiFiConfigCommand(
                             handle,
@@ -573,10 +580,9 @@
     }
 
     /* Set the interface Id of the message. */
-    ret = wifiConfigCommand->set_iface_id("wlan0");
-    if (ret != WIFI_SUCCESS) {
-        ALOGE("%s: failed to set iface id. Error:%d",
-            __FUNCTION__, ret);
+    if (wifiConfigCommand->put_u32(NL80211_ATTR_IFINDEX,
+                                   info->interfaces[0]->id)) {
+        ALOGE("%s: Failed to put iface id", __FUNCTION__);
         goto cleanup;
     }