From: Johannes Berg This order is going to become required, since userspace can query the regulatory in the window between the two registrations. Signed-off-by: Johannes Berg --- drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c index d9c84d5ce254..139f67adead7 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c +++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c @@ -1231,13 +1231,18 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac) sizeof(wiphy->fw_version)); wiphy->hw_version = hw_info->hw_version; + if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) { + ret = regulatory_set_wiphy_regd(wiphy, mac->rd); + if (ret < 0) + goto out; + } + ret = wiphy_register(wiphy); if (ret < 0) goto out; - if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) - ret = regulatory_set_wiphy_regd(wiphy, mac->rd); - else if (regdomain_is_known) + if (regdomain_is_known && + !(wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED)) ret = regulatory_hint(wiphy, mac->rd->alpha2); out: -- 2.56.0