From 3044c516f473296222c85b342f34c5fb5476cf8d Mon Sep 17 00:00:00 2001
From: Eliad Peller <eliad@wizery.com>
Date: Sun, 16 Oct 2011 10:57:31 +0200
Subject: [PATCH] --- yaml --- r: 277601 b: refs/heads/master c:
 59034591029e9f3b691fe02ff60938556dba5683 h: refs/heads/master i:   277599:
 df088e8b9ddab728985b33cc928b51b9259e4f75 v: v3

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

diff --git a/[refs] b/[refs]
index 629ab0c363cb..e7e1e4e8c6d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a8aea098c8ebe3437d877542d138085be33346c
+refs/heads/master: 59034591029e9f3b691fe02ff60938556dba5683
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
index 30d73552e9ab..33a974663f79 100644
--- a/trunk/net/mac80211/iface.c
+++ b/trunk/net/mac80211/iface.c
@@ -286,6 +286,13 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
 			netif_carrier_off(dev);
 		else
 			netif_carrier_on(dev);
+
+		/*
+		 * set default queue parameters so drivers don't
+		 * need to initialise the hardware if the hardware
+		 * doesn't start up with sane defaults
+		 */
+		ieee80211_set_wmm_default(sdata);
 	}
 
 	set_bit(SDATA_STATE_RUNNING, &sdata->state);
@@ -329,15 +336,8 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
 	if (coming_up)
 		local->open_count++;
 
-	if (hw_reconf_flags) {
+	if (hw_reconf_flags)
 		ieee80211_hw_config(local, hw_reconf_flags);
-		/*
-		 * set default queue parameters so drivers don't
-		 * need to initialise the hardware if the hardware
-		 * doesn't start up with sane defaults
-		 */
-		ieee80211_set_wmm_default(sdata);
-	}
 
 	ieee80211_recalc_ps(local, -1);