|
@@ -2883,7 +2883,8 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
|
|
|
rsnx_ie_len = rsnx_ie[1] + 2;
|
|
|
}
|
|
|
/* MSCS ext ie */
|
|
|
- if (wlan_get_ext_ie_ptr_from_ext_id(MSCS_OUI_TYPE, MSCS_OUI_SIZE,
|
|
|
+ if (add_ie &&
|
|
|
+ wlan_get_ext_ie_ptr_from_ext_id(MSCS_OUI_TYPE, MSCS_OUI_SIZE,
|
|
|
add_ie, add_ie_len)) {
|
|
|
mscs_ext_ie = qdf_mem_malloc(WLAN_MAX_IE_LEN + 2);
|
|
|
if (!mscs_ext_ie)
|
|
@@ -2908,8 +2909,10 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
|
|
|
* TLVs with same attribute in a single IE.
|
|
|
* Strip off the MBO IE from add_ie and append it at the end.
|
|
|
*/
|
|
|
- if (wlan_get_vendor_ie_ptr_from_oui(SIR_MAC_MBO_OUI,
|
|
|
- SIR_MAC_MBO_OUI_SIZE, add_ie, add_ie_len)) {
|
|
|
+ if (add_ie &&
|
|
|
+ wlan_get_vendor_ie_ptr_from_oui(SIR_MAC_MBO_OUI,
|
|
|
+ SIR_MAC_MBO_OUI_SIZE, add_ie,
|
|
|
+ add_ie_len)) {
|
|
|
mbo_ie = qdf_mem_malloc(DOT11F_IE_MBO_IE_MAX_LEN + 2);
|
|
|
if (!mbo_ie)
|
|
|
goto end;
|
|
@@ -2947,7 +2950,8 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
|
|
|
* Append the IEs just before MBO IEs as MBO IEs have to be at the
|
|
|
* end of the frame.
|
|
|
*/
|
|
|
- if (wlan_get_ie_ptr_from_eid(WLAN_ELEMID_VENDOR, add_ie, add_ie_len)) {
|
|
|
+ if (add_ie &&
|
|
|
+ wlan_get_ie_ptr_from_eid(WLAN_ELEMID_VENDOR, add_ie, add_ie_len)) {
|
|
|
vendor_ies = qdf_mem_malloc(MAX_VENDOR_IES_LEN + 2);
|
|
|
if (vendor_ies) {
|
|
|
current_len = add_ie_len;
|