leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: fix configure_filter invocation after stop

Browse Source 
Since configure_filter can sleep now, any multicast
configuration needed to be postponed to a work struct.
This, however, lead to a problem that we could queue
the work, stop the device and then afterwards invoke
configure_filter which may lead to driver hangs and is
a bug. To fix this, we can just cancel the filter work
since it's unnecessary to do after stopping the hw.

Since there are various places that call drv_stop, and
two of them do very similar things, the code for them
can be put into a shared function at the same time.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reported-by: Lennert Buytenhek <buytenh@wantstofly.org>
Tested-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2009-08-20 20:02:20 +02:00 committed by John W. Linville
parent 5eb6ba83aa
commit 84f6a01ce0
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/ieee80211_i.h
View File

@ -1086,6 +1086,7 @@ void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
/* Suspend/resume and hw reconfiguration */ /* Suspend/resume and hw reconfiguration */
int ieee80211_reconfig(struct ieee80211_local *local); int ieee80211_reconfig(struct ieee80211_local *local);
void ieee80211_stop_device(struct ieee80211_local *local);
#ifdef CONFIG_PM #ifdef CONFIG_PM
int __ieee80211_suspend(struct ieee80211_hw *hw); int __ieee80211_suspend(struct ieee80211_hw *hw);

6
net/mac80211/iface.c
View File

@ -552,11 +552,7 @@ static int ieee80211_stop(struct net_device *dev)
ieee80211_recalc_ps(local, -1); ieee80211_recalc_ps(local, -1);
if (local->open_count == 0) { if (local->open_count == 0) {
drv_stop(local); ieee80211_stop_device(local);
ieee80211_led_radio(local, false);
flush_workqueue(local->workqueue);
tasklet_disable(&local->tx_pending_tasklet); tasklet_disable(&local->tx_pending_tasklet);
tasklet_disable(&local->tasklet); tasklet_disable(&local->tasklet);

13
net/mac80211/pm.c
View File

@ -107,17 +107,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
} }
/* stop hardware - this must stop RX */ /* stop hardware - this must stop RX */
if (local->open_count) { if (local->open_count)
ieee80211_led_radio(local, false); ieee80211_stop_device(local);
drv_stop(local);
}
/*
* flush again, in case driver queued work -- it
* shouldn't be doing (or cancel everything in the
* stop callback) that but better safe than sorry.
*/
flush_workqueue(local->workqueue);
local->suspended = true; local->suspended = true;
/* need suspended to be visible before quiescing is false */ /* need suspended to be visible before quiescing is false */

10
net/mac80211/util.c
View File

@ -1007,6 +1007,16 @@ u32 ieee80211_sta_get_rates(struct ieee80211_local *local,
return supp_rates; return supp_rates;
} }
void ieee80211_stop_device(struct ieee80211_local *local)
{
ieee80211_led_radio(local, false);
cancel_work_sync(&local->reconfig_filter);
drv_stop(local);
flush_workqueue(local->workqueue);
}
int ieee80211_reconfig(struct ieee80211_local *local) int ieee80211_reconfig(struct ieee80211_local *local)
{ {
struct ieee80211_hw *hw = &local->hw; struct ieee80211_hw *hw = &local->hw;