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

qcacld-3.0: Replace different struct of ssid with struct wlan_ssid

Browse Source 
There are different version of SSID structure used in driver, replace
them with struct wlan_ssid.

Change-Id: I8a5bfdafbdc4365afccc11980633272be9c75a81
CRs-Fixed: 2721873
This commit is contained in:
Abhishek Singh
2020-06-30 13:15:48 +05:30
committed by nshrivas
parent 704f1a056f
commit fb4325a69d
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/wmi/inc/wmi_unified_roam_param.h
View File

@@ -215,7 +215,7 @@ struct roam_scan_filter_params {
uint32_t num_ssid_white_list; uint32_t num_ssid_white_list;
uint32_t num_bssid_preferred_list; uint32_t num_bssid_preferred_list;
struct qdf_mac_addr bssid_avoid_list[MAX_BSSID_AVOID_LIST]; struct qdf_mac_addr bssid_avoid_list[MAX_BSSID_AVOID_LIST];
struct mac_ssid ssid_allowed_list[MAX_SSID_ALLOWED_LIST]; struct wlan_ssid ssid_allowed_list[MAX_SSID_ALLOWED_LIST];
struct qdf_mac_addr bssid_favored[MAX_BSSID_FAVORED]; struct qdf_mac_addr bssid_favored[MAX_BSSID_FAVORED];
uint8_t bssid_favored_factor[MAX_BSSID_FAVORED]; uint8_t bssid_favored_factor[MAX_BSSID_FAVORED];
uint8_t lca_disallow_config_present; uint8_t lca_disallow_config_present;
@@ -289,7 +289,7 @@ struct plm_req_params {
struct ap_profile { struct ap_profile {
uint32_t flags; uint32_t flags;
uint32_t rssi_threshold; uint32_t rssi_threshold;
struct mac_ssid ssid; struct wlan_ssid ssid;
uint32_t rsn_authmode; uint32_t rsn_authmode;
uint32_t rsn_ucastcipherset; uint32_t rsn_ucastcipherset;
uint32_t rsn_mcastcipherset; uint32_t rsn_mcastcipherset;
@@ -684,7 +684,7 @@ struct wmi_11k_offload_neighbor_report_params {
uint32_t per_threshold_offset; uint32_t per_threshold_offset;
uint32_t neighbor_report_cache_timeout; uint32_t neighbor_report_cache_timeout;
uint32_t max_neighbor_report_req_cap; uint32_t max_neighbor_report_req_cap;
struct mac_ssid ssid; struct wlan_ssid ssid;
}; };
/** /**
@@ -711,7 +711,7 @@ struct wmi_11k_offload_params {
struct wmi_invoke_neighbor_report_params { struct wmi_invoke_neighbor_report_params {
uint32_t vdev_id; uint32_t vdev_id;
uint32_t send_resp_to_host; uint32_t send_resp_to_host;
struct mac_ssid ssid; struct wlan_ssid ssid;
}; };
/** /**

12
components/wmi/src/wmi_unified_roam_tlv.c
View File

@@ -443,7 +443,7 @@ static QDF_STATUS send_roam_scan_filter_cmd_tlv(wmi_unified_t wmi_handle,
ssid_ptr = (wmi_ssid *)(buf_ptr + WMI_TLV_HDR_SIZE); ssid_ptr = (wmi_ssid *)(buf_ptr + WMI_TLV_HDR_SIZE);
for (i = 0; i < roam_req->num_ssid_white_list; i++) { for (i = 0; i < roam_req->num_ssid_white_list; i++) {
qdf_mem_copy(&ssid_ptr->ssid, qdf_mem_copy(&ssid_ptr->ssid,
&roam_req->ssid_allowed_list[i].mac_ssid, &roam_req->ssid_allowed_list[i].ssid,
roam_req->ssid_allowed_list[i].length); roam_req->ssid_allowed_list[i].length);
ssid_ptr->ssid_len = roam_req->ssid_allowed_list[i].length; ssid_ptr->ssid_len = roam_req->ssid_allowed_list[i].length;
ssid_ptr++; ssid_ptr++;
@@ -1640,7 +1640,7 @@ send_roam_scan_offload_ap_profile_cmd_tlv(wmi_unified_t wmi_handle,
profile->flags = ap_profile->profile.flags; profile->flags = ap_profile->profile.flags;
profile->rssi_threshold = ap_profile->profile.rssi_threshold; profile->rssi_threshold = ap_profile->profile.rssi_threshold;
profile->ssid.ssid_len = ap_profile->profile.ssid.length; profile->ssid.ssid_len = ap_profile->profile.ssid.length;
qdf_mem_copy(profile->ssid.ssid, ap_profile->profile.ssid.mac_ssid, qdf_mem_copy(profile->ssid.ssid, ap_profile->profile.ssid.ssid,
profile->ssid.ssid_len); profile->ssid.ssid_len);
profile->rsn_authmode = ap_profile->profile.rsn_authmode; profile->rsn_authmode = ap_profile->profile.rsn_authmode;
profile->rsn_ucastcipherset = ap_profile->profile.rsn_ucastcipherset; profile->rsn_ucastcipherset = ap_profile->profile.rsn_ucastcipherset;
@@ -1651,7 +1651,7 @@ send_roam_scan_offload_ap_profile_cmd_tlv(wmi_unified_t wmi_handle,
WMI_LOGD("AP PROFILE: flags %x rssi_thres:%d ssid:%.*s authmode %d uc cipher %d mc cipher %d mc mgmt cipher %d rssi abs thresh %d", WMI_LOGD("AP PROFILE: flags %x rssi_thres:%d ssid:%.*s authmode %d uc cipher %d mc cipher %d mc mgmt cipher %d rssi abs thresh %d",
profile->flags, profile->rssi_threshold, profile->flags, profile->rssi_threshold,
profile->ssid.ssid_len, ap_profile->profile.ssid.mac_ssid, profile->ssid.ssid_len, ap_profile->profile.ssid.ssid,
profile->rsn_authmode, profile->rsn_ucastcipherset, profile->rsn_authmode, profile->rsn_ucastcipherset,
profile->rsn_mcastcipherset, profile->rsn_mcastmgmtcipherset, profile->rsn_mcastcipherset, profile->rsn_mcastmgmtcipherset,
profile->rssi_abs_thresh); profile->rssi_abs_thresh);
@@ -2777,7 +2777,7 @@ send_offload_11k_cmd_tlv(wmi_unified_t wmi_handle,
neighbor_report_offload->ssid.ssid_len = neighbor_report_offload->ssid.ssid_len =
params->neighbor_report_params.ssid.length; params->neighbor_report_params.ssid.length;
qdf_mem_copy(neighbor_report_offload->ssid.ssid, qdf_mem_copy(neighbor_report_offload->ssid.ssid,
&params->neighbor_report_params.ssid.mac_ssid, &params->neighbor_report_params.ssid.ssid,
neighbor_report_offload->ssid.ssid_len); neighbor_report_offload->ssid.ssid_len);
} }
@@ -2827,9 +2827,7 @@ static QDF_STATUS send_invoke_neighbor_report_cmd_tlv(
cmd->flags = params->send_resp_to_host; cmd->flags = params->send_resp_to_host;
cmd->ssid.ssid_len = params->ssid.length; cmd->ssid.ssid_len = params->ssid.length;
qdf_mem_copy(cmd->ssid.ssid, qdf_mem_copy(cmd->ssid.ssid, &params->ssid.ssid, cmd->ssid.ssid_len);
&params->ssid.mac_ssid,
cmd->ssid.ssid_len);
wmi_mtrace(WMI_11K_INVOKE_NEIGHBOR_REPORT_CMDID, cmd->vdev_id, 0); wmi_mtrace(WMI_11K_INVOKE_NEIGHBOR_REPORT_CMDID, cmd->vdev_id, 0);
status = wmi_unified_cmd_send(wmi_handle, buf, len, status = wmi_unified_cmd_send(wmi_handle, buf, len,

4
core/hdd/src/wlan_hdd_ext_scan.c
View File

@@ -3422,8 +3422,8 @@ hdd_extscan_epno_fill_network(struct nlattr *network,
nw->ssid.length = ssid_len; nw->ssid.length = ssid_len;
hdd_debug("network ssid length %d", ssid_len); hdd_debug("network ssid length %d", ssid_len);
ssid = nla_data(tb[id]); ssid = nla_data(tb[id]);
qdf_mem_copy(nw->ssid.mac_ssid, ssid, ssid_len); qdf_mem_copy(nw->ssid.ssid, ssid, ssid_len);
hdd_debug("Ssid (%.*s)", nw->ssid.length, nw->ssid.mac_ssid); hdd_debug("Ssid (%.*s)", nw->ssid.length, nw->ssid.ssid);
/* Parse and fetch epno flags */ /* Parse and fetch epno flags */
id = QCA_WLAN_VENDOR_ATTR_PNO_SET_LIST_PARAM_EPNO_NETWORK_FLAGS; id = QCA_WLAN_VENDOR_ATTR_PNO_SET_LIST_PARAM_EPNO_NETWORK_FLAGS;

2
core/sme/src/common/sme_api.c
View File

@@ -14027,7 +14027,7 @@ QDF_STATUS sme_set_del_pmkid_cache(struct wlan_objmgr_psoc *psoc,
} else { } else {
pmk_cache->cat_flag = WMI_PMK_CACHE_CAT_FLAG_SSID_CACHE_ID; pmk_cache->cat_flag = WMI_PMK_CACHE_CAT_FLAG_SSID_CACHE_ID;
pmk_cache->ssid.length = pmk_cache_info->ssid_len; pmk_cache->ssid.length = pmk_cache_info->ssid_len;
qdf_mem_copy(pmk_cache->ssid.mac_ssid, qdf_mem_copy(pmk_cache->ssid.ssid,
pmk_cache_info->ssid, pmk_cache_info->ssid,
pmk_cache->ssid.length); pmk_cache->ssid.length);
} }

4
core/sme/src/csr/csr_api_roam.c
View File

@@ -17697,7 +17697,7 @@ csr_update_11k_offload_params(struct mac_context *mac_ctx,
params->neighbor_report_params.ssid.length = params->neighbor_report_params.ssid.length =
session->connectedProfile.SSID.length; session->connectedProfile.SSID.length;
qdf_mem_copy(params->neighbor_report_params.ssid.mac_ssid, qdf_mem_copy(params->neighbor_report_params.ssid.ssid,
session->connectedProfile.SSID.ssId, session->connectedProfile.SSID.ssId,
session->connectedProfile.SSID.length); session->connectedProfile.SSID.length);
} }
@@ -17723,7 +17723,7 @@ QDF_STATUS csr_invoke_neighbor_report_request(uint8_t session_id,
if (!neighbor_report_req->no_ssid) { if (!neighbor_report_req->no_ssid) {
invoke_params->ssid.length = neighbor_report_req->ssid.length; invoke_params->ssid.length = neighbor_report_req->ssid.length;
qdf_mem_copy(invoke_params->ssid.mac_ssid, qdf_mem_copy(invoke_params->ssid.ssid,
neighbor_report_req->ssid.ssId, neighbor_report_req->ssid.ssId,
neighbor_report_req->ssid.length); neighbor_report_req->ssid.length);
} else { } else {

8
core/wma/src/wma_scan_roam.c
View File

@@ -960,7 +960,7 @@ wma_roam_scan_fill_ap_profile(struct roam_offload_scan_req *roam_req,
qdf_mem_zero(profile, sizeof(*profile)); qdf_mem_zero(profile, sizeof(*profile));
if (!roam_req) { if (!roam_req) {
profile->ssid.length = 0; profile->ssid.length = 0;
profile->ssid.mac_ssid[0] = 0; profile->ssid.ssid[0] = 0;
profile->rsn_authmode = WMI_AUTH_NONE; profile->rsn_authmode = WMI_AUTH_NONE;
profile->rsn_ucastcipherset = WMI_CIPHER_NONE; profile->rsn_ucastcipherset = WMI_CIPHER_NONE;
profile->rsn_mcastcipherset = WMI_CIPHER_NONE; profile->rsn_mcastcipherset = WMI_CIPHER_NONE;
@@ -971,7 +971,7 @@ wma_roam_scan_fill_ap_profile(struct roam_offload_scan_req *roam_req,
} }
profile->ssid.length = roam_req->ConnectedNetwork.ssId.length; profile->ssid.length = roam_req->ConnectedNetwork.ssId.length;
qdf_mem_copy(profile->ssid.mac_ssid, qdf_mem_copy(profile->ssid.ssid,
roam_req->ConnectedNetwork.ssId.ssId, roam_req->ConnectedNetwork.ssId.ssId,
profile->ssid.length); profile->ssid.length);
profile->rsn_authmode = profile->rsn_authmode =
@@ -1433,14 +1433,14 @@ static QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle,
MAX_BSSID_AVOID_LIST * sizeof(struct qdf_mac_addr)); MAX_BSSID_AVOID_LIST * sizeof(struct qdf_mac_addr));
for (i = 0; i < num_ssid_white_list; i++) { for (i = 0; i < num_ssid_white_list; i++) {
qdf_mem_copy(params->ssid_allowed_list[i].mac_ssid, qdf_mem_copy(params->ssid_allowed_list[i].ssid,
roam_params->ssid_allowed_list[i].ssId, roam_params->ssid_allowed_list[i].ssId,
roam_params->ssid_allowed_list[i].length); roam_params->ssid_allowed_list[i].length);
params->ssid_allowed_list[i].length = params->ssid_allowed_list[i].length =
roam_params->ssid_allowed_list[i].length; roam_params->ssid_allowed_list[i].length;
wma_debug("SSID %d: %.*s", i, wma_debug("SSID %d: %.*s", i,
params->ssid_allowed_list[i].length, params->ssid_allowed_list[i].length,
params->ssid_allowed_list[i].mac_ssid); params->ssid_allowed_list[i].ssid);
} }
for (i = 0; i < params->num_bssid_black_list; i++) for (i = 0; i < params->num_bssid_black_list; i++)