diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-04-30 08:36:57 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2018-04-30 08:36:57 -0600 |
| commit | cf7cfb093670eb78bdd8b03fbe235b5620e7abdc (patch) | |
| tree | e61cf3816d8ae4bfa7caa35c017b3fe2280fccd3 | |
| parent | 2005379d7314393a41f24440788641a46750a5b3 (diff) | |
| parent | 126b7878799d542b06ef3f12b442ae54fa2bc49c (diff) | |
Merge 126b7878799d542b06ef3f12b442ae54fa2bc49c on remote branch
Change-Id: I79da62fbe9684a610269619ce2cdee8fd4e50e5f
| -rw-r--r-- | qdf/linux/src/qdf_trace.c | 10 | ||||
| -rw-r--r-- | wmi/inc/wmi_unified_param.h | 1 | ||||
| -rw-r--r-- | wmi/src/wmi_unified_tlv.c | 12 |
3 files changed, 15 insertions, 8 deletions
diff --git a/qdf/linux/src/qdf_trace.c b/qdf/linux/src/qdf_trace.c index 3d9ca60991ee..438d9e46aca5 100644 --- a/qdf/linux/src/qdf_trace.c +++ b/qdf/linux/src/qdf_trace.c @@ -1240,10 +1240,12 @@ static bool qdf_dp_enable_check(qdf_nbuf_t nbuf, enum QDF_DP_TRACE_ID code, if (qdf_dp_trace_enable_track(code) == false) return false; - if ((nbuf) && ((QDF_NBUF_CB_TX_PACKET_TRACK(nbuf) != - QDF_NBUF_TX_PKT_DATA_TRACK) || - ((dir == QDF_TX) && (QDF_NBUF_CB_TX_DP_TRACE(nbuf) == 0)) || - ((dir == QDF_RX) && (QDF_NBUF_CB_RX_DP_TRACE(nbuf) == 0)))) + if (!nbuf) + return false; + + if ((QDF_NBUF_CB_TX_PACKET_TRACK(nbuf) != QDF_NBUF_TX_PKT_DATA_TRACK) || + ((dir == QDF_TX) && (QDF_NBUF_CB_TX_DP_TRACE(nbuf) == 0)) || + ((dir == QDF_RX) && (QDF_NBUF_CB_RX_DP_TRACE(nbuf) == 0))) return false; return true; diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 5aec61113eae..9ead04fe1023 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -1907,6 +1907,7 @@ struct roam_offload_scan_params { bool fw_pmksa_cache; #endif bool is_ese_assoc; + bool is_11r_assoc; struct mobility_domain_info mdid; #ifndef WMI_NON_TLV_SUPPORT /* THis is not available in non tlv target. diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 178f74b1fc5f..2f5fb84536ac 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -4681,7 +4681,8 @@ QDF_STATUS send_roam_scan_offload_mode_cmd_tlv(wmi_unified_t wmi_handle, if ((auth_mode != WMI_AUTH_NONE) && ((auth_mode != WMI_AUTH_OPEN) || (auth_mode == WMI_AUTH_OPEN && - roam_req->mdid.mdie_present) || + roam_req->mdid.mdie_present && + roam_req->is_11r_assoc) || roam_req->is_ese_assoc)) { len += WMI_TLV_HDR_SIZE; if (roam_req->is_ese_assoc) @@ -4690,7 +4691,8 @@ QDF_STATUS send_roam_scan_offload_mode_cmd_tlv(wmi_unified_t wmi_handle, else if (auth_mode == WMI_AUTH_FT_RSNA || auth_mode == WMI_AUTH_FT_RSNA_PSK || (auth_mode == WMI_AUTH_OPEN && - roam_req->mdid.mdie_present)) + roam_req->mdid.mdie_present && + roam_req->is_11r_assoc)) len += sizeof(wmi_roam_11r_offload_tlv_param); else @@ -4810,7 +4812,8 @@ QDF_STATUS send_roam_scan_offload_mode_cmd_tlv(wmi_unified_t wmi_handle, if ((auth_mode != WMI_AUTH_NONE) && ((auth_mode != WMI_AUTH_OPEN) || (auth_mode == WMI_AUTH_OPEN - && roam_req->mdid.mdie_present) || + && roam_req->mdid.mdie_present && + roam_req->is_11r_assoc) || roam_req->is_ese_assoc)) { if (roam_req->is_ese_assoc) { WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, @@ -4839,7 +4842,8 @@ QDF_STATUS send_roam_scan_offload_mode_cmd_tlv(wmi_unified_t wmi_handle, } else if (auth_mode == WMI_AUTH_FT_RSNA || auth_mode == WMI_AUTH_FT_RSNA_PSK || (auth_mode == WMI_AUTH_OPEN - && roam_req->mdid.mdie_present)) { + && roam_req->mdid.mdie_present && + roam_req->is_11r_assoc)) { WMITLV_SET_HDR(buf_ptr, WMITLV_TAG_ARRAY_STRUC, 0); buf_ptr += WMI_TLV_HDR_SIZE; |