diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-30 10:47:55 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-30 10:47:55 +0100 |
| commit | 0a52ac8d181e938d640c2da70cad6d1301abe775 (patch) | |
| tree | 046edf3437a49d3f6989d152bd94fcc80906b86d /drivers/net/wireless/mac80211_hwsim.c | |
| parent | e81b795d44ba04beab7714de65ed2e377823bd37 (diff) | |
| parent | 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff) | |
| download | op-kernel-dev-0a52ac8d181e938d640c2da70cad6d1301abe775.zip op-kernel-dev-0a52ac8d181e938d640c2da70cad6d1301abe775.tar.gz | |
Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index a111bda..7916ca3 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -709,7 +709,7 @@ static const struct ieee80211_ops mac80211_hwsim_ops = static void mac80211_hwsim_free(void) { struct list_head tmplist, *i, *tmp; - struct mac80211_hwsim_data *data; + struct mac80211_hwsim_data *data, *tmpdata; INIT_LIST_HEAD(&tmplist); @@ -718,7 +718,7 @@ static void mac80211_hwsim_free(void) list_move(i, &tmplist); spin_unlock_bh(&hwsim_radio_lock); - list_for_each_entry(data, &tmplist, list) { + list_for_each_entry_safe(data, tmpdata, &tmplist, list) { debugfs_remove(data->debugfs_group); debugfs_remove(data->debugfs_ps); debugfs_remove(data->debugfs); @@ -1167,8 +1167,8 @@ static void __exit exit_mac80211_hwsim(void) { printk(KERN_DEBUG "mac80211_hwsim: unregister radios\n"); - unregister_netdev(hwsim_mon); mac80211_hwsim_free(); + unregister_netdev(hwsim_mon); } |
