bcmdhd: Handle scan error in scan policy

Issue: When interface is down the wl_cfg80211_scan function returns error
       and if not handled this causes consistent scan failures.

Fix: Add call to TEGRA_SCAN_DONE when scan function returns an error and
     clean up workqueue when active scan rules is zero.

Bug 200472884

Change-Id: I361ff6419743aef9df2d7680e7793806b2a82954
Signed-off-by: Nagaraj Annaiah <nannaiah@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1990171
(cherry picked from commit 33d5eab52477c818ce88315dd7463c6376db3822)
Reviewed-on: https://git-master.nvidia.com/r/1997810
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Mohan Thadikamalla <mohant@nvidia.com>
Reviewed-by: Om Prakash Singh <omp@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vinayak Pane <vpane@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/drivers/net/wireless/bcmdhd/dhd_custom_sysfs_tegra_scan.c b/drivers/net/wireless/bcmdhd/dhd_custom_sysfs_tegra_scan.c
index 18f3780e8..e7bce8871 100644..100755
--- a/drivers/net/wireless/bcmdhd/dhd_custom_sysfs_tegra_scan.c
+++ b/drivers/net/wireless/bcmdhd/dhd_custom_sysfs_tegra_scan.c
@@ -643,6 +643,11 @@ skip_time_check:
                         goto reschedule;
                 }
         }
+        if (unlikely(err)) {
+                        WIFI_SCAN_DEBUG("%s: Scan done\n", __func__);
+                        TEGRA_SCAN_DONE(&scan_work->scan_arg.request_and_channels.request, true)
+                        skip_cfg80211_scan_done: ;
+        }
 abort_work:
 
         WIFI_SCAN_DEBUG("%s }\n", __func__);
@@ -1168,6 +1173,10 @@ wifi_scan_request_done(struct cfg80211_scan_request *request)
         if ((scan_work >= wifi_scan_work_list)
          && (scan_work - wifi_scan_work_list < sizeof(wifi_scan_work_list)
                 / sizeof(wifi_scan_work_list[0]))) {
+                if (!scan_work->original_scan_request) {
+                        WIFI_SCAN_DEBUG("%s no original scan request exist\n", __func__);
+                        return 0;
+                }
                 WIFI_SCAN_DEBUG("%s: done executing scan work #%d"
                         " (policy %d rule %d)\n",
                         __func__,
@@ -1218,7 +1227,8 @@ wifi_scan_request_done(struct cfg80211_scan_request *request)
                                 scan_work);
                         scan_work->original_scan_request = NULL;
                 }
-                if (scan_work->original_scan_request == request) {
+                if (scan_work->original_scan_request == request ||
+                        (atomic_read(&wifi_scan_work_rules_active) <= 0)) {
                         WIFI_SCAN_DEBUG("%s: TEGRA_SCAN_DONE:"
                                 " scan_work #%d (%p)"
                                 " - original scan request done\n",