]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - net/wireless/reg.c
cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set
authorRajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
Tue, 10 Jul 2018 13:16:13 +0000 (18:46 +0530)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 26 Nov 2019 12:16:24 +0000 (13:16 +0100)
commit758238fcf85e019d6e18e7378dfb93a1661d7d33
tree51b0943b890d8d9692c17ded79c8c273b066592d
parent5a68b712f25a4ff62bf5984821834ec946d82584
cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set

BugLink: https://bugs.launchpad.net/bugs/1853915
[ Upstream commit 7417844b63d4b0dc8ab23f88259bf95de7d09b57 ]

When REGULATORY_COUNTRY_IE_IGNORE is set,  __reg_process_hint_country_ie()
ignores the country code change request from __cfg80211_connect_result()
via regulatory_hint_country_ie().

After Disconnect, similar to above, country code should not be reset to
world when country IE ignore is set. But this is violated and restore of
regulatory settings is invoked by cfg80211_disconnect_work via
regulatory_hint_disconnect().

To address this, avoid regulatory restore from regulatory_hint_disconnect()
when COUNTRY_IE_IGNORE is set.

Note: Currently, restore_regulatory_settings() takes care of clearing
beacon hints. But in the proposed change, regulatory restore is avoided.
Therefore, explicitly clear beacon hints when DISABLE_BEACON_HINTS
is not set.

Signed-off-by: Rajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
net/wireless/reg.c