Regdomain information needs to be registered with cfg80211
for devices with REGULATORY_WIPHY_SELF_MANAGED flag set.

Signed-off-by: Igor Mitsyanko <igor.mitsyanko...@quantenna.com>
Signed-off-by: Sergey Matyukevich <sergey.matyukevich...@quantenna.com>
Signed-off-by: Avinash Patil <avina...@quantenna.com>
---
 drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c 
b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
index 7f70b0aae069..e288b1d4432a 100644
--- a/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
+++ b/drivers/net/wireless/quantenna/qtnfmac/cfg80211.c
@@ -873,6 +873,15 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, 
struct qtnf_wmac *mac)
        }
 
        ret = wiphy_register(wiphy);
+       if (ret < 0)
+               goto out;
+
+       if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED)
+               ret = regulatory_set_wiphy_regd(wiphy, hw_info->rd);
+       else if (isalpha(hw_info->rd->alpha2[0]) &&
+                isalpha(hw_info->rd->alpha2[1]))
+               ret = regulatory_hint(wiphy, hw_info->rd->alpha2);
+
 out:
        if (ret) {
                kfree(iface_comb);
-- 
2.11.0

Reply via email to