From ea499d401abcddbc4f6566b97fee069cdce83f9d Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 10 Sep 2018 02:01:54 +0100
Subject: [PATCH] Update to 4.19-rc3

---
 debian/changelog                                |  7 ++++++-
 ...s-disable-regulatory.db-direct-loading.patch | 17 +++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2906be19..465237d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-linux (4.19~rc2-1~exp2) UNRELEASED; urgency=medium
+linux (4.19~rc3-1~exp1) UNRELEASED; urgency=medium
 
+  * New upstream release candidate
+
+  [ Ben Hutchings ]
   * [s390x] linux-image: Install compressed kernel image (fixes FTBFS)
   * [powerpc*] boot: Fix missing crc32poly.h when building with KERNEL_XZ
     (fixes FTBFS)
   * [x86] boot: Fix EFI stub alignment
+  * wireless: Update "wireless: Disable regulatory.db direct loading" for
+    4.19-rc3
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 05 Sep 2018 02:37:19 +0100
 
diff --git a/debian/patches/debian/wireless-disable-regulatory.db-direct-loading.patch b/debian/patches/debian/wireless-disable-regulatory.db-direct-loading.patch
index 60f3ec6e6..ff0321177 100644
--- a/debian/patches/debian/wireless-disable-regulatory.db-direct-loading.patch
+++ b/debian/patches/debian/wireless-disable-regulatory.db-direct-loading.patch
@@ -8,11 +8,9 @@ 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.
 
-Index: debian-kernel/net/wireless/reg.c
-===================================================================
---- debian-kernel.orig/net/wireless/reg.c
-+++ debian-kernel/net/wireless/reg.c
-@@ -489,6 +489,7 @@ static void reg_regdb_apply(struct work_
+--- a/net/wireless/reg.c
++++ b/net/wireless/reg.c
+@@ -476,6 +476,7 @@ static void reg_regdb_apply(struct work_
  
  static DECLARE_WORK(reg_regdb_work, reg_regdb_apply);
  
@@ -20,7 +18,7 @@ Index: debian-kernel/net/wireless/reg.c
  static int reg_schedule_apply(const struct ieee80211_regdomain *regdom)
  {
  	struct reg_regdb_apply_request *request;
-@@ -508,6 +509,7 @@ static int reg_schedule_apply(const stru
+@@ -495,6 +496,7 @@ static int reg_schedule_apply(const stru
  	schedule_work(&reg_regdb_work);
  	return 0;
  }
@@ -28,7 +26,7 @@ Index: debian-kernel/net/wireless/reg.c
  
  #ifdef CONFIG_CFG80211_CRDA_SUPPORT
  /* Max number of consecutive attempts to communicate with CRDA  */
-@@ -587,6 +589,36 @@ static inline int call_crda(const char *
+@@ -574,6 +576,35 @@ static inline int call_crda(const char *
  /* code to directly load a firmware database through request_firmware */
  static const struct fwdb_header *regdb;
  
@@ -53,8 +51,7 @@ Index: debian-kernel/net/wireless/reg.c
 +	return -ENOENT;
 +}
 +
-+int reg_query_regdb_wmm(char *alpha2, int freq, u32 *dbptr,
-+			struct ieee80211_wmm_rule *rule)
++int reg_query_regdb_wmm(char *alpha2, int freq, struct ieee80211_reg_rule *rule)
 +{
 +	return -ENODATA;
 +}
@@ -65,7 +62,7 @@ Index: debian-kernel/net/wireless/reg.c
  struct fwdb_country {
  	u8 alpha2[2];
  	__be16 coll_ptr;
-@@ -1152,6 +1184,8 @@ int reg_reload_regdb(void)
+@@ -1090,6 +1121,8 @@ int reg_reload_regdb(void)
  	return err;
  }