diff options
| author | Dustin Brown <dustinb@codeaurora.org> | 2016-10-17 15:05:36 -0700 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-10-28 18:08:30 -0700 |
| commit | 5df441e901f4f22b91aa315652c2407bcc7d049b (patch) | |
| tree | e6dc6693247a643b0df6e48080e668b7f3e95e5d | |
| parent | bb7e2f5927dcaa3fd4328fdf63229c5b195fea35 (diff) | |
qcacld-3.0: 4.8 Kernel Migration - Update calls to cfg80211_scan_done
As of the Linux kernel 4.7, the Api for cfg80211_scan_done() has
changed. Update references to the function and include a wrapper
to support compiling against older kernels.
Change-Id: I955d6c3767de86baeeb0760e42d12f46d0a00a5a
CRs-Fixed: 1078834
(cherry picked from commit 64288ebb9bcf45a398c7625bf79ad35dcc202eed)
| -rw-r--r-- | core/hdd/src/wlan_hdd_scan.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 8871b50583a5..17d70699e543 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1103,7 +1103,29 @@ nla_put_failure: return; } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)) +/** + * hdd_cfg80211_scan_done() - Scan completed callback to cfg80211 + * @adapter: Pointer to the adapter + * @req : Scan request + * @aborted : true scan aborted false scan success + * + * This function notifies scan done to cfg80211 + * + * Return: none + */ +static void hdd_cfg80211_scan_done(hdd_adapter_t *adapter, + struct cfg80211_scan_request *req, + bool aborted) +{ + struct cfg80211_scan_info info = { + .aborted = aborted + }; + + if (adapter->dev->flags & IFF_UP) + cfg80211_scan_done(req, &info); +} +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) /** * hdd_cfg80211_scan_done() - Scan completed callback to cfg80211 * @adapter: Pointer to the adapter @@ -1294,7 +1316,7 @@ static void wlan_hdd_cfg80211_scan_block_cb(struct work_struct *work) request->n_channels = 0; hdd_err("##In DFS Master mode. Scan aborted. Null result sent"); - cfg80211_scan_done(request, true); + hdd_cfg80211_scan_done(adapter, request, true); adapter->request = NULL; } } @@ -2669,7 +2691,7 @@ void hdd_cleanup_scan_queue(hdd_context_t *hdd_ctx) hdd_err("HDD adapter magic is invalid"); } else { if (NL_SCAN == source) - cfg80211_scan_done(req, aborted); + hdd_cfg80211_scan_done(adapter, req, aborted); else hdd_vendor_scan_callback(adapter, req, aborted); hdd_info("removed Scan id: %d, req = %p", |