From a2508ed065b6e4981c74160824eae5bf7431e394 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sat, 25 Jul 2009 10:54:13 +0200
Subject: [PATCH] --- yaml --- r: 159270 b: refs/heads/master c:
 bc43b28c10855aa56f6d0bd64ec6a6d8edbcf11b h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index fae7d6ce88b0..7b60c02d4a89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6686d17e161dcd0dc6801bcde9e397020bf9edf7
+refs/heads/master: bc43b28c10855aa56f6d0bd64ec6a6d8edbcf11b
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 7880a9c4cdda..283f1a890dad 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -4517,10 +4517,10 @@ void nl80211_send_reg_change_event(struct regulatory_request *request)
 		return;
 	}
 
-	rtnl_lock();
+	rcu_read_lock();
 	genlmsg_multicast_allns(msg, 0, nl80211_regulatory_mcgrp.id,
-				GFP_KERNEL);
-	rtnl_unlock();
+				GFP_ATOMIC);
+	rcu_read_unlock();
 
 	return;