From: Dmitry Shmidt Date: Mon, 19 Dec 2011 20:32:21 +0000 (-0800) Subject: wireless: Protect regdomain change by mutex X-Git-Tag: firefly_0821_release~7613^2~211 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=35047200c401cdd1bb43b5574270d1ac86a47937;p=firefly-linux-kernel-4.4.55.git wireless: Protect regdomain change by mutex Signed-off-by: Dmitry Shmidt --- diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 379574c30add..7b0add2badaa 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1759,6 +1759,7 @@ static void restore_alpha2(char *alpha2, bool reset_user) static void restore_regulatory_settings(bool reset_user) { char alpha2[2]; + char world_alpha2[2]; struct reg_beacon *reg_beacon, *btmp; struct regulatory_request *reg_request, *tmp; LIST_HEAD(tmp_reg_req_list); @@ -1809,11 +1810,13 @@ static void restore_regulatory_settings(bool reset_user) /* First restore to the basic regulatory settings */ cfg80211_regdomain = cfg80211_world_regdom; + world_alpha2[0] = cfg80211_regdomain->alpha2[0]; + world_alpha2[1] = cfg80211_regdomain->alpha2[1]; mutex_unlock(®_mutex); mutex_unlock(&cfg80211_mutex); - regulatory_hint_core(cfg80211_regdomain->alpha2); + regulatory_hint_core(world_alpha2); /* * This restores the ieee80211_regdom module parameter