Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-11 21:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cfg80211: add helper for kfree'ing and assigning last_request

Browse Source 
This enforces proper RCU APIs accross the code.

Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Luis R. Rodriguez 2013-11-05 09:18:09 -08:00 committed by Johannes Berg
parent 5ad6ef5e06
commit 05f1a3ea2d
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/wireless/reg.c
View File

@ -212,6 +212,12 @@ static void reg_kfree_last_request(void)
kfree_rcu(lr, rcu_head); kfree_rcu(lr, rcu_head);
} }
static void reg_update_last_request(struct regulatory_request *request)
{
reg_kfree_last_request();
rcu_assign_pointer(last_request, request);
}
static void reset_regdomains(bool full_reset, static void reset_regdomains(bool full_reset,
const struct ieee80211_regdomain *new_regdom) const struct ieee80211_regdomain *new_regdom)
{ {
@ -238,8 +244,7 @@ static void reset_regdomains(bool full_reset,
if (!full_reset) if (!full_reset)
return; return;
reg_kfree_last_request(); reg_update_last_request(&core_request_world);
rcu_assign_pointer(last_request, &core_request_world);
} }
/* /*
@ -1364,8 +1369,7 @@ reg_process_hint_core(struct regulatory_request *core_request)
core_request->intersect = false; core_request->intersect = false;
core_request->processed = false; core_request->processed = false;
reg_kfree_last_request(); reg_update_last_request(core_request);
rcu_assign_pointer(last_request, core_request);
if (call_crda(core_request->alpha2)) if (call_crda(core_request->alpha2))
return REG_REQ_IGNORE; return REG_REQ_IGNORE;
@ -1432,8 +1436,7 @@ reg_process_hint_user(struct regulatory_request *user_request)
user_request->intersect = treatment == REG_REQ_INTERSECT; user_request->intersect = treatment == REG_REQ_INTERSECT;
user_request->processed = false; user_request->processed = false;
reg_kfree_last_request(); reg_update_last_request(user_request);
rcu_assign_pointer(last_request, user_request);
user_alpha2[0] = user_request->alpha2[0]; user_alpha2[0] = user_request->alpha2[0];
user_alpha2[1] = user_request->alpha2[1]; user_alpha2[1] = user_request->alpha2[1];
@ -1505,8 +1508,7 @@ reg_process_hint_driver(struct wiphy *wiphy,
driver_request->intersect = treatment == REG_REQ_INTERSECT; driver_request->intersect = treatment == REG_REQ_INTERSECT;
driver_request->processed = false; driver_request->processed = false;
reg_kfree_last_request(); reg_update_last_request(driver_request);
rcu_assign_pointer(last_request, driver_request);
/* /*
* Since CRDA will not be called in this case as we already * Since CRDA will not be called in this case as we already
@ -1604,8 +1606,7 @@ reg_process_hint_country_ie(struct wiphy *wiphy,
country_ie_request->intersect = false; country_ie_request->intersect = false;
country_ie_request->processed = false; country_ie_request->processed = false;
reg_kfree_last_request(); reg_update_last_request(country_ie_request);
rcu_assign_pointer(last_request, country_ie_request);
if (call_crda(country_ie_request->alpha2)) if (call_crda(country_ie_request->alpha2))
return REG_REQ_IGNORE; return REG_REQ_IGNORE;