net: wireless: bcmdhd abort ongoing-scan for disconnection
nagaraj [Wed, 27 Apr 2016 19:42:56 +0000 (12:42 -0700)]
Original commit message:
sometimes we cannot get WLC_E_DEAUTH due to ongoing-scan
We need to abort ongoing-scan for disconnection

Bug: 18634452
Signed-off-by: Ecco park <eccopark@broadcom.com>
Link: https://android.googlesource.com/kernel/common.git/+/87466a9b218b4b0ad04efce8354589822478ea00%5E!/

Bug 200186891
Bug 200190639
Bug 200191534

Signed-off-by: Nagaraj Annaiah <nannaiah@nvidia.com>
Change-Id: I7494dca90087014d82da8282dd139d509b0ed796
Reviewed-on: http://git-master/r/1139859
(cherry picked from commit 241f350a0c3418d0968cd2e33e236a7e9b6ff505)
Reviewed-on: http://git-master/r/1147077
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

drivers/net/wireless/bcmdhd/wl_cfg80211.c [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
index 1d94561..b04a514
@@ -4476,12 +4476,10 @@ wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
                /*
                * Cancel ongoing scan to sync up with sme state machine of cfg80211.
                */
-#if !defined(ESCAN_RESULT_PATCH)
                /* Let scan aborted by F/W */
                if (cfg->scan_request) {
                        wl_notify_escan_complete(cfg, dev, true, true);
                }
-#endif /* ESCAN_RESULT_PATCH */
                wl_clr_drv_status(cfg, CONNECTING, dev);
                wl_set_drv_status(cfg, DISCONNECTING, dev);
                scbval.val = reason_code;