diff options
| author | Manjeet Singh <manjee@codeaurora.org> | 2016-09-02 18:11:43 +0530 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-09-10 19:05:45 -0700 |
| commit | fdd2ac755dd63e96b6adf0076ccbf523b8e650e1 (patch) | |
| tree | bce64fb38b84e095151eb80bc4ca006291421491 | |
| parent | 75c2f97be490d020f27a3b28d846a103218293e7 (diff) | |
qcacld-3.0: Fix type mismatch in bitwise operator
qcacld-2.0 to qcacld-3.0 propagation.
Type mismatch is present in bitwise operation for TDLS specific
variables in hdd_update_tgt_services.
Change bitwise operation to logical as the variable in question
is used like a flag and not as a bitfield.
Change-Id: I63692816d0f4d867206a3d6b07363bbb054c6062
CRs-Fixed: 1017937
(cherry picked from commit d3e615b8fa6bcc58321ccc670b797fea7467ffc4)
| -rw-r--r-- | core/hdd/src/wlan_hdd_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index f5a27fb7507a..7f6aac2791da 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -839,8 +839,10 @@ static void hdd_update_tgt_services(hdd_context_t *hdd_ctx, #endif #ifdef FEATURE_WLAN_TDLS config->fEnableTDLSSupport &= cfg->en_tdls; - config->fEnableTDLSOffChannel &= cfg->en_tdls_offchan; - config->fEnableTDLSBufferSta &= cfg->en_tdls_uapsd_buf_sta; + config->fEnableTDLSOffChannel = config->fEnableTDLSOffChannel && + cfg->en_tdls_offchan; + config->fEnableTDLSBufferSta = config->fEnableTDLSBufferSta && + cfg->en_tdls_uapsd_buf_sta; if (config->fTDLSUapsdMask && cfg->en_tdls_uapsd_sleep_sta) { config->fEnableTDLSSleepSta = true; } else { |