samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Add change to replace free connect request API

Browse Source 
In current scenario osif_cm_free_connect_req() and mlo_free_connect_ies()
used to free up connect request and its sub memory.
Similarly cm_free_connect_req() and cm_free_connect_req_param() also
free up the connect request and its sub memory.

So replace osif_cm_free_connect_req() with ucfg_cm_free_connect_req(),
mlo_free_connect_ies() and qdf_mem_free() with wlan_cm_free_connect_req()
and  mlo_free_connect_ies() with wlan_cm_free_connect_req_param().

Change-Id: Ie62603652dd77ae5ae9f7b7085d4b9bb257eaf53
CRs-Fixed: 3554234
This commit is contained in:
Vijay Patil
2023-06-23 10:28:57 +05:30
committed by Rahul Choudhary
parent fe2cdfb7a9
commit c1d9d64d61
8 changed files with 97 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
os_if/linux/mlme/src/osif_cm_req.c
View File

@@ -38,22 +38,6 @@
#include <wlan_mlo_mgr_setup.h>
#endif
static void osif_cm_free_wep_key_params(struct wlan_cm_connect_req *connect_req)
{
if (connect_req->crypto.wep_keys.key) {
qdf_mem_zero(connect_req->crypto.wep_keys.key,
connect_req->crypto.wep_keys.key_len);
qdf_mem_free(connect_req->crypto.wep_keys.key);
connect_req->crypto.wep_keys.key = NULL;
}
if (connect_req->crypto.wep_keys.seq) {
qdf_mem_zero(connect_req->crypto.wep_keys.seq,
connect_req->crypto.wep_keys.seq_len);
qdf_mem_free(connect_req->crypto.wep_keys.seq);
connect_req->crypto.wep_keys.seq = NULL;
}
}
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
static QDF_STATUS
osif_cm_update_wep_seq_info(struct wlan_cm_connect_req *connect_req,
@@ -65,7 +49,7 @@ osif_cm_update_wep_seq_info(struct wlan_cm_connect_req *connect_req,
connect_req->crypto.wep_keys.seq =
qdf_mem_malloc(connect_req->crypto.wep_keys.seq_len);
if (!connect_req->crypto.wep_keys.seq) {
osif_cm_free_wep_key_params(connect_req);
ucfg_cm_free_wep_key_params(connect_req);
return QDF_STATUS_E_NOMEM;
}
qdf_mem_copy(connect_req->crypto.wep_keys.seq,
@@ -461,22 +445,6 @@ osif_cm_fill_connect_params(struct wlan_cm_connect_req *req,
(struct qdf_mac_addr *)&params->prev_bssid);
}
static void osif_cm_free_connect_req(struct wlan_cm_connect_req *connect_req)
{
if (connect_req->scan_ie.ptr) {
qdf_mem_free(connect_req->scan_ie.ptr);
connect_req->scan_ie.ptr = NULL;
}
if (connect_req->assoc_ie.ptr) {
qdf_mem_free(connect_req->assoc_ie.ptr);
connect_req->assoc_ie.ptr = NULL;
}
osif_cm_free_wep_key_params(connect_req);
qdf_mem_free(connect_req);
}
#ifdef WLAN_FEATURE_11BE_MLO
#ifdef WLAN_FEATURE_11BE_MLO_ADV_FEATURE
static inline
@@ -724,7 +692,7 @@ int osif_cm_connect(struct net_device *dev, struct wlan_objmgr_vdev *vdev,
connect_req->ssid.length = req->ssid_len;
if (connect_req->ssid.length > WLAN_SSID_MAX_LEN) {
osif_err("Invalid ssid len %zu", req->ssid_len);
osif_cm_free_connect_req(connect_req);
ucfg_cm_free_connect_req(connect_req);
return -EINVAL;
}
@@ -774,7 +742,7 @@ int osif_cm_connect(struct net_device *dev, struct wlan_objmgr_vdev *vdev,
osif_err("Connect failed with status %d", status);
connect_start_fail:
osif_cm_free_connect_req(connect_req);
ucfg_cm_free_connect_req(connect_req);
return qdf_status_to_os_return(status);
}