From: Johannes Berg Date: Fri, 28 May 2010 12:48:52 +0000 (+0200) Subject: mac80211: remove useless work starting X-Git-Tag: v2.6.36-rc1~571^2~615^2~75 X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=e0961f112cd88176acc6d1af6ca6352f85cdf993;p=net-next-2.6.git mac80211: remove useless work starting Ever since we use only cfg80211 for configuration, there is no configuration that could be pending at this point, cfg80211 will have the configuration that is pending and apply it afterwards. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville --- diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 50deb017fd6..3d3a094d398 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -321,15 +321,6 @@ static int ieee80211_open(struct net_device *dev) ieee80211_recalc_ps(local, -1); - /* - * ieee80211_sta_work is disabled while network interface - * is down. Therefore, some configuration changes may not - * yet be effective. Trigger execution of ieee80211_sta_work - * to fix this. - */ - if (sdata->vif.type == NL80211_IFTYPE_STATION) - ieee80211_queue_work(&local->hw, &sdata->u.mgd.work); - netif_tx_start_all_queues(dev); return 0;