From dcec27869c3c9fe533dfb7e1bb82f05efbc3326d Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 28 May 2010 14:48:52 +0200
Subject: [PATCH] --- yaml --- r: 202819 b: refs/heads/master c:
 e0961f112cd88176acc6d1af6ca6352f85cdf993 h: refs/heads/master i:   202817:
 bfa7221a9a8fe0b1f23aa82e458509dc5efa8bb4   202815:
 8f036d81e63e40de16e72598744e9518dd84b22c v: v3

---
 [refs]                     | 2 +-
 trunk/net/mac80211/iface.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d15a07dc74a4..ba0b121887eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 761ab470364b550c9b1a5e1e31be51d415aaf42b
+refs/heads/master: e0961f112cd88176acc6d1af6ca6352f85cdf993
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 50deb017fd6e..3d3a094d3987 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/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;