From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 24 Jun 2013 13:43:38 +0000 (+0200)
Subject: regulatory: add missing rtnl locking
X-Git-Tag: v3.11-rc4~22^2~25^2^2~8^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f77b86d7d3acf9dfcb5ee834628d12207584b2cb;p=~emulex%2Finfiniband.git

regulatory: add missing rtnl locking

restore_regulatory_settings() requires the RTNL to be held,
add the missing locking in reg_timeout_work().

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 5a24c986f34..5a950f36bae 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2279,7 +2279,9 @@ void wiphy_regulatory_deregister(struct wiphy *wiphy)
 static void reg_timeout_work(struct work_struct *work)
 {
 	REG_DBG_PRINT("Timeout while waiting for CRDA to reply, restoring regulatory settings\n");
+	rtnl_lock();
 	restore_regulatory_settings(true);
+	rtnl_unlock();
 }
 
 int __init regulatory_init(void)