---

yaml --- r: 203927 b: refs/heads/master c: c4c3229 h: refs/heads/master i: 203925: 1d4502c 203923: 9e79645 203919: fdf294c v: v3
git-mirror · Jul 28, 2010 · 2dfffc0 · 2dfffc0
1 parent 84c87fe
commit 2dfffc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d080e2755d840ede60128cc914a070868ebabc1e
+refs/heads/master: c4c322941ce0d7e2b7b8794ad70683123d9cb26a
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
@@ -1306,6 +1306,7 @@ static void reg_process_hint(struct regulatory_request *reg_request)
 {
 	int r = 0;
 	struct wiphy *wiphy = NULL;
+	enum nl80211_reg_initiator initiator = reg_request->initiator;
 
 	BUG_ON(!reg_request->alpha2);
 
@@ -1325,7 +1326,7 @@ static void reg_process_hint(struct regulatory_request *reg_request)
 	/* This is required so that the orig_* parameters are saved */
 	if (r == -EALREADY && wiphy &&
 	    wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY)
-		wiphy_update_regulatory(wiphy, reg_request->initiator);
+		wiphy_update_regulatory(wiphy, initiator);
 out:
 	mutex_unlock(&reg_mutex);
 	mutex_unlock(&cfg80211_mutex);