Merge ~vicamo/ubuntu/+source/rtl8821ce-dkms/+git/rtl8821ce-dkms:bug-1861278/enable-config-dfs/focal into ~canonical-hwe-team/ubuntu/+source/rtl8821ce-dkms/+git/rtl8821ce-dkms:ubuntu/focal

[You-Sheng Yang]

Unmerged commits

45836cb... by You-Sheng Yang on 2020-02-19

rtl8821ce: enable CONFIG_DFS for more 5G channels

diff --git a/debian/changelog b/debian/changelog
index 7ad4813..87c38d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rtl8821ce (5.5.2.1-0ubuntu4) focal; urgency=medium
+
+  * Enable CONFIG_DFS for more 5G channels. (LP: #1861278)
+
+ -- You-Sheng Yang <[e-mail]>  Wed, 19 Feb 2020 15:47:30 +0800
+
 rtl8821ce (5.5.2.1-0ubuntu3) focal; urgency=medium
 
   * debian/control:
diff --git a/debian/patches/0005-Enable-CONFIG_DFS-for-RTL8821CE-adapters-to-support-.patch b/debian/patches/0005-Enable-CONFIG_DFS-for-RTL8821CE-adapters-to-support-.patch
new file mode 100644
index 0000000..29c00d5
--- /dev/null
+++ b/debian/patches/0005-Enable-CONFIG_DFS-for-RTL8821CE-adapters-to-support-.patch
@@ -0,0 +1,31 @@
+From ff544505d0dbf46d0c6136fa1b05b7c0dad4dd3e Mon Sep 17 00:00:00 2001
+From: Elie Morisse <[e-mail]>
+Date: Wed, 24 Jul 2019 12:40:51 -0300
+Subject: [PATCH] Enable CONFIG_DFS for RTL8821CE adapters, to support 5Ghz
+ bands only allowed with DFS.
+
+DFS (as client, not as AP) is supported by the Windows driver, and it seems to be implemented in this driver too, just disabled.
+
+This fixes issue #34. Thanks to @tomaspinho for pointing me in the right direction.
+
+(cherry picked from commit 1ddc1d901ea5157b008c6262e4b2a03f0fadf228)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ include/hal_ic_cfg.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/hal_ic_cfg.h b/include/hal_ic_cfg.h
+index 8fe3516..a9295e9 100644
+--- a/include/hal_ic_cfg.h
++++ b/include/hal_ic_cfg.h
+@@ -234,6 +234,7 @@
+ #ifdef CONFIG_RTL8821C
+ 	#undef RTL8821C_SUPPORT
+ 	#define RTL8821C_SUPPORT				1
++	#define CONFIG_DFS	/* Enable 5G band 2&3 channel */
+ 	#ifndef CONFIG_FW_C2H_PKT
+ 		#define CONFIG_FW_C2H_PKT
+ 	#endif
+-- 
+2.25.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 69042d9..f864cd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fixes-for-Linux-5.3.patch
 0003-rtl8821ce-use-dma_addr_t.patch
 0004-rtl8821ce-guard-wireless_send_event-with-CONFIG_WIRE.patch
+0005-Enable-CONFIG_DFS-for-RTL8821CE-adapters-to-support-.patch