patch: squelch over-zealous wifi regdomain not set warnings

3 files changed, 44 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf858e404dcc..35abfa48ceda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,6 +24,7 @@ pkgbase = linux-xanmod-rog
 	source = x86-ACPI-State-Optimize-C3-entry-on-AMD-CPUs.patch
 	source = acpi-battery-Always-read-fresh-battery-state-on-update.patch
 	source = hwmon-k10temp-support-Zen3-APUs.patch
+	source = cfg80211-dont-WARN-if-a-self-managed-device.patch
 	source = asus-wmi-Add-panel-overdrive-functionality.patch
 	source = asus-wmi-Add-dgpu-disable-method.patch
 	source = asus-wmi-Add-egpu-enable-method.patch
@@ -61,6 +62,7 @@ pkgbase = linux-xanmod-rog
 	sha256sums = 923230ed8367e28adfdeed75d3cdba9eec6b781818c37f6f3d3eb64101d2e716
 	sha256sums = f7a4bf6293912bfc4a20743e58a5a266be8c4dbe3c1862d196d3a3b45f2f7c90
 	sha256sums = de8c9747637768c4356c06aa65c3f157c526aa420f21fdd5edd0ed06f720a62e
+	sha256sums = 3d8961438b5c8110588ff0b881d472fc71a4304d306808d78a4055a4150f351e
 	sha256sums = 1ab75535772c63567384eb2ac74753e4d5db2f3317cb265aedf6151b9f18c6c2
 	sha256sums = 8cc771f37ee08ad5796e6db64f180c1415a5f6e03eb3045272dade30ca754b53
 	sha256sums = f3461e7cc759fd4cef2ec5c4fa15b80fa6d37e16008db223f77ed88a65aa938e
diff --git a/PKGBUILD b/PKGBUILD
index 8f73b74e8e7b..94c7517a14e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -124,6 +124,9 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${_branch}/linux-${_major}.tar
 
         # AMD pstate cpufreq driver v2                                                  # included in xanmod tree
 
+        # squelch overzealous 802.11 regdomain not set warnings
+        "cfg80211-dont-WARN-if-a-self-managed-device.patch"
+
         # ASUS ROG enablement
         "asus-wmi-Add-panel-overdrive-functionality.patch"                              # landing in 5.15
         "asus-wmi-Add-dgpu-disable-method.patch"                                        # "
@@ -173,6 +176,7 @@ sha256sums=('7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2'
             '923230ed8367e28adfdeed75d3cdba9eec6b781818c37f6f3d3eb64101d2e716'
             'f7a4bf6293912bfc4a20743e58a5a266be8c4dbe3c1862d196d3a3b45f2f7c90'
             'de8c9747637768c4356c06aa65c3f157c526aa420f21fdd5edd0ed06f720a62e'
+            '3d8961438b5c8110588ff0b881d472fc71a4304d306808d78a4055a4150f351e'
             '1ab75535772c63567384eb2ac74753e4d5db2f3317cb265aedf6151b9f18c6c2'
             '8cc771f37ee08ad5796e6db64f180c1415a5f6e03eb3045272dade30ca754b53'
             'f3461e7cc759fd4cef2ec5c4fa15b80fa6d37e16008db223f77ed88a65aa938e'
diff --git a/cfg80211-dont-WARN-if-a-self-managed-device.patch b/cfg80211-dont-WARN-if-a-self-managed-device.patch
new file mode 100644
index 000000000000..ec25e0290bbd
--- /dev/null
+++ b/cfg80211-dont-WARN-if-a-self-managed-device.patch
@@ -0,0 +1,38 @@
+From: Luca Coelho <luca@coelho.fi>
+To: johannes@sipsolutions.net
+Cc: linux-wireless@vger.kernel.org
+Subject: [PATCH 05/15] cfg80211: don't WARN if a self-managed device doesn't have a regdom
+Date: Fri,  9 Apr 2021 12:40:18 +0300	[thread overview]
+Message-ID: <iwlwifi.20210409123755.ba2ea961f4ae.I8fde32d3196e860efa3b4ec464c42194195b42ec@changeid> (raw)
+In-Reply-To: <20210409094028.356611-1-luca@coelho.fi>
+
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+
+This can happen if it booted in RF-Kill and didn't have a
+chance to get its regulatory domain yet.
+This can happen for example if hostapd is started on a device
+that is blocked by RF-Kill.
+
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+---
+ net/wireless/nl80211.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
+index 521d36bb0803..f56307185b8a 100644
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -7742,8 +7742,8 @@ static int nl80211_get_reg_do(struct sk_buff *skb, struct genl_info *info)
+ 			       REGULATORY_WIPHY_SELF_MANAGED;
+ 		regdom = get_wiphy_regdom(wiphy);
+ 
+-		/* a self-managed-reg device must have a private regdom */
+-		if (WARN_ON(!regdom && self_managed)) {
++		/* a self-managed-reg device should have a private regdom */
++		if (!regdom && self_managed) {
+ 			nlmsg_free(msg);
+ 			rtnl_unlock();
+ 			return -EINVAL;
+-- 
+2.31.0