From 6e9b9f970b3f490d0330f87f8f17267922e92b87 Mon Sep 17 00:00:00 2001 From: Jiachao Wu Date: Wed, 3 Jan 2018 13:35:40 +0800 Subject: [PATCH] qcacld-3.0: Extend fw log level string length The string length of FwDebugModuleLogleveconfig is over 255 if set all firmware log level in config file. Now FW moudle number is 67 which mean the string length might be 336(67*5+1). Extend the length to 512. Change-Id: If9842f3bfdc9ae6b3351c27c3166e2940de71fb8 CRs-Fixed: 2166118 --- core/hdd/inc/wlan_hdd_cfg.h | 6 +++--- core/hdd/src/wlan_hdd_cfg.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index ed95ee28af9a..2af150822685 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -49,7 +49,7 @@ struct hdd_context; -#define FW_MODULE_LOG_LEVEL_STRING_LENGTH (255) +#define FW_MODULE_LOG_LEVEL_STRING_LENGTH (512) #define TX_SCHED_WRR_PARAM_STRING_LENGTH (50) #define TX_SCHED_WRR_PARAMS_NUM (5) #define CFG_ENABLE_RX_THREAD (1 << 0) @@ -15017,7 +15017,7 @@ void hdd_update_tgt_cfg(void *context, void *param); * Return: QDF_STATUS */ QDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *array, - uint8_t *len, uint8_t array_max_len); + uint8_t *len, uint16_t array_max_len); QDF_STATUS hdd_hex_string_to_u16_array(char *str, uint16_t *int_array, uint8_t *len, uint8_t int_array_max_len); diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index be65259e4518..61e88846e876 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -7640,7 +7640,7 @@ static void hdd_set_fine_time_meas_cap(struct hdd_context *hdd_ctx) */ static QDF_STATUS hdd_convert_string_to_array(char *str, uint8_t *array, - uint8_t *len, uint8_t array_max_len, bool to_hex) + uint8_t *len, uint16_t array_max_len, bool to_hex) { char *format, *s = str; @@ -7690,7 +7690,7 @@ static QDF_STATUS hdd_hex_string_to_u8_array(char *str, uint8_t *hex_array, } QDF_STATUS hdd_string_to_u8_array(char *str, uint8_t *array, - uint8_t *len, uint8_t array_max_len) + uint8_t *len, uint16_t array_max_len) { return hdd_convert_string_to_array(str, array, len, array_max_len, false);