Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351731
b: refs/heads/master
c: 9027b14
h: refs/heads/master
i:
  351729: 07730e4
  351727: ebcbe78
v: v3
  • Loading branch information
Johannes Berg committed Jan 3, 2013
1 parent 8faae37 commit 06d482e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a9193185f462a51815fe48491f8a6fb6b942551
refs/heads/master: 9027b1493b57a6a8f9f56741e4c4189048ea5633
11 changes: 3 additions & 8 deletions trunk/net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -2382,34 +2382,29 @@ void regulatory_exit(void)
cancel_work_sync(&reg_work);
cancel_delayed_work_sync(&reg_timeout);

/* Lock to suppress warnings */
mutex_lock(&cfg80211_mutex);
mutex_lock(&reg_mutex);

reset_regdomains(true);
mutex_unlock(&cfg80211_mutex);
mutex_unlock(&reg_mutex);

dev_set_uevent_suppress(&reg_pdev->dev, true);

platform_device_unregister(reg_pdev);

spin_lock_bh(&reg_pending_beacons_lock);
list_for_each_entry_safe(reg_beacon, btmp, &reg_pending_beacons, list) {
list_del(&reg_beacon->list);
kfree(reg_beacon);
}
spin_unlock_bh(&reg_pending_beacons_lock);

list_for_each_entry_safe(reg_beacon, btmp, &reg_beacon_list, list) {
list_del(&reg_beacon->list);
kfree(reg_beacon);
}

spin_lock(&reg_requests_lock);
list_for_each_entry_safe(reg_request, tmp, &reg_requests_list, list) {
list_del(&reg_request->list);
kfree(reg_request);
}
spin_unlock(&reg_requests_lock);

mutex_unlock(&reg_mutex);
mutex_unlock(&cfg80211_mutex);
}

0 comments on commit 06d482e

Please sign in to comment.