---

yaml --- r: 352643 b: refs/heads/master c: b7566fc h: refs/heads/master i: 352641: 0e7c34f 352639: 958d861 v: v3
git-mirror · Feb 11, 2013 · 89a01ca · 89a01ca
1 parent 81de31f
commit 89a01ca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78f42aee884dedfd157f79d01f069550edbc95cf
+refs/heads/master: b7566fc363e23f0efd3fa1e1460f9421cdc0d77e
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -2189,10 +2189,15 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
 		 * However if a driver requested this specific regulatory
 		 * domain we keep it for its private use
 		 */
-		if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER)
+		if (lr->initiator == NL80211_REGDOM_SET_BY_DRIVER) {
+			const struct ieee80211_regdomain *tmp;
+
+			tmp = get_wiphy_regdom(request_wiphy);
 			rcu_assign_pointer(request_wiphy->regd, rd);
-		else
+			rcu_free_regdom(tmp);
+		} else {
 			kfree(rd);
+		}
 
 		rd = NULL;