---

yaml --- r: 202819 b: refs/heads/master c: e0961f1 h: refs/heads/master i: 202817: bfa7221 202815: 8f036d8 v: v3
git-mirror · Jun 3, 2010 · dcec278 · dcec278
1 parent 7567304
commit dcec278
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git 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
@@ -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;