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

qcacmn: Fix the return type of wlan_cfg80211_scan

Browse Source 
In success scenarios wlan_cfg80211_scan return the qdf status without
converting it to os return status.

Convert the qdf status to os return status before returning in
wlan_cfg80211_scan.

Change-Id: Iee0503191aca371634c9dae9daf15f5aadfe7e2e
CRs-Fixed: 2334591
This commit is contained in:
Abhishek Singh
2018-10-17 09:05:15 +05:30
committed by nshrivas
parent 81179cb75e
commit 383ec70e7c
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
os_if/linux/scan/src/wlan_cfg80211_scan.c
View File

@@ -1193,7 +1193,7 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev,
struct scan_start_request *req; struct scan_start_request *req;
struct wlan_ssid *pssid; struct wlan_ssid *pssid;
uint8_t i; uint8_t i;
int status; int ret = 0;
uint8_t num_chan = 0, channel; uint8_t num_chan = 0, channel;
uint32_t c_freq; uint32_t c_freq;
struct wlan_objmgr_vdev *vdev; struct wlan_objmgr_vdev *vdev;
@@ -1204,6 +1204,7 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev,
bool is_p2p_scan = false; bool is_p2p_scan = false;
enum wlan_band band; enum wlan_band band;
struct net_device *netdev = NULL; struct net_device *netdev = NULL;
QDF_STATUS qdf_status;
/* Get the vdev object */ /* Get the vdev object */
vdev = wlan_objmgr_get_vdev_by_macaddr_from_pdev(pdev, dev->dev_addr, vdev = wlan_objmgr_get_vdev_by_macaddr_from_pdev(pdev, dev->dev_addr,
@@ -1330,16 +1331,16 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev,
#ifdef WLAN_POLICY_MGR_ENABLE #ifdef WLAN_POLICY_MGR_ENABLE
if (ap_or_go_present) { if (ap_or_go_present) {
bool ok; bool ok;
int ret;
ret = policy_mgr_is_chan_ok_for_dnbs(psoc, qdf_status =
policy_mgr_is_chan_ok_for_dnbs(psoc,
channel, channel,
&ok); &ok);
if (QDF_IS_STATUS_ERROR(ret)) { if (QDF_IS_STATUS_ERROR(qdf_status)) {
cfg80211_err("DNBS check failed"); cfg80211_err("DNBS check failed");
qdf_mem_free(req); qdf_mem_free(req);
status = -EINVAL; ret = -EINVAL;
goto end; goto end;
} }
if (!ok) if (!ok)
@@ -1363,7 +1364,7 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev,
if (!num_chan) { if (!num_chan) {
cfg80211_err("Received zero non-dsrc channels"); cfg80211_err("Received zero non-dsrc channels");
qdf_mem_free(req); qdf_mem_free(req);
status = -EINVAL; ret = -EINVAL;
goto end; goto end;
} }
req->scan_req.chan_list.num_chan = num_chan; req->scan_req.chan_list.num_chan = num_chan;
@@ -1375,7 +1376,7 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev,
req->scan_req.extraie.ptr = qdf_mem_malloc(request->ie_len); req->scan_req.extraie.ptr = qdf_mem_malloc(request->ie_len);
if (!req->scan_req.extraie.ptr) { if (!req->scan_req.extraie.ptr) {
cfg80211_err("Failed to allocate memory"); cfg80211_err("Failed to allocate memory");
status = -ENOMEM; ret = -ENOMEM;
qdf_mem_free(req); qdf_mem_free(req);
goto end; goto end;
} }
@@ -1387,7 +1388,7 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev,
qdf_mem_malloc(params->default_ie.len); qdf_mem_malloc(params->default_ie.len);
if (!req->scan_req.extraie.ptr) { if (!req->scan_req.extraie.ptr) {
cfg80211_err("Failed to allocate memory"); cfg80211_err("Failed to allocate memory");
status = -ENOMEM; ret = -ENOMEM;
qdf_mem_free(req); qdf_mem_free(req);
goto end; goto end;
} }
@@ -1415,25 +1416,22 @@ int wlan_cfg80211_scan(struct wlan_objmgr_pdev *pdev,
qdf_runtime_pm_prevent_suspend( qdf_runtime_pm_prevent_suspend(
&osif_priv->osif_scan->runtime_pm_lock); &osif_priv->osif_scan->runtime_pm_lock);
status = ucfg_scan_start(req); qdf_status = ucfg_scan_start(req);
if (QDF_STATUS_SUCCESS != status) { if (QDF_IS_STATUS_ERROR(qdf_status)) {
cfg80211_err("ucfg_scan_start returned error %d", status); cfg80211_err("ucfg_scan_start returned error %d", qdf_status);
if (QDF_STATUS_E_RESOURCES == status) { if (qdf_status == QDF_STATUS_E_RESOURCES)
cfg80211_err("HO is in progress.So defer the scan by informing busy"); cfg80211_err("HO is in progress.So defer the scan by informing busy");
status = -EBUSY;
} else {
status = -EIO;
}
wlan_scan_request_dequeue(pdev, scan_id, &request, wlan_scan_request_dequeue(pdev, scan_id, &request,
&params->source, &netdev); &params->source, &netdev);
if (qdf_list_empty(&osif_priv->osif_scan->scan_req_q)) if (qdf_list_empty(&osif_priv->osif_scan->scan_req_q))
qdf_runtime_pm_allow_suspend( qdf_runtime_pm_allow_suspend(
&osif_priv->osif_scan->runtime_pm_lock); &osif_priv->osif_scan->runtime_pm_lock);
} }
ret = qdf_status_to_os_return(qdf_status);
end: end:
wlan_objmgr_vdev_release_ref(vdev, WLAN_OSIF_ID); wlan_objmgr_vdev_release_ref(vdev, WLAN_OSIF_ID);
return status; return ret;
} }
/** /**