diff options
| author | Xinming Hu <huxm@marvell.com> | 2016-04-18 06:42:55 -0700 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-04-26 12:25:38 +0300 |
| commit | eaf46b5fda3acd75df68f02d25754dccb446ec2d (patch) | |
| tree | 8df3761e1ddb5e465a1fd12647e80067b81b9788 /drivers/net/wireless/marvell/mwifiex/main.c | |
| parent | ce4f6f0c353b7bfd7b527667287a87fd83aea119 (diff) | |
| download | lwn-eaf46b5fda3acd75df68f02d25754dccb446ec2d.tar.gz lwn-eaf46b5fda3acd75df68f02d25754dccb446ec2d.zip | |
mwifiex: stop background scan when net device closed
Transmit data path should not touch background scan. We will stop
background scan when net device is closed.
Signed-off-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/main.c')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c index b459c70dc43f..8b67a552a690 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.c +++ b/drivers/net/wireless/marvell/mwifiex/main.c @@ -702,6 +702,13 @@ mwifiex_close(struct net_device *dev) priv->scan_aborting = true; } + if (priv->sched_scanning) { + mwifiex_dbg(priv->adapter, INFO, + "aborting bgscan on ndo_stop\n"); + mwifiex_stop_bg_scan(priv); + cfg80211_sched_scan_stopped(priv->wdev.wiphy); + } + return 0; } @@ -753,13 +760,6 @@ int mwifiex_queue_tx_pkt(struct mwifiex_private *priv, struct sk_buff *skb) mwifiex_queue_main_work(priv->adapter); - if (priv->sched_scanning) { - mwifiex_dbg(priv->adapter, INFO, - "aborting bgscan on ndo_stop\n"); - mwifiex_stop_bg_scan(priv); - cfg80211_sched_scan_stopped(priv->wdev.wiphy); - } - return 0; } |