samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
포크 0
코드 이슈 풀 리퀘스트 Actions Packages Projects 릴리즈 위키 활동

qcacld-3.0: Remove duplicate struct struct wlan_ies

소스 검색 
Remove duplicate struct struct wlan_ies and replace with
struct element_info.

Change-Id: I60d34db5845d840679052912182ea09b86988e43
CRs-Fixed: 2848237
This commit is contained in:
Abhishek Singh
2021-01-05 10:31:24 +05:30
committed by snandini
부모 e5e897f263
커밋 d3cbcc0d30
17개의 변경된 파일과 89개의 추가작업 그리고 99개의 파일을 삭제
Download Patch File Download Diff File Expand all files Collapse all files

16
components/mlme/core/inc/wlan_mlme_main.h
파일 보기

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -59,8 +59,8 @@ struct wlan_mlme_psoc_ext_obj {
* @from_ap: True if the disconnection is initiated from AP
*/
struct wlan_disconnect_info {
struct wlan_ies self_discon_ies;
struct wlan_ies peer_discon_ies;
struct element_info self_discon_ies;
struct element_info peer_discon_ies;
uint32_t discon_reason;
bool from_ap;
};
@@ -72,7 +72,7 @@ struct wlan_disconnect_info {
*/
struct sae_auth_retry {
uint8_t sae_auth_max_retry;
struct wlan_ies sae_auth;
struct element_info sae_auth;
};
/**
@@ -456,7 +456,7 @@ void mlme_free_sae_auth_retry(struct wlan_objmgr_vdev *vdev);
* Return: None
*/
void mlme_set_self_disconnect_ies(struct wlan_objmgr_vdev *vdev,
struct wlan_ies *ie);
struct element_info *ie);
/**
* mlme_free_self_disconnect_ies() - Free the self diconnect IEs
@@ -472,7 +472,7 @@ void mlme_free_self_disconnect_ies(struct wlan_objmgr_vdev *vdev);
*
* Return: Returns a pointer to the self disconnect IEs present in vdev object
*/
struct wlan_ies *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev);
struct element_info *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev);
/**
* mlme_set_peer_disconnect_ies() - Cache disconnect IEs received from peer
@@ -482,7 +482,7 @@ struct wlan_ies *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev);
* Return: None
*/
void mlme_set_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev,
struct wlan_ies *ie);
struct element_info *ie);
/**
* mlme_free_peer_disconnect_ies() - Free the peer diconnect IEs
@@ -538,7 +538,7 @@ bool mlme_get_reconn_after_assoc_timeout_flag(struct wlan_objmgr_psoc *psoc,
*
* Return: Returns a pointer to the peer disconnect IEs present in vdev object
*/
struct wlan_ies *mlme_get_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev);
struct element_info *mlme_get_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev);
/**
* mlme_set_peer_pmf_status() - set pmf status of peer

60
components/mlme/core/src/wlan_mlme_main.c
파일 보기

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -2381,18 +2381,18 @@ void mlme_free_sae_auth_retry(struct wlan_objmgr_vdev *vdev)
}
mlme_priv->sae_retry.sae_auth_max_retry = 0;
if (mlme_priv->sae_retry.sae_auth.data)
qdf_mem_free(mlme_priv->sae_retry.sae_auth.data);
mlme_priv->sae_retry.sae_auth.data = NULL;
if (mlme_priv->sae_retry.sae_auth.ptr)
qdf_mem_free(mlme_priv->sae_retry.sae_auth.ptr);
mlme_priv->sae_retry.sae_auth.ptr = NULL;
mlme_priv->sae_retry.sae_auth.len = 0;
}
void mlme_set_self_disconnect_ies(struct wlan_objmgr_vdev *vdev,
struct wlan_ies *ie)
struct element_info *ie)
{
struct mlme_legacy_priv *mlme_priv;
if (!ie || !ie->len || !ie->data) {
if (!ie || !ie->len || !ie->ptr) {
mlme_legacy_debug("disocnnect IEs are NULL");
return;
}
@@ -2403,23 +2403,23 @@ void mlme_set_self_disconnect_ies(struct wlan_objmgr_vdev *vdev,
return;
}
if (mlme_priv->disconnect_info.self_discon_ies.data) {
qdf_mem_free(mlme_priv->disconnect_info.self_discon_ies.data);
if (mlme_priv->disconnect_info.self_discon_ies.ptr) {
qdf_mem_free(mlme_priv->disconnect_info.self_discon_ies.ptr);
mlme_priv->disconnect_info.self_discon_ies.len = 0;
}
mlme_priv->disconnect_info.self_discon_ies.data =
mlme_priv->disconnect_info.self_discon_ies.ptr =
qdf_mem_malloc(ie->len);
if (!mlme_priv->disconnect_info.self_discon_ies.data)
if (!mlme_priv->disconnect_info.self_discon_ies.ptr)
return;
qdf_mem_copy(mlme_priv->disconnect_info.self_discon_ies.data,
ie->data, ie->len);
qdf_mem_copy(mlme_priv->disconnect_info.self_discon_ies.ptr,
ie->ptr, ie->len);
mlme_priv->disconnect_info.self_discon_ies.len = ie->len;
mlme_legacy_debug("Self disconnect IEs");
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_MLME, QDF_TRACE_LEVEL_DEBUG,
mlme_priv->disconnect_info.self_discon_ies.data,
mlme_priv->disconnect_info.self_discon_ies.ptr,
mlme_priv->disconnect_info.self_discon_ies.len);
}
@@ -2433,14 +2433,14 @@ void mlme_free_self_disconnect_ies(struct wlan_objmgr_vdev *vdev)
return;
}
if (mlme_priv->disconnect_info.self_discon_ies.data) {
qdf_mem_free(mlme_priv->disconnect_info.self_discon_ies.data);
mlme_priv->disconnect_info.self_discon_ies.data = NULL;
if (mlme_priv->disconnect_info.self_discon_ies.ptr) {
qdf_mem_free(mlme_priv->disconnect_info.self_discon_ies.ptr);
mlme_priv->disconnect_info.self_discon_ies.ptr = NULL;
mlme_priv->disconnect_info.self_discon_ies.len = 0;
}
}
struct wlan_ies *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev)
struct element_info *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev)
{
struct mlme_legacy_priv *mlme_priv;
@@ -2454,11 +2454,11 @@ struct wlan_ies *mlme_get_self_disconnect_ies(struct wlan_objmgr_vdev *vdev)
}
void mlme_set_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev,
struct wlan_ies *ie)
struct element_info *ie)
{
struct mlme_legacy_priv *mlme_priv;
if (!ie || !ie->len || !ie->data) {
if (!ie || !ie->len || !ie->ptr) {
mlme_legacy_debug("disocnnect IEs are NULL");
return;
}
@@ -2469,23 +2469,23 @@ void mlme_set_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev,
return;
}
if (mlme_priv->disconnect_info.peer_discon_ies.data) {
qdf_mem_free(mlme_priv->disconnect_info.peer_discon_ies.data);
if (mlme_priv->disconnect_info.peer_discon_ies.ptr) {
qdf_mem_free(mlme_priv->disconnect_info.peer_discon_ies.ptr);
mlme_priv->disconnect_info.peer_discon_ies.len = 0;
}
mlme_priv->disconnect_info.peer_discon_ies.data =
mlme_priv->disconnect_info.peer_discon_ies.ptr =
qdf_mem_malloc(ie->len);
if (!mlme_priv->disconnect_info.peer_discon_ies.data)
if (!mlme_priv->disconnect_info.peer_discon_ies.ptr)
return;
qdf_mem_copy(mlme_priv->disconnect_info.peer_discon_ies.data,
ie->data, ie->len);
qdf_mem_copy(mlme_priv->disconnect_info.peer_discon_ies.ptr,
ie->ptr, ie->len);
mlme_priv->disconnect_info.peer_discon_ies.len = ie->len;
mlme_legacy_debug("peer disconnect IEs");
QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_MLME, QDF_TRACE_LEVEL_DEBUG,
mlme_priv->disconnect_info.peer_discon_ies.data,
mlme_priv->disconnect_info.peer_discon_ies.ptr,
mlme_priv->disconnect_info.peer_discon_ies.len);
}
@@ -2499,14 +2499,14 @@ void mlme_free_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev)
return;
}
if (mlme_priv->disconnect_info.peer_discon_ies.data) {
qdf_mem_free(mlme_priv->disconnect_info.peer_discon_ies.data);
mlme_priv->disconnect_info.peer_discon_ies.data = NULL;
if (mlme_priv->disconnect_info.peer_discon_ies.ptr) {
qdf_mem_free(mlme_priv->disconnect_info.peer_discon_ies.ptr);
mlme_priv->disconnect_info.peer_discon_ies.ptr = NULL;
mlme_priv->disconnect_info.peer_discon_ies.len = 0;
}
}
struct wlan_ies *mlme_get_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev)
struct element_info *mlme_get_peer_disconnect_ies(struct wlan_objmgr_vdev *vdev)
{
struct mlme_legacy_priv *mlme_priv;

12
components/mlme/dispatcher/inc/wlan_mlme_public_struct.h
파일 보기

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@@ -2502,14 +2502,4 @@ struct mlme_roam_debug_info {
struct roam_initial_data roam_init_info;
struct roam_msg_info roam_msg_info;
};
/**
* struct wlan_ies - Generic WLAN Information Element(s) format
* @len: Total length of the IEs
* @data: IE data
*/
struct wlan_ies {
uint16_t len;
uint8_t *data;
};
#endif