commit 9804bc197fbe887fa20678f6c91bb593602d3d98
author Linux Build Service Account <lnxbuild@localhost> Tue May 16 13:29:25 2023 -0700
committer Linux Build Service Account <lnxbuild@localhost> Tue May 16 13:29:25 2023 -0700
tree cf050236904397f0a54711115734229339c3845b
parent 9af9025c4885308d7964fcfce3073fc27872afd3
parent b9256148602e9c6fdd5dbac64fc0a2a5b0d5593d

Merge b9256148602e9c6fdd5dbac64fc0a2a5b0d5593d on remote branch

Change-Id: I0d30bf6942c166057d2ca1ba2879fa5c760f763d

qcwcn/wifi_hal/ifaceeventhandler.cpp

diff --git a/qcwcn/wifi_hal/ifaceeventhandler.cpp b/qcwcn/wifi_hal/ifaceeventhandler.cpp
index 5f98de4..4f6271a 100644
--- a/qcwcn/wifi_hal/ifaceeventhandler.cpp
+++ b/qcwcn/wifi_hal/ifaceeventhandler.cpp
@@ -762,9 +762,14 @@
     u8 *buff_ptr;
 
     static struct nla_policy
-        policy[QCA_WLAN_VENDOR_ATTR_RADIO_MATRIX_MAX + 1] = {
-            [QCA_WLAN_VENDOR_ATTR_RADIO_MATRIX_SUPPORTED_CFGS] =
-                                                { .type = NLA_NESTED},
+        radio_combination_policy[QCA_WLAN_VENDOR_ATTR_RADIO_COMBINATIONS_MAX + 1] = {
+            [QCA_WLAN_VENDOR_ATTR_RADIO_COMBINATIONS_CFGS] = { .type = NLA_NESTED },
+        };
+
+    static struct nla_policy
+        radio_cfg_policy[QCA_WLAN_VENDOR_ATTR_SUPPORTED_RADIO_CFG_MAX + 1] = {
+            [QCA_WLAN_VENDOR_ATTR_SUPPORTED_RADIO_CFG_BAND] = { .type = NLA_U32 },
+            [QCA_WLAN_VENDOR_ATTR_SUPPORTED_RADIO_CFG_ANTENNA] = { .type = NLA_U8 },
         };
 
     if (nla_parse(tbVendor, QCA_WLAN_VENDOR_ATTR_RADIO_MATRIX_MAX,
@@ -790,7 +795,7 @@
             rem) {
         if (nla_parse_nested(radio_combination,
                     QCA_WLAN_VENDOR_ATTR_RADIO_COMBINATIONS_MAX,
-                    attr, policy)) {
+                    attr, radio_combination_policy)) {
             ALOGI("%s: nla_parse_nested radio combination fail", __FUNCTION__);
             continue;
         }
@@ -803,7 +808,7 @@
                 rem_radio) {
             if (nla_parse_nested(radio_cfg,
                         QCA_WLAN_VENDOR_ATTR_SUPPORTED_RADIO_CFG_MAX,
-                        attr_cfg, policy)) {
+                        attr_cfg, radio_cfg_policy)) {
                 ALOGI("%s: nla_parse_nested radio cfg attr fail", __FUNCTION__);
                 continue;
             }