diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-06-24 09:43:38 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-07-16 02:55:55 -0400 |
| commit | f77b86d7d3acf9dfcb5ee834628d12207584b2cb (patch) | |
| tree | 9f1c168aee8a599798fb3f6560da8f44b54416d4 /net/wireless | |
| parent | 923a0e7dee8c436108279568cf34444749ac796f (diff) | |
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>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 5a24c986f34b..5a950f36bae4 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
| @@ -2279,7 +2279,9 @@ void wiphy_regulatory_deregister(struct wiphy *wiphy) | |||
| 2279 | static void reg_timeout_work(struct work_struct *work) | 2279 | static void reg_timeout_work(struct work_struct *work) |
| 2280 | { | 2280 | { |
| 2281 | REG_DBG_PRINT("Timeout while waiting for CRDA to reply, restoring regulatory settings\n"); | 2281 | REG_DBG_PRINT("Timeout while waiting for CRDA to reply, restoring regulatory settings\n"); |
| 2282 | rtnl_lock(); | ||
| 2282 | restore_regulatory_settings(true); | 2283 | restore_regulatory_settings(true); |
| 2284 | rtnl_unlock(); | ||
| 2283 | } | 2285 | } |
| 2284 | 2286 | ||
| 2285 | int __init regulatory_init(void) | 2287 | int __init regulatory_init(void) |