Skip to content

Commit a31b38f

Browse files
author
pswbuild
committed
Synchronize code for OnePlus CPH2649_16.0.0.210(EX01) CPH2653_16.0.0.210(EX01)
Based on QCOM release TAG: kernel/build:AU_LINUX_KERNEL.PLATFORM.4.0.R1.00.00.00.061.111 platform/vendor/nxp/opensource/driver:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/opensource/camera-devicetree:AU_TECHPACK_CAMERA.LA.5.0.R1.00.00.00.000.066 platform/vendor/opensource/camera-kernel:AU_TECHPACK_CAMERA.LA.5.0.R1.00.00.00.000.066 platform/vendor/opensource/dataipa:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/opensource/display-devicetree:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/opensource/display-drivers:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/opensource/eva-devicetree:AU_TECHPACK_CV.LA.2.1.R1.00.00.00.000.032 platform/vendor/opensource/eva-kernel:AU_TECHPACK_CV.LA.2.1.R1.00.00.00.000.032 platform/vendor/opensource/mm-devicetree:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/opensource/mm-drivers:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/opensource/mmrm-devicetree:AU_TECHPACK_VIDEO.LA.5.0.R1.00.00.00.000.049 platform/vendor/opensource/mmrm-driver:AU_TECHPACK_VIDEO.LA.5.0.R1.00.00.00.000.049 platform/vendor/opensource/synx-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/opensource/video-devicetree:AU_TECHPACK_VIDEO.LA.5.0.R1.00.00.00.000.049 platform/vendor/opensource/video-driver:AU_TECHPACK_VIDEO.LA.5.0.R1.00.00.00.000.049 platform/vendor/proprietary/mm-devicetree:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/qcom-opensource/bt-devicetree:AU_TECHPACK_BTFM.LA.1.0.R1.00.00.00.000.057 platform/vendor/qcom-opensource/bt-kernel:AU_TECHPACK_BTFM.LA.1.0.R1.00.00.00.000.057 platform/vendor/qcom-opensource/data-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/data-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/devicetree:AU_LINUX_KERNEL.PLATFORM.4.0.R1.00.00.00.061.111 platform/vendor/qcom-opensource/eSE-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/nfc-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/synx-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom-opensource/wlan/fw-api:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/platform:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/qca-wifi-host-cmn:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/qcacld-3.0:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/utils/sigma-dut:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-opensource/wlan/wlan-devicetree:AU_TECHPACK_WLAN.LA.1.0.R1.00.00.00.000.075 platform/vendor/qcom-proprietary/display-devicetree:AU_TECHPACK_DISPLAY.LA.5.0.R1.00.00.00.000.061 platform/vendor/qcom/opensource/audio-devicetree:AU_TECHPACK_AUDIO_HANDSET.LA.10.0.R1.00.00.00.000.061 platform/vendor/qcom/opensource/audio-kernel-ar:AU_TECHPACK_AUDIO_HANDSET.LA.10.0.R1.00.00.00.000.061 platform/vendor/qcom/opensource/datarmnet:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/datarmnet-ext:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/dsp-devicetree:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/dsp-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/graphics-devicetree:AU_TECHPACK_GRAPHICS.LA.15.0.R1.00.00.00.000.053 platform/vendor/qcom/opensource/graphics-kernel:AU_TECHPACK_GRAPHICS.LA.15.0.R1.00.00.00.000.053 platform/vendor/qcom/opensource/securemsm-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/qcom/opensource/spu-kernel:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/st/opensource/driver:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150 platform/vendor/st/opensource/eSE-driver:AU_LINUX_ANDROID_LA.VENDOR.15.4.0.R1.11.00.00.1168.150
1 parent c9e903b commit a31b38f

1 file changed

Lines changed: 16 additions & 9 deletions

File tree

‎vendor/qcom/opensource/wlan/qcacld-3.0/core/mac/src/pe/lim/lim_send_management_frames.c‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
3-
* Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.
3+
* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
44
*
55
* Permission to use, copy, modify, and/or distribute this software for
66
* any purpose with or without fee is hereby granted, provided that the
@@ -366,7 +366,8 @@ lim_send_probe_req_mgmt_frame(struct mac_context *mac_ctx,
366366
populate_dot11f_eht_caps(mac_ctx, pesession, &pr->eht_cap);
367367

368368
/* Populate Non-AP STA Regulatory connectivity element */
369-
//populate_dot11f_reg_connectivity(mac_ctx, &pr->reg_connect);
369+
if (IS_DOT11_MODE_HE(dot11mode))
370+
populate_dot11f_reg_connectivity(mac_ctx, &pr->reg_connect);
370371

371372
if (addn_ielen && additional_ie) {
372373
qdf_mem_zero((uint8_t *)&extracted_ext_cap,
@@ -3294,7 +3295,8 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
32943295
}
32953296

32963297
/* Populate Non-AP STA Regulatory connectivity element */
3297-
//populate_dot11f_reg_connectivity(mac_ctx, &frm->reg_connect);
3298+
if (IS_DOT11_MODE_HE(pe_session->dot11mode))
3299+
populate_dot11f_reg_connectivity(mac_ctx, &frm->reg_connect);
32983300

32993301
if (pe_session->is11Rconnection) {
33003302
struct bss_description *bssdescr;
@@ -3767,12 +3769,17 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
37673769
MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
37683770
pe_session->peSessionId, mac_hdr->fc.subType));
37693771

3770-
pe_debug("extr_ext_flag %d mbo ie len %d is open auth %d stripped vendor len %d he with tkip %d ht %d vht %d opmode %d vendor vht %d he %d eht %d",
3771-
extr_ext_flag, mbo_ie_len, is_open_auth, current_len,
3772-
pe_session->he_with_wep_tkip,
3773-
frm->HTCaps.present, frm->VHTCaps.present,
3774-
frm->OperatingMode.present, frm->vendor_vht_ie.present,
3775-
frm->he_cap.present, frm->eht_cap.present);
3772+
pe_debug("Assoc Req IEs: dot11mode %d, extcap %d, open %d, IE len:: mbo %d vendor %d, rsnx %d, mscs %d, rsn_sel %d, ft11r %d, mlo %d, eht %d, fils %d",
3773+
pe_session->dot11mode, extr_ext_flag,
3774+
is_open_auth, mbo_ie_len,
3775+
vendor_ie_len, rsnx_ie_len,
3776+
mscs_ext_ie_len,
3777+
rsn_sel_ie_len,
3778+
adaptive_11r_ie_len,
3779+
mlo_ie_len,
3780+
eht_cap_ie_len,
3781+
fils_hlp_ie_len);
3782+
37763783
pe_nofl_info("Assoc req TX: vdev %d to "QDF_MAC_ADDR_FMT" seq num %d",
37773784
pe_session->vdev_id, QDF_MAC_ADDR_REF(pe_session->bssId),
37783785
mac_ctx->mgmtSeqNum);

0 commit comments

Comments
 (0)