mac80211: Only flush workqueue when last interface was removed
PATCH 1/1 mac80211: Only flush workqueue when last interface was removed
Currently the ieee80211_hw->workqueue is flushed each time an interface is being removed. However most scheduled work is not interface specific but device specific, for example things like periodic work for link tuners.
This patch will move the flush_workqueue() call to directly behind the call to ops->stop() to make sure the workqueue is only flushed when all interfaces are gone and there really shouldn't be any scheduled work in the drivers left.
---
net/mac80211/main.c +2 -2
@@ -533,8 +533,6 @@ static int ieee80211_stop(struct net_device *dev) local->sta_hw_scanning =0 ; } -flush_workqueue (local->hw.workqueue); - sdata->u.sta.flags &= ~IEEE80211_STA_PRIVACY_INVOKED ;kfree (sdata->u.sta.extra_ie); sdata->u.sta.extra_ie =NULL ;
@@ -558,6 +556,8 @@ static int ieee80211_stop(struct net_device *dev)ieee80211_led_radio (local,0 ); +flush_workqueue (local->hw.workqueue); +tasklet_disable (&local->tx_pending_tasklet);tasklet_disable (&local->tasklet); }
Quoted 9 lines · Ivo van Doorn
Currently the
ieee80211_hw->workqueueis flushed each time an interface is being removed. However most scheduled work is not interface specific but device specific, for example things like periodic work for link tuners.This patch will move the
flush_workqueue()call to directly behind the call toops->stop()to make sure the workqueue is only flushed when all interfaces are gone and there really shouldn't be any scheduled work in the drivers left.
Yeah I think that's what we always wanted.
Quoted 1 line
Signed-off-by Ivo van Doorn <[email protected]>
Quoted 24 lines
---
net/mac80211/main.c +2
-2@@ -533,8 +533,6 @@ static int ieee80211_stop(struct net_device *dev) local->sta_hw_scanning =0 ; } -flush_workqueue (local->hw.workqueue); - sdata->u.sta.flags &= ~IEEE80211_STA_PRIVACY_INVOKED ;kfree (sdata->u.sta.extra_ie); sdata->u.sta.extra_ie =NULL ;@@ -558,6 +556,8 @@ static int ieee80211_stop(struct net_device *dev)ieee80211_led_radio (local,0 ); +flush_workqueue (local->hw.workqueue); +tasklet_disable (&local->tx_pending_tasklet);tasklet_disable (&local->tasklet); }