commit df39b2550b84edbec8cb4cfb57dd97cbfca7b3d0
author Ahmed ElArabawy <arabawy@google.com> Mon Nov 11 17:46:56 2019 -0800
committer Ahmed ElArabawy <arabawy@google.com> Wed Nov 13 21:53:41 2019 -0800
tree 493afdffa692ffc9bebbbe1e59b1282f284a1544
parent f621f86fd2c1326d13e85c739dd02bc3ed810274

feature_set change from 'int' to 'long'

This commit makes some adjustments to accomodate the change of the
feature_set from being an int (32 bits) into becoming a long (64 bits)

Bug: 139354972
Test: Manual: Build succeeds
Change-Id: I665b57707fa5b22dd847023c02c92e8513c9caf6

qcwcn/wifi_hal/ifaceeventhandler.cpp

diff --git a/qcwcn/wifi_hal/ifaceeventhandler.cpp b/qcwcn/wifi_hal/ifaceeventhandler.cpp
index 8750999..d814a9c 100644
--- a/qcwcn/wifi_hal/ifaceeventhandler.cpp
+++ b/qcwcn/wifi_hal/ifaceeventhandler.cpp
@@ -244,7 +244,7 @@
                     return -EINVAL;
                 }
                 mSet = nla_get_u32(tb_vendor[QCA_WLAN_VENDOR_ATTR_FEATURE_SET]);
-                ALOGV("Supported feature set : %x", mSet);
+                ALOGV("Supported feature set : %lx", mSet);
 
                 break;
             }
@@ -304,7 +304,7 @@
                         __func__);
                     for(i = 0; i < *mSetSizePtr; i++)
                     {
-                        ALOGV("%x", *(mConcurrencySet + i));
+                        ALOGV("%lx", *(mConcurrencySet + i));
                     }
                 }
             }

qcwcn/wifi_hal/wifi_hal.cpp

diff --git a/qcwcn/wifi_hal/wifi_hal.cpp b/qcwcn/wifi_hal/wifi_hal.cpp
index cb82885..1e2be8c 100644
--- a/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/qcwcn/wifi_hal/wifi_hal.cpp
@@ -880,7 +880,7 @@
     }
 
     ALOGV("Initialized Wifi HAL Successfully; vendor cmd = %d Supported"
-            " features : %x", NL80211_CMD_VENDOR, info->supported_feature_set);
+            " features : %lx", NL80211_CMD_VENDOR, info->supported_feature_set);
 
 cld80211_cleanup:
     if (status != 0 || ret != WIFI_SUCCESS) {
@@ -1826,10 +1826,10 @@
     ret = acquire_supported_features(iface, set);
     if (ret != WIFI_SUCCESS) {
         *set = info->supported_feature_set;
-        ALOGV("Supported feature set acquired at initialization : %x", *set);
+        ALOGV("Supported feature set acquired at initialization : %lx", *set);
     } else {
         info->supported_feature_set = *set;
-        ALOGV("Supported feature set acquired : %x", *set);
+        ALOGV("Supported feature set acquired : %lx", *set);
     }
     return WIFI_SUCCESS;
 }

qcwcn/wifi_hal/wificonfig.cpp

diff --git a/qcwcn/wifi_hal/wificonfig.cpp b/qcwcn/wifi_hal/wificonfig.cpp
index a2f0fb3..2174d78 100644
--- a/qcwcn/wifi_hal/wificonfig.cpp
+++ b/qcwcn/wifi_hal/wificonfig.cpp
@@ -471,7 +471,7 @@
 
     /* Check Supported low-latency capability */
     if (!(info->supported_feature_set & WIFI_FEATURE_SET_LATENCY_MODE)) {
-        ALOGE("%s: Set latency mode feature not supported %x", __FUNCTION__,
+        ALOGE("%s: Set latency mode feature not supported %lx", __FUNCTION__,
               info->supported_feature_set);
         return WIFI_ERROR_NOT_SUPPORTED;
     }