diff options
| author | Masti, Narayanraddi <c_nmasti@qti.qualcomm.com> | 2016-05-19 18:29:47 +0530 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-05-25 19:08:24 +0530 |
| commit | 93c041d58f722d4d826ceb1636e1bbe45d454409 (patch) | |
| tree | 23448fe4b38fbdd3d33c5c96f3d8a24eb61c6700 | |
| parent | 113e447124a22228ec6499c4f12b6c557a04c5cc (diff) | |
qcacld-2.0: Fix type mismatch and bitwise operation on different size
1.Fix argument type mismatch with format specifier in sscanf used by
hdd_hex_string_to_u16_array.
2.Fix bitwise operation on different size by typecasting.
Change-Id: Iccec386d8d88d69ccc4eacd2031d5664ed948acc
CRs-Fixed: 1018489
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg.c | 2 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index ad5a54273c1c..911a01d3781e 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -6252,7 +6252,7 @@ VOS_STATUS hdd_hex_string_to_u16_array(char *str, uint16_t *int_array, uint8_t *len, uint8_t int_array_max_len) { char *s = str; - int val = 0; + uint32_t val = 0; if (str == NULL || int_array == NULL || len == NULL) return VOS_STATUS_E_INVAL; diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 896e359095c3..1c70d4e37060 100644 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -8160,8 +8160,8 @@ static void hdd_update_tgt_services(hdd_context_t *hdd_ctx, cfg->per_band_chainmask_supp); #ifdef FEATURE_WLAN_TDLS cfg_ini->fEnableTDLSSupport &= cfg->en_tdls; - cfg_ini->fEnableTDLSOffChannel &= cfg->en_tdls_offchan; - cfg_ini->fEnableTDLSBufferSta &= cfg->en_tdls_uapsd_buf_sta; + cfg_ini->fEnableTDLSOffChannel &= (uint32_t)cfg->en_tdls_offchan; + cfg_ini->fEnableTDLSBufferSta &= (uint32_t)cfg->en_tdls_uapsd_buf_sta; if (cfg_ini->fTDLSUapsdMask && cfg->en_tdls_uapsd_sleep_sta) { cfg_ini->fEnableTDLSSleepSta = TRUE; |