diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-09-26 13:52:20 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-12-05 17:37:26 -0800 |
| commit | 52fc96126fe3b595d3b6d6f7dcf6fa359a555c65 (patch) | |
| tree | a6df885c50f611e8cd70e8c34ea33ef851a588d5 /drivers/net | |
| parent | 25c3e42461382c9259e61c74618e1dcff7673f2d (diff) | |
net: wireless: bcmdhd: Skip scan params allocation in timeout
source of the commit:
https://android.googlesource.com/kernel/common
branch- remotes/origin/android-3.4
Bug 1188165
Change-Id: Id4c0be0625f5f16c2f9b51267b72f3eecff500d0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
(cherry picked from commit 9292ec303ddfe0f71b9e3820bd87386aa11b3c40)
Signed-off-by: bibhayr <bibhayr@nvidia.com>
Reviewed-on: http://git-master/r/167235
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 0c0febe334eb..7bcc53cc0937 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -7480,13 +7480,13 @@ static s32 wl_notify_escan_complete(struct wl_priv *wl, ndev, wl_to_prmry_ndev(wl), wl->p2p_net)); dev = ndev; } - if (fw_abort) { + if (fw_abort && !in_atomic()) { /* Our scan params only need space for 1 channel and 0 ssids */ params = wl_cfg80211_scan_alloc_params(-1, 0, ¶ms_size); if (params == NULL) { WL_ERR(("scan params allocation failed \n")); err = -ENOMEM; - } else if (!in_atomic()) { + } else { /* Do a scan abort to stop the driver's scan engine */ err = wldev_ioctl(dev, WLC_SCAN, params, params_size, true); if (err < 0) { |