diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 14:25:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 14:41:59 -0400 |
| commit | 7eab0f64a9eba5405222fdef0ede2468bf495efd (patch) | |
| tree | ec99640b8d0b12adbfacb85c27683125debd14f2 /net/wireless/core.c | |
| parent | cade455596504fae8e134a27189713ddf7c6d04d (diff) | |
| parent | 8065248069097dddf9945acfb2081025e9618c16 (diff) | |
| download | linux-7eab0f64a9eba5405222fdef0ede2468bf495efd.tar.gz linux-7eab0f64a9eba5405222fdef0ede2468bf495efd.tar.xz | |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/wireless/nl80211.c
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); } |