From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 30 Mar 2019 15:56:56 +0000 (+0100)
Subject: kernel: update user regd patch from openwrt
X-Git-Url: http://git.ipfire.org/?p=people%2Ffbuehrle%2Fipfire-2.x.git;a=commitdiff_plain;h=3005eb2234e5875389011d247785909d5f044c74

kernel: update user regd patch from openwrt

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/linux b/lfs/linux
index 5dde9bdf0..102265996 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -128,7 +128,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pll.patch
 
 	# Wlan Patches
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-ath_ignore_eeprom_regd.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.14_ath_user_regd.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch
 
 	# Add LED trigger
diff --git a/src/patches/linux/linux-4.14_ath_user_regd.patch b/src/patches/linux/linux-4.14_ath_user_regd.patch
new file mode 100644
index 000000000..179f323c8
--- /dev/null
+++ b/src/patches/linux/linux-4.14_ath_user_regd.patch
@@ -0,0 +1,71 @@
+diff -Naur linux-4.14.103.org/drivers/net/wireless/ath/regd.c linux-4.14.103/drivers/net/wireless/ath/regd.c
+--- linux-4.14.103.org/drivers/net/wireless/ath/regd.c	2019-02-23 09:06:44.000000000 +0100
++++ linux-4.14.103/drivers/net/wireless/ath/regd.c	2019-03-30 11:35:53.177299394 +0100
+@@ -24,6 +24,7 @@
+ #include "regd_common.h"
+ 
+ static int __ath_regd_init(struct ath_regulatory *reg);
++static struct reg_dmn_pair_mapping *ath_get_regpair(int regdmn);
+ 
+ /*
+  * This is a set of common rules used by our world regulatory domains.
+@@ -116,6 +117,9 @@
+ 
+ static bool dynamic_country_user_possible(struct ath_regulatory *reg)
+ {
++//	if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
++		return true;
++
+ 	if (IS_ENABLED(CONFIG_ATH_REG_DYNAMIC_USER_CERT_TESTING))
+ 		return true;
+ 
+@@ -188,6 +192,8 @@
+ 
+ static bool ath_reg_dyn_country_user_allow(struct ath_regulatory *reg)
+ {
++//	if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
++		return true;
+ 	if (!IS_ENABLED(CONFIG_ATH_REG_DYNAMIC_USER_REG_HINTS))
+ 		return false;
+ 	if (!dynamic_country_user_possible(reg))
+@@ -345,6 +351,9 @@
+ 	struct ieee80211_channel *ch;
+ 	unsigned int i;
+ 
++//	if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
++		return;
++
+ 	for (band = 0; band < NUM_NL80211_BANDS; band++) {
+ 		if (!wiphy->bands[band])
+ 			continue;
+@@ -378,6 +387,9 @@
+ {
+ 	struct ieee80211_supported_band *sband;
+ 
++//	if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
++		return;
++
+ 	sband = wiphy->bands[NL80211_BAND_2GHZ];
+ 	if (!sband)
+ 		return;
+@@ -407,6 +419,9 @@
+ 	struct ieee80211_channel *ch;
+ 	unsigned int i;
+ 
++//	if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
++		return;
++
+ 	if (!wiphy->bands[NL80211_BAND_5GHZ])
+ 		return;
+ 
+@@ -639,6 +654,10 @@
+ 	const struct ieee80211_regdomain *regd;
+ 
+ 	wiphy->reg_notifier = reg_notifier;
++
++//	if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
++		return 0;
++
+ 	wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
+ 				   REGULATORY_CUSTOM_REG;
+ 
diff --git a/src/patches/linux/linux-4.9.8-ath_ignore_eeprom_regd.patch b/src/patches/linux/linux-4.9.8-ath_ignore_eeprom_regd.patch
deleted file mode 100644
index ca835eb9a..000000000
--- a/src/patches/linux/linux-4.9.8-ath_ignore_eeprom_regd.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur linux-4.9.8.org/drivers/net/wireless/ath/regd.c linux-4.9.8/drivers/net/wireless/ath/regd.c
---- linux-4.9.8.org/drivers/net/wireless/ath/regd.c	2017-02-04 09:47:29.000000000 +0100
-+++ linux-4.9.8/drivers/net/wireless/ath/regd.c	2017-02-11 15:31:20.502527360 +0100
-@@ -341,6 +341,8 @@
- 	struct ieee80211_channel *ch;
- 	unsigned int i;
- 
-+	return;
-+
- 	for (band = 0; band < NUM_NL80211_BANDS; band++) {
- 		if (!wiphy->bands[band])
- 			continue;
-@@ -374,6 +376,8 @@
- {
- 	struct ieee80211_supported_band *sband;
- 
-+	return;
-+
- 	sband = wiphy->bands[NL80211_BAND_2GHZ];
- 	if (!sband)
- 		return;
-@@ -402,6 +406,8 @@
- 	struct ieee80211_channel *ch;
- 	unsigned int i;
- 
-+	return;
-+
- 	if (!wiphy->bands[NL80211_BAND_5GHZ])
- 		return;
- 
-@@ -632,6 +638,8 @@
- {
- 	const struct ieee80211_regdomain *regd;
- 
-+	return 0;
-+
- 	wiphy->reg_notifier = reg_notifier;
- 	wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
- 				   REGULATORY_CUSTOM_REG;