---

yaml --- r: 351740 b: refs/heads/master c: 540f6f2 h: refs/heads/master v: v3
git-mirror · Jan 3, 2013 · d4102c6 · d4102c6
1 parent 0fbe1c4
commit d4102c6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8da2bb4fe9ecb888f44714e2624c7d4268ac09d
+refs/heads/master: 540f6f2cc545da9ae2baa9faa3152fc550bedb57
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -1225,8 +1225,6 @@ static void handle_channel_custom(struct wiphy *wiphy,
 	const struct ieee80211_power_rule *power_rule = NULL;
 	const struct ieee80211_freq_range *freq_range = NULL;
 
-	assert_reg_lock();
-
 	r = freq_reg_info_regd(wiphy, MHZ_TO_KHZ(chan->center_freq),
 			       desired_bw_khz, &reg_rule, regd);
 
@@ -1271,14 +1269,12 @@ void wiphy_apply_custom_regulatory(struct wiphy *wiphy,
 	enum ieee80211_band band;
 	unsigned int bands_set = 0;
 
-	mutex_lock(&reg_mutex);
 	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
 		if (!wiphy->bands[band])
 			continue;
 		handle_band_custom(wiphy, wiphy->bands[band], regd);
 		bands_set++;
 	}
-	mutex_unlock(&reg_mutex);
 
 	/*
 	 * no point in calling this if it won't have any effect