diff options
author | Cedar Li <tingyingli@google.com> | 2023-10-03 05:45:28 +0000 |
---|---|---|
committer | Cedar Li <tingyingli@google.com> | 2023-10-23 09:32:41 +0000 |
commit | 590dc567ec6b51d30779554e401e6e538ebe3ecb (patch) | |
tree | 7205f4013b41705dfa3190d356b5578097ece0bf | |
parent | 1684e90db0210829e022a31ee8ca7e1ac5ee6907 (diff) | |
download | wlan-590dc567ec6b51d30779554e401e6e538ebe3ecb.tar.gz |
WifiHAL: revise structure to fix u32 pointer issue
Change the data type of "tx_time_per_levels" from a u32 pointer
to a u64 integer by adding a new structure
wifi_radio_stat_internal_v2 to prevent 4 bytes shifting
of the data content which is sent from 64-bit kernel module.
Bug: 281806888
Test: Get correct result of "halutil -stats" command
Change-Id: Id705146dc936eafa1264928730739c40f798c7f0
Signed-off-by: Cedar Li <tingyingli@google.com>
-rw-r--r-- | synadhd/wifi_hal/link_layer_stats.cpp | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/synadhd/wifi_hal/link_layer_stats.cpp b/synadhd/wifi_hal/link_layer_stats.cpp index ee7b468..518fc30 100644 --- a/synadhd/wifi_hal/link_layer_stats.cpp +++ b/synadhd/wifi_hal/link_layer_stats.cpp @@ -66,6 +66,24 @@ typedef struct { wifi_channel_stat channels[]; } wifi_radio_stat_internal; +typedef struct { + wifi_radio radio; // wifi radio (if multiple radio supported) + u32 on_time; // msecs the radio is awake + u32 tx_time; // msecs the radio is transmitting + u32 num_tx_levels; // number of radio transmit power levels + u64 tx_time_per_levels; // pointer to an array of radio transmit per power levels in + // msecs accured over time + u32 rx_time; // msecs the radio is in active receive + u32 on_time_scan; // msecs the radio is awake due to all scan + u32 on_time_nbd; // msecs the radio is awake due to NAN + u32 on_time_gscan; // msecs the radio is awake due to G scan + u32 on_time_roam_scan; // msecs the radio is awake due to roam scan + u32 on_time_pno_scan; // msecs the radio is awake due to PNO scan + u32 on_time_hs20; // msecs the radio is awake due to HS2.0 scans and GAS exchange + u32 num_channels; // number of channels + wifi_channel_stat channels[]; // channel statistics +} wifi_radio_stat_internal_v2; + enum { LSTATS_SUBCMD_GET_INFO = ANDROID_NL80211_SUBCMD_LSTATS_RANGE_START, }; @@ -157,7 +175,7 @@ protected: goto exit; } radio_stat_ptr = - convertToExternalRadioStatStructure((wifi_radio_stat*)data_ptr, + convertToExternalRadioStatStructure((wifi_radio_stat_internal_v2*)data_ptr, &per_radio_size); if (!radio_stat_ptr || !per_radio_size) { ALOGE("No data for radio %d\n", i); @@ -216,14 +234,15 @@ exit: } private: - wifi_radio_stat *convertToExternalRadioStatStructure(wifi_radio_stat *internal_stat_ptr, - uint32_t *per_radio_size) { + wifi_radio_stat *convertToExternalRadioStatStructure( + wifi_radio_stat_internal_v2 *internal_stat_ptr, + uint32_t *per_radio_size) { wifi_radio_stat *external_stat_ptr = NULL; if (!internal_stat_ptr) { ALOGE("Incoming data is null\n"); } else { uint32_t channel_size = internal_stat_ptr->num_channels * sizeof(wifi_channel_stat); - *per_radio_size = offsetof(wifi_radio_stat, channels) + channel_size; + *per_radio_size = offsetof(wifi_radio_stat_internal_v2, channels) + channel_size; external_stat_ptr = (wifi_radio_stat *)malloc(*per_radio_size); if (external_stat_ptr) { external_stat_ptr->radio = internal_stat_ptr->radio; |