qcacld-3.0: Replace tSirMacAddr with cdf_mac_addr in struct roam_ext_params

Replace tSirMacAddr with cdf_mac_addr in struct roam_ext_params

Change-Id: I54abd74a93abdfee4a8eb413de78b939a07b97e7
CRs-Fixed: 898864
This commit is contained in:
Srinivas Girigowda 2015-11-24 11:50:16 -08:00 • committed by Satish Singh
commit b053239279
4 changed files with 15 additions and 16 deletions

View file

@ -2367,11 +2367,11 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
hddLog(LOGE, FL("attr mac address failed"));
goto fail;
}
nla_memcpy(roam_params.bssid_favored[i],
nla_memcpy(roam_params.bssid_favored[i].bytes,
tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_BSSID],
sizeof(tSirMacAddr));
hddLog(CDF_TRACE_LEVEL_DEBUG, MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roam_params.bssid_favored[i]));
CDF_MAC_ADDR_SIZE);
hdd_debug(MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roam_params.bssid_favored[i].bytes));
/* Parse and fetch preference factor*/
if (!tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_RSSI_MODIFIER]) {
hddLog(LOGE, FL("BSSID Preference score failed"));
@ -2412,12 +2412,12 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
hddLog(LOGE, FL("attr blacklist addr failed"));
goto fail;
}
nla_memcpy(roam_params.bssid_avoid_list[i],
nla_memcpy(roam_params.bssid_avoid_list[i].bytes,
tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_BSSID_PARAMS_BSSID],
sizeof(tSirMacAddr));
hddLog(CDF_TRACE_LEVEL_DEBUG, MAC_ADDRESS_STR,
CDF_MAC_ADDR_SIZE);
hdd_debug(MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(
roam_params.bssid_avoid_list[i]));
roam_params.bssid_avoid_list[i].bytes));
i++;
}
sme_update_roam_params(pHddCtx->hHal, session_id,

View file

@ -2880,8 +2880,8 @@ struct roam_ext_params {
uint8_t num_ssid_allowed_list;
uint8_t num_bssid_favored;
tSirMacSSid ssid_allowed_list[MAX_SSID_ALLOWED_LIST];
tSirMacAddr bssid_avoid_list[MAX_BSSID_AVOID_LIST];
tSirMacAddr bssid_favored[MAX_BSSID_FAVORED];
struct cdf_mac_addr bssid_avoid_list[MAX_BSSID_AVOID_LIST];
struct cdf_mac_addr bssid_favored[MAX_BSSID_FAVORED];
uint8_t bssid_favored_factor[MAX_BSSID_FAVORED];
int raise_rssi_thresh_5g;
int drop_rssi_thresh_5g;

View file

@ -1509,13 +1509,12 @@ CDF_STATUS sme_update_roam_params(tHalHandle hal,
break;
case REASON_ROAM_SET_BLACKLIST_BSSID:
cdf_mem_set(&roam_params_dst->bssid_avoid_list, 0,
sizeof(tSirMacAddr) * MAX_BSSID_AVOID_LIST);
CDF_MAC_ADDR_SIZE * MAX_BSSID_AVOID_LIST);
roam_params_dst->num_bssid_avoid_list =
roam_params_src.num_bssid_avoid_list;
for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) {
cdf_mem_copy(&roam_params_dst->bssid_avoid_list[i],
&roam_params_src.bssid_avoid_list[i],
sizeof(tSirMacAddr));
cdf_copy_macaddr(&roam_params_dst->bssid_avoid_list[i],
&roam_params_src.bssid_avoid_list[i]);
}
break;
case REASON_ROAM_GOOD_RSSI_CHANGED:

View file

@ -17035,7 +17035,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) {
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
"Blacklist Bssid: ("MAC_ADDRESS_STR")",
MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i]));
MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i].bytes));
}
for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) {
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
@ -17046,7 +17046,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
for (i = 0; i < roam_params_dst->num_bssid_favored; i++) {
CDF_TRACE(CDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
"Preferred Bssid: ("MAC_ADDRESS_STR") score: %d",
MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i]),
MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes),
roam_params_dst->bssid_favored_factor[i]);
}