[3/3] patches: fix rtw88/rtw89 include patches

Commit Message

Johannes Berg May 24, 2024, 6:11 p.m. UTC

From: Johannes Berg <[e-mail]>

Signed-off-by: Johannes Berg <[e-mail]>
---
 .../0013-fix-makefile-includes/rtw88.patch    |  6 +-
 .../0013-fix-makefile-includes/rtw89.patch    | 72 +++++++++++++++++++
 2 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 patches/0013-fix-makefile-includes/rtw89.patch

Patch

diff --git a/patches/0013-fix-makefile-includes/rtw88.patch b/patches/0013-fix-makefile-includes/rtw88.patch
index 41dea13e103f..d9e87b9d1eb6 100644
--- a/patches/0013-fix-makefile-includes/rtw88.patch
+++ b/patches/0013-fix-makefile-includes/rtw88.patch
@@ -3,9 +3,9 @@  linux/module.h include needed for kernel 3.18
 --- a/drivers/net/wireless/realtek/rtw88/main.c
 +++ b/drivers/net/wireless/realtek/rtw88/main.c
 @@ -17,6 +17,7 @@
- #include "tx.h"
- #include "debug.h"
  #include "bf.h"
+ #include "sar.h"
+ #include "sdio.h"
 +#include <linux/module.h>
  
  bool rtw_disable_lps_deep_mode;
@@ -13,9 +13,9 @@  linux/module.h include needed for kernel 3.18
 --- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
 +++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
 @@ -14,6 +14,7 @@
- #include "reg.h"
  #include "debug.h"
  #include "bf.h"
+ #include "regd.h"
 +#include <linux/module.h>
  
  static const s8 lna_gain_table_0[8] = {22, 8, -6, -22, -31, -40, -46, -52};
diff --git a/patches/0013-fix-makefile-includes/rtw89.patch b/patches/0013-fix-makefile-includes/rtw89.patch
new file mode 100644
index 000000000000..2e99d4770781
--- /dev/null
+++ b/patches/0013-fix-makefile-includes/rtw89.patch
@@ -0,0 +1,72 @@ 
+diff --git a/drivers/net/wireless/realtek/rtw89/debug.c b/drivers/net/wireless/realtek/rtw89/debug.c
+index 0d010548f7d9..4974aed78f91 100644
+--- a/drivers/net/wireless/realtek/rtw89/debug.c
++++ b/drivers/net/wireless/realtek/rtw89/debug.c
+@@ -3,6 +3,7 @@
+  */
+ 
+ #include <linux/vmalloc.h>
++#include <linux/module.h>
+ 
+ #include "coex.h"
+ #include "debug.h"
+diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
+index 19001130ad94..51c3fab1408d 100644
+--- a/drivers/net/wireless/realtek/rtw89/pci.c
++++ b/drivers/net/wireless/realtek/rtw89/pci.c
+@@ -3,6 +3,7 @@
+  */
+ 
+ #include <linux/pci.h>
++#include <linux/module.h>
+ 
+ #include "mac.h"
+ #include "pci.h"
+diff --git a/drivers/net/wireless/realtek/rtw89/rtw8851b.c b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+index 51d3e61eaa1d..09d2d2859d14 100644
+--- a/drivers/net/wireless/realtek/rtw89/rtw8851b.c
++++ b/drivers/net/wireless/realtek/rtw89/rtw8851b.c
+@@ -2,6 +2,7 @@
+ /* Copyright(c) 2022-2023  Realtek Corporation
+  */
+ 
++#include <linux/module.h>
+ #include "coex.h"
+ #include "efuse.h"
+ #include "fw.h"
+diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852a.c b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+index 2deadec715cf..be2fac9ad72d 100644
+--- a/drivers/net/wireless/realtek/rtw89/rtw8852a.c
++++ b/drivers/net/wireless/realtek/rtw89/rtw8852a.c
+@@ -2,6 +2,7 @@
+ /* Copyright(c) 2019-2020  Realtek Corporation
+  */
+ 
++#include <linux/module.h>
+ #include "coex.h"
+ #include "fw.h"
+ #include "mac.h"
+diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+index d025c4135e1c..856223579b29 100644
+--- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
++++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
+@@ -2,6 +2,7 @@
+ /* Copyright(c) 2019-2022  Realtek Corporation
+  */
+ 
++#include <linux/module.h>
+ #include "coex.h"
+ #include "fw.h"
+ #include "mac.h"
+diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852c.c b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+index 17e6164855fa..c225d3c00d19 100644
+--- a/drivers/net/wireless/realtek/rtw89/rtw8852c.c
++++ b/drivers/net/wireless/realtek/rtw89/rtw8852c.c
+@@ -2,6 +2,7 @@
+ /* Copyright(c) 2019-2022  Realtek Corporation
+  */
+ 
++#include <linux/module.h>
+ #include "chan.h"
+ #include "coex.h"
+ #include "debug.h"