commit eb1ea83d6f19c659789ac55e275c774e624ecaaf
author developer <developer@mediatek.com> Wed May 24 14:46:27 2023 +0800
committer developer <developer@mediatek.com> Wed May 24 14:46:27 2023 +0800
tree 0a0422d499c8950bdbec38341d3b45bd425662d8
parent 2738ec1c2174f1e998942c345ca4ec9ea72f318e

[[RDK-B]fix crash in hal api]

[Description]
Fix hal api crash cause test fail

[Release-log]
N/A

Change-Id: I17dcfe3b7d4dfcbced34eccc98a2d85c9800bcc9

src/logan_wifi/wifi_hal.c

diff --git a/src/logan_wifi/wifi_hal.c b/src/logan_wifi/wifi_hal.c
index 394ce45..09194e4 100644
--- a/src/logan_wifi/wifi_hal.c
+++ b/src/logan_wifi/wifi_hal.c
@@ -11582,29 +11582,30 @@
        }
    }
 
-   if( nla_data(tb[NL80211_ATTR_VHT_CAPABILITY]) )
-   {
-       printf("Type is VHT\n");
-       if(rinfo[NL80211_RATE_INFO_VHT_NSS])
-           ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->nss = nla_get_u8(rinfo[NL80211_RATE_INFO_VHT_NSS]);
+       if( nla_data(tb[NL80211_ATTR_VHT_CAPABILITY]) )
+       {
+           printf("Type is VHT\n");
+           if(rinfo[NL80211_RATE_INFO_VHT_NSS])
+               ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->nss = nla_get_u8(rinfo[NL80211_RATE_INFO_VHT_NSS]);
 
-       if(rinfo[NL80211_RATE_INFO_40_MHZ_WIDTH])
-            ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 1;
-       if(rinfo[NL80211_RATE_INFO_80_MHZ_WIDTH])
-            ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 2;
-       if(rinfo[NL80211_RATE_INFO_80P80_MHZ_WIDTH])
-             ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 2;
-       if(rinfo[NL80211_RATE_INFO_160_MHZ_WIDTH])
-             ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 2;
-       if((rinfo[NL80211_RATE_INFO_10_MHZ_WIDTH]) || (rinfo[NL80211_RATE_INFO_5_MHZ_WIDTH]) )
-                         ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 0;
-  }
-  else
-  {
-      printf(" OFDM or CCK \n");
-      ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 0;
-      ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->nss = 0;
-  }
+           if(rinfo[NL80211_RATE_INFO_40_MHZ_WIDTH])
+                ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 1;
+           if(rinfo[NL80211_RATE_INFO_80_MHZ_WIDTH])
+                ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 2;
+           if(rinfo[NL80211_RATE_INFO_80P80_MHZ_WIDTH])
+                 ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 2;
+           if(rinfo[NL80211_RATE_INFO_160_MHZ_WIDTH])
+                 ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 2;
+           if((rinfo[NL80211_RATE_INFO_10_MHZ_WIDTH]) || (rinfo[NL80211_RATE_INFO_5_MHZ_WIDTH]) )
+                             ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 0;
+      }
+      else
+      {
+          printf(" OFDM or CCK \n");
+          ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->bw = 0;
+          ((wifi_associated_dev_rate_info_rx_stats_t*)arg)->nss = 0;
+      }
+    }
 
   if(sinfo[NL80211_STA_INFO_RX_BITRATE]) {
       if(rinfo[NL80211_RATE_INFO_MCS])
@@ -11723,28 +11724,30 @@
             return NL_SKIP;
         }
     }
-    if(nla_data(tb[NL80211_ATTR_VHT_CAPABILITY]))
-    {
-        printf("Type is VHT\n");
-        if(rinfo[NL80211_RATE_INFO_VHT_NSS])
-            ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->nss = nla_get_u8(rinfo[NL80211_RATE_INFO_VHT_NSS]);
+    if (tb[NL80211_ATTR_VHT_CAPABILITY])) {
+        if(nla_data(tb[NL80211_ATTR_VHT_CAPABILITY]))
+        {
+            printf("Type is VHT\n");
+            if(rinfo[NL80211_RATE_INFO_VHT_NSS])
+                ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->nss = nla_get_u8(rinfo[NL80211_RATE_INFO_VHT_NSS]);
 
-        if(rinfo[NL80211_RATE_INFO_40_MHZ_WIDTH])
-            ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 1;
-        if(rinfo[NL80211_RATE_INFO_80_MHZ_WIDTH])
-            ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 2;
-        if(rinfo[NL80211_RATE_INFO_80P80_MHZ_WIDTH])
-            ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 2;
-        if(rinfo[NL80211_RATE_INFO_160_MHZ_WIDTH])
-            ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 2;
-        if((rinfo[NL80211_RATE_INFO_10_MHZ_WIDTH]) || (rinfo[NL80211_RATE_INFO_5_MHZ_WIDTH]))
+            if(rinfo[NL80211_RATE_INFO_40_MHZ_WIDTH])
+                ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 1;
+            if(rinfo[NL80211_RATE_INFO_80_MHZ_WIDTH])
+                ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 2;
+            if(rinfo[NL80211_RATE_INFO_80P80_MHZ_WIDTH])
+                ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 2;
+            if(rinfo[NL80211_RATE_INFO_160_MHZ_WIDTH])
+                ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 2;
+            if((rinfo[NL80211_RATE_INFO_10_MHZ_WIDTH]) || (rinfo[NL80211_RATE_INFO_5_MHZ_WIDTH]))
+                ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 0;
+        }
+        else
+        {
+            printf(" OFDM or CCK \n");
             ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 0;
-    }
-    else
-    {
-        printf(" OFDM or CCK \n");
-        ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->bw = 0;
-        ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->nss = 0;
+            ((wifi_associated_dev_rate_info_tx_stats_t*)arg)->nss = 0;
+        }
     }
 
     if(sinfo[NL80211_STA_INFO_TX_BITRATE]) {