From e9319db7e776206cd5d67b1830b91e982f367c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Guti=C3=83errez?= <juanjo@gutierrezdequevedo.com>
Date: Sat, 27 Mar 2021 22:13:58 +0100
Subject: [PATCH] apply patch from
 https://github.com/armbian/build/commit/61ba606f4ac50c56d4e92b5505bbe3c4e9fa317c

---
 core/rtw_mlme_ext.c           |  4 +++-
 include/rtw_wifi_regd.h       |  4 ++--
 os_dep/linux/ioctl_cfg80211.c |  5 ++---
 os_dep/linux/wifi_regd.c      | 27 ++++-----------------------
 4 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c
index 4027046..19e91e2 100644
--- a/core/rtw_mlme_ext.c
+++ b/core/rtw_mlme_ext.c
@@ -15121,7 +15121,9 @@ u8 set_chplan_hdl(_adapter *padapter, unsigned char *pbuf)
 	rtw_hal_set_odm_var(padapter,HAL_ODM_REGULATION,NULL,_TRUE);
 	
 #ifdef CONFIG_IOCTL_CFG80211
-	rtw_reg_notify_by_driver(padapter);
+	if (padapter->rtw_wdev != NULL) {
+		rtw_reg_notify_by_driver(padapter->rtw_wdev->wiphy);
+	}
 #endif //CONFIG_IOCTL_CFG80211
 
 	return 	H2C_SUCCESS;
diff --git a/include/rtw_wifi_regd.h b/include/rtw_wifi_regd.h
index aea6365..e6ac7df 100644
--- a/include/rtw_wifi_regd.h
+++ b/include/rtw_wifi_regd.h
@@ -19,8 +19,8 @@ enum country_code_type_t {
 	COUNTRY_CODE_MAX
 }; 
 
-int rtw_regd_init(_adapter *padapter);
-void rtw_reg_notify_by_driver(_adapter *adapter);
+void rtw_regd_init(struct wiphy *wiphy);
+void rtw_reg_notify_by_driver(struct wiphy *wiphy);
 
 #endif /* __RTW_WIFI_REGD_H__ */
 
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
index e5e0592..35b107a 100644
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
@@ -6444,9 +6444,6 @@ void rtw_cfg80211_init_wiphy(_adapter *padapter)
 			rtw_cfg80211_init_ht_capab(padapter, &bands->ht_cap, NL80211_BAND_5GHZ, rf_type);
 	}
 #endif
-	/* init regulary domain */
-	rtw_regd_init(padapter);
-
 	/* copy mac_addr to wiphy */
 	_rtw_memcpy(wiphy->perm_addr, adapter_mac_addr(padapter), ETH_ALEN);
 
@@ -6679,6 +6676,8 @@ struct wiphy *rtw_wiphy_alloc(_adapter *padapter, struct device *dev)
 	*((_adapter**)wiphy_priv(wiphy)) = padapter;
 
 	rtw_cfg80211_preinit_wiphy(padapter, wiphy);
+	/* init regulatory domain */
+	rtw_regd_init(wiphy);
 
 	DBG_871X(FUNC_WIPHY_FMT"\n", FUNC_WIPHY_ARG(wiphy));
 
diff --git a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c
index 838f982..72c1ff1 100644
--- a/os_dep/linux/wifi_regd.c
+++ b/os_dep/linux/wifi_regd.c
@@ -476,12 +476,12 @@ void rtw_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request)
 	#endif
 }
 
-void rtw_reg_notify_by_driver(_adapter *adapter)
+void rtw_reg_notify_by_driver(struct wiphy *wiphy)
 {
-	if ((adapter->rtw_wdev != NULL) && (adapter->rtw_wdev->wiphy)) {
+	if (wiphy) {
 		struct regulatory_request request;
 		request.initiator = NL80211_REGDOM_SET_BY_DRIVER;
-		rtw_reg_notifier(adapter->rtw_wdev->wiphy, &request);
+		rtw_reg_notifier(wiphy, &request);
 	}
 }
 
@@ -521,28 +521,9 @@ static struct country_code_to_enum_rd *_rtw_regd_find_country(u16 countrycode)
 	return NULL;
 }
 
-int rtw_regd_init(_adapter * padapter)
+void rtw_regd_init(struct wiphy *wiphy)
 {
-	struct wiphy *wiphy = padapter->rtw_wdev->wiphy;
-
-#if 0
-	if (rtw_regd == NULL) {
-		rtw_regd = (struct rtw_regulatory *)
-		    rtw_malloc(sizeof(struct rtw_regulatory));
-
-		rtw_regd->alpha2[0] = '9';
-		rtw_regd->alpha2[1] = '9';
-
-		rtw_regd->country_code = COUNTRY_CODE_USER;
-	}
-
-	DBG_8192C("%s: Country alpha2 being used: %c%c\n",
-		  __func__, rtw_regd->alpha2[0], rtw_regd->alpha2[1]);
-#endif
-
 	_rtw_regd_init_wiphy(NULL, wiphy);
-
-	return 0;
 }
 #endif //CONFIG_IOCTL_CFG80211