qcacld-3.0: Rename and cleanup wlan_cm_set_offload_ssid()

Rename wlan_cm_set_offload_ssid() to
wlan_cm_update_offload_ssid_from_candidate().

Also, add separate APIs for get and set roam_offload_bssid.

Change-Id: I64d6661a265aeafde7c09fa59bc94cf7a49baf0b
CRs-Fixed: 3445337
This commit is contained in:
Surya Prakash Sivaraj
2023-03-27 11:28:55 +05:30
committed by Madan Koyyalamudi
parent 1df6e57a88
commit 90e60e7e05
4 changed files with 68 additions and 38 deletions

View File

@@ -658,7 +658,7 @@ cm_roam_candidate_event_handler(struct wlan_objmgr_psoc *psoc,
QDF_SSID_REF(extracted_ie[1], &extracted_ie[2]));
wlan_cm_set_roam_offload_ssid(vdev, &extracted_ie[2],
extracted_ie[1]);
wlan_cm_get_set_roam_offload_bssid(vdev, &bssid, true);
wlan_cm_set_roam_offload_bssid(vdev, &bssid);
}
/* For 2.4GHz,5GHz get channel from DS IE */

View File

@@ -1119,18 +1119,28 @@ bool wlan_cm_is_roam_sync_in_progress(struct wlan_objmgr_psoc *psoc,
uint8_t vdev_id);
/**
* wlan_cm_get_set_roam_offload_bssid() - Get/Set the roam offload
* bssid of the sae roam offload params
* wlan_cm_set_roam_offload_bssid() - Set the roam offload bssid of the sae
* roam candidate
* @vdev: pointer to vdev
* @bssid: bssid
* @set: true - set; false - get
*
* Return: None
*/
void
wlan_cm_get_set_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid,
bool set);
wlan_cm_set_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid);
/**
* wlan_cm_get_roam_offload_bssid() - Get the roam offload bssid of the sae
* roam candidate
* @vdev: pointer to vdev
* @bssid: bssid
*
* Return: None
*/
void
wlan_cm_get_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid);
/**
* wlan_cm_set_roam_offload_ssid() - Set the roam offload candidate ssid
@@ -1274,7 +1284,8 @@ void mlme_cm_free_roam_stats_info(mlme_vdev_ext_t *ext_hdl)
#endif
/**
* wlan_cm_set_offload_ssid() - Set the roam offload ssid in mlme priv
* wlan_cm_update_offload_ssid_from_candidate() - Set the roam offload ssid of
* the roam candidate into the mlme priv
*
* @pdev: pointer to pdev
* @vdev_id: vdev id
@@ -1286,8 +1297,9 @@ void mlme_cm_free_roam_stats_info(mlme_vdev_ext_t *ext_hdl)
* Return: QDF_STATUS
*/
QDF_STATUS
wlan_cm_set_offload_ssid(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
struct qdf_mac_addr *ap_bssid);
wlan_cm_update_offload_ssid_from_candidate(struct wlan_objmgr_pdev *pdev,
uint8_t vdev_id,
struct qdf_mac_addr *ap_bssid);
#else
static inline
void wlan_cm_roam_activate_pcl_per_vdev(struct wlan_objmgr_psoc *psoc,
@@ -1478,9 +1490,14 @@ wlan_cm_is_roam_sync_in_progress(struct wlan_objmgr_psoc *psoc,
}
static inline void
wlan_cm_get_set_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid,
bool set)
wlan_cm_set_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid)
{
}
static inline void
wlan_cm_get_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid)
{
}
@@ -1525,8 +1542,9 @@ void mlme_cm_free_roam_stats_info(mlme_vdev_ext_t *ext_hdl)
}
static inline QDF_STATUS
wlan_cm_set_offload_ssid(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
struct qdf_mac_addr *ap_bssid)
wlan_cm_update_offload_ssid_from_candidate(struct wlan_objmgr_pdev *pdev,
uint8_t vdev_id,
struct qdf_mac_addr *ap_bssid)
{
return QDF_STATUS_SUCCESS;
}

View File

@@ -4216,9 +4216,8 @@ bool wlan_cm_is_roam_sync_in_progress(struct wlan_objmgr_psoc *psoc,
}
void
wlan_cm_get_set_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid,
bool set)
wlan_cm_set_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid)
{
struct mlme_legacy_priv *mlme_priv;
struct qdf_mac_addr *mlme_bssid;
@@ -4231,20 +4230,31 @@ wlan_cm_get_set_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
mlme_bssid = &(mlme_priv->cm_roam.sae_offload.bssid);
if (set) {
if (!bssid || qdf_is_macaddr_zero(bssid)) {
mlme_err("NULL BSSID");
return;
}
qdf_mem_copy(mlme_bssid->bytes, bssid->bytes,
QDF_MAC_ADDR_SIZE);
} else {
/* Get the BSSID present in sae_offload_param */
if (!bssid)
return;
qdf_mem_copy(bssid->bytes, mlme_bssid->bytes,
QDF_MAC_ADDR_SIZE);
if (!bssid || qdf_is_macaddr_zero(bssid)) {
mlme_err("NULL BSSID");
return;
}
qdf_mem_copy(mlme_bssid->bytes, bssid->bytes, QDF_MAC_ADDR_SIZE);
}
void
wlan_cm_get_roam_offload_bssid(struct wlan_objmgr_vdev *vdev,
struct qdf_mac_addr *bssid)
{
struct mlme_legacy_priv *mlme_priv;
struct qdf_mac_addr *mlme_bssid;
mlme_priv = wlan_vdev_mlme_get_ext_hdl(vdev);
if (!mlme_priv) {
mlme_err("vdev legacy private object is NULL");
return;
}
mlme_bssid = &(mlme_priv->cm_roam.sae_offload.bssid);
if (!bssid)
return;
qdf_mem_copy(bssid->bytes, mlme_bssid->bytes, QDF_MAC_ADDR_SIZE);
}
void
@@ -4589,8 +4599,9 @@ bool wlan_cm_is_self_mld_roam_supported(struct wlan_objmgr_psoc *psoc)
#ifdef WLAN_FEATURE_ROAM_OFFLOAD
QDF_STATUS
wlan_cm_set_offload_ssid(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
struct qdf_mac_addr *ap_bssid)
wlan_cm_update_offload_ssid_from_candidate(struct wlan_objmgr_pdev *pdev,
uint8_t vdev_id,
struct qdf_mac_addr *ap_bssid)
{
struct wlan_objmgr_vdev *vdev;
struct wlan_objmgr_psoc *psoc;
@@ -4621,7 +4632,7 @@ wlan_cm_set_offload_ssid(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
* get the scan entry from scan table to save the proper
* ssid, bssid.
*/
wlan_cm_get_set_roam_offload_bssid(vdev, &cache_bssid, false);
wlan_cm_get_roam_offload_bssid(vdev, &cache_bssid);
if (!qdf_mem_cmp(cache_bssid.bytes, ap_bssid->bytes, QDF_MAC_ADDR_SIZE))
goto end;
@@ -4641,7 +4652,6 @@ wlan_cm_set_offload_ssid(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
qdf_mem_free(scan_filter);
if (!list || !qdf_list_size(list)) {
QDF_ASSERT(0);
mlme_err("Scan result is empty, candidate entry not found");
status = QDF_STATUS_E_FAILURE;
goto end;
@@ -4653,7 +4663,7 @@ wlan_cm_set_offload_ssid(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
wlan_cm_set_roam_offload_ssid(vdev,
&entry->ssid.ssid[0],
entry->ssid.length);
wlan_cm_get_set_roam_offload_bssid(vdev, ap_bssid, true);
wlan_cm_set_roam_offload_bssid(vdev, ap_bssid);
}
end: