cfg80211: regulatory: restore proper user alpha2
restore_regulatory_settings() should restore alpha2 as computed in restore_alpha2(), not raw user_alpha2 to behave as described in the comment just above that code. This fixes endless loop of calling CRDA for "00" and "97" countries after resume from suspend on my laptop. Looks like others had the same problem, too: http://ath9k-devel.ath9k.narkive.com/knY5W6St/ath9k-and-crda-messages-in-logs https://bugs.launchpad.net/ubuntu/+source/linux/+bug/899335 https://forum.porteus.org/viewtopic.php?t=4975&p=36436 https://forums.opensuse.org/showthread.php/483356-Authentication-Regulatory-Domain-issues-ath5k-12-2 Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
parent
4c0778933a
commit
549cc1c560
1 changed files with 1 additions and 1 deletions
|
@ -2625,7 +2625,7 @@ static void restore_regulatory_settings(bool reset_user)
|
|||
* settings, user regulatory settings takes precedence.
|
||||
*/
|
||||
if (is_an_alpha2(alpha2))
|
||||
regulatory_hint_user(user_alpha2, NL80211_USER_REG_HINT_USER);
|
||||
regulatory_hint_user(alpha2, NL80211_USER_REG_HINT_USER);
|
||||
|
||||
spin_lock(®_requests_lock);
|
||||
list_splice_tail_init(&tmp_reg_req_list, ®_requests_list);
|
||||
|
|
Loading…
Reference in a new issue