wireless: Disable regulatory.db direct loading (see #892229)
This commit is contained in:
parent
8a1196e2d0
commit
6b8b6f7948
|
@ -8,6 +8,9 @@ linux (4.15.11-2) UNRELEASED; urgency=medium
|
|||
- [2ed70eb] "Add empty featuresets for armel to help abiupdate script"
|
||||
- [5f62872] "(Temporarily) disable armel kernel image build"
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* wireless: Disable regulatory.db direct loading (see #892229)
|
||||
|
||||
-- Roger Shimizu <rogershimizu@gmail.com> Fri, 23 Mar 2018 21:10:34 +0900
|
||||
|
||||
linux (4.15.11-1) unstable; urgency=medium
|
||||
|
|
|
@ -0,0 +1,68 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Thu, 05 Apr 2018 18:13:52 +0200
|
||||
Subject: wireless: Disable regulatory.db direct loading
|
||||
Forwarded: not-needed
|
||||
Bug-Debian: https://bugs.debian.org/892229
|
||||
|
||||
Don't complain about being unable to load regulatory.db directly.
|
||||
This is expected until we generate a signing key and update
|
||||
wireless-regdb to be signed with it.
|
||||
|
||||
---
|
||||
--- a/net/wireless/reg.c
|
||||
+++ b/net/wireless/reg.c
|
||||
@@ -475,6 +475,7 @@ static void reg_regdb_apply(struct work_
|
||||
|
||||
static DECLARE_WORK(reg_regdb_work, reg_regdb_apply);
|
||||
|
||||
+#if 0
|
||||
static int reg_schedule_apply(const struct ieee80211_regdomain *regdom)
|
||||
{
|
||||
struct reg_regdb_apply_request *request;
|
||||
@@ -494,6 +495,7 @@ static int reg_schedule_apply(const stru
|
||||
schedule_work(®_regdb_work);
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
|
||||
#ifdef CONFIG_CFG80211_CRDA_SUPPORT
|
||||
/* Max number of consecutive attempts to communicate with CRDA */
|
||||
@@ -573,6 +575,29 @@ static inline int call_crda(const char *
|
||||
/* code to directly load a firmware database through request_firmware */
|
||||
static const struct fwdb_header *regdb;
|
||||
|
||||
+#if 1
|
||||
+
|
||||
+static int load_builtin_regdb_keys(void)
|
||||
+{
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static void free_regdb_keyring(void)
|
||||
+{
|
||||
+}
|
||||
+
|
||||
+static int query_regdb_file(const char *alpha2)
|
||||
+{
|
||||
+ return -ENOENT;
|
||||
+}
|
||||
+
|
||||
+int reg_reload_regdb(void)
|
||||
+{
|
||||
+ return -ENOENT;
|
||||
+}
|
||||
+
|
||||
+#else /* disabled until we update wireless-regdb */
|
||||
+
|
||||
struct fwdb_country {
|
||||
u8 alpha2[2];
|
||||
__be16 coll_ptr;
|
||||
@@ -963,6 +988,8 @@ int reg_reload_regdb(void)
|
||||
return err;
|
||||
}
|
||||
|
||||
+#endif
|
||||
+
|
||||
static bool reg_query_database(struct regulatory_request *request)
|
||||
{
|
||||
if (query_regdb_file(request->alpha2) == 0)
|
|
@ -140,4 +140,7 @@ bugfix/arm64/ARM64-dts-meson-reduce-odroid-c2-eMMC-maximum-rate.patch
|
|||
# Backport patches from linux-next (next-20180103) to support SMP on tegra210 systems
|
||||
features/arm64/tegra210-smp/0001-arm64-tegra-Add-CPU-and-PSCI-nodes-for-NVIDIA-Tegra2.patch
|
||||
|
||||
# wireless: Disable regulatory.db direct loading (until we sort out signing)
|
||||
debian/wireless-disable-regulatory.db-direct-loading.patch
|
||||
|
||||
# ABI maintenance
|
||||
|
|
Loading…
Reference in New Issue