From cc0539bafa6bd3ee65c5fac48676cd4f0a25ff89 Mon Sep 17 00:00:00 2001
From: Yogesh Ashok Powar <yogeshp@marvell.com>
Date: Fri, 30 Dec 2011 16:34:25 +0530
Subject: [PATCH] --- yaml --- r: 279475 b: refs/heads/master c:
 7f28197560116f08c4c27342974f9e64cab2cbb1 h: refs/heads/master i:   279473:
 c4996f8e2be14b45495c2b6d731066d3539f4850   279471:
 49a456a453bde3350a41a55186fa761adcc2fcc0 v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/util.c | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 60c91ff82baf..e72d5d7d121e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98f0a5eb02bbfff662664bf65f469dc4abd701fd
+refs/heads/master: 7f28197560116f08c4c27342974f9e64cab2cbb1
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index eb1a5f737a9c..9919892575f4 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -1142,16 +1142,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 		 */
 	}
 #endif
-
-	/* setup fragmentation threshold */
-	drv_set_frag_threshold(local, hw->wiphy->frag_threshold);
-
-	/* setup RTS threshold */
-	drv_set_rts_threshold(local, hw->wiphy->rts_threshold);
-
-	/* reset coverage class */
-	drv_set_coverage_class(local, hw->wiphy->coverage_class);
-
 	/* everything else happens only if HW was up & running */
 	if (!local->open_count)
 		goto wake_up;
@@ -1170,6 +1160,15 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 		return res;
 	}
 
+	/* setup fragmentation threshold */
+	drv_set_frag_threshold(local, hw->wiphy->frag_threshold);
+
+	/* setup RTS threshold */
+	drv_set_rts_threshold(local, hw->wiphy->rts_threshold);
+
+	/* reset coverage class */
+	drv_set_coverage_class(local, hw->wiphy->coverage_class);
+
 	ieee80211_led_radio(local, true);
 	ieee80211_mod_tpt_led_trig(local,
 				   IEEE80211_TPT_LEDTRIG_FL_RADIO, 0);