diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-12 20:12:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-12 20:12:31 -0400 |
| commit | 816a7854d56f19aeba3c83e1ed8c2c0ef275365a (patch) | |
| tree | c3b82ad98006fc5fa7b408c142e75a6053195dfa /net/wireless/core.c | |
| parent | 011e3c63251be832d23df9f0697626ab7b354d02 (diff) | |
| parent | 7eab0f64a9eba5405222fdef0ede2468bf495efd (diff) | |
| download | blackbird-obmc-linux-816a7854d56f19aeba3c83e1ed8c2c0ef275365a.tar.gz blackbird-obmc-linux-816a7854d56f19aeba3c83e1ed8c2c0ef275365a.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'net/wireless/core.c')
| -rw-r--r-- | net/wireless/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index ccdfed897651..59f4a7e7c092 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -708,6 +708,10 @@ void wiphy_unregister(struct wiphy *wiphy) flush_work(&rdev->scan_done_wk); cancel_work_sync(&rdev->conn_work); flush_work(&rdev->event_work); + + if (rdev->wowlan && rdev->ops->set_wakeup) + rdev->ops->set_wakeup(&rdev->wiphy, false); + cfg80211_rdev_free_wowlan(rdev); } EXPORT_SYMBOL(wiphy_unregister); @@ -720,7 +724,6 @@ void cfg80211_dev_free(struct cfg80211_registered_device *rdev) mutex_destroy(&rdev->sched_scan_mtx); list_for_each_entry_safe(scan, tmp, &rdev->bss_list, list) cfg80211_put_bss(&scan->pub); - cfg80211_rdev_free_wowlan(rdev); kfree(rdev); } |
