diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-04 19:46:34 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-04 19:46:34 +0100 |
| commit | 22097fd297c85ec6c2e700d506f231f7cae442e1 (patch) | |
| tree | 4a16a6821c5dc82a512b56ade6fcf64e0935d0aa /drivers/net/wireless/libertas/main.c | |
| parent | Merge git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | mac80211: warn only once about not finding a rate (diff) | |
| download | linux-22097fd297c85ec6c2e700d506f231f7cae442e1.tar.xz linux-22097fd297c85ec6c2e700d506f231f7cae442e1.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/libertas/main.c')
| -rw-r--r-- | drivers/net/wireless/libertas/main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index b03779bcd547..39a6a7a40244 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c @@ -255,10 +255,8 @@ static int lbs_eth_stop(struct net_device *dev) lbs_update_mcast(priv); cancel_delayed_work_sync(&priv->scan_work); - if (priv->scan_req) { - cfg80211_scan_done(priv->scan_req, false); - priv->scan_req = NULL; - } + if (priv->scan_req) + lbs_scan_done(priv); netif_carrier_off(priv->dev); |