diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-09-27 21:36:58 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-10-09 23:03:23 +0200 |
| commit | ed333684709658e6a5a0dd6f321eb0c9dccd826f (patch) | |
| tree | dafeb8e32982327ddd7eb3fe016683a7806670ad /patches/0013-fix-makefile-includes/rtw88.patch | |
| parent | 4ec72687181df4b786152747c008a688c9b9b9de (diff) | |
backports: patches: Refresh against kernel 5.4-rc2
Manual modifications where needed to make the following patch apply:
patches/0013-fix-makefile-includes/rtw88.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0013-fix-makefile-includes/rtw88.patch')
| -rw-r--r-- | patches/0013-fix-makefile-includes/rtw88.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/0013-fix-makefile-includes/rtw88.patch b/patches/0013-fix-makefile-includes/rtw88.patch index 454c9f89..10bb1780 100644 --- a/patches/0013-fix-makefile-includes/rtw88.patch +++ b/patches/0013-fix-makefile-includes/rtw88.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c -@@ -12,6 +12,7 @@ +@@ -13,6 +13,7 @@ #include "reg.h" #include "efuse.h" #include "debug.h" @@ -10,7 +10,7 @@ unsigned int rtw_debug_mask; --- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c -@@ -12,6 +12,7 @@ +@@ -13,6 +13,7 @@ #include "mac.h" #include "reg.h" #include "debug.h" @@ -20,21 +20,21 @@ u8 rx_path, bool is_tx2_path); --- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c -@@ -12,6 +12,7 @@ - #include "mac.h" +@@ -14,6 +14,7 @@ #include "reg.h" #include "debug.h" + #include "util.h" +#include <linux/module.h> static void rtw8822c_config_trx_mode(struct rtw_dev *rtwdev, u8 tx_path, u8 rx_path, bool is_tx2_path); --- a/drivers/net/wireless/realtek/rtw88/pci.c +++ b/drivers/net/wireless/realtek/rtw88/pci.c -@@ -9,6 +9,7 @@ - #include "tx.h" +@@ -10,6 +10,7 @@ #include "rx.h" + #include "fw.h" #include "debug.h" +#include <linux/interrupt.h> - static u32 rtw_pci_tx_queue_idx_addr[] = { - [RTW_TX_QUEUE_BK] = RTK_PCI_TXBD_IDX_BKQ, + static bool rtw_disable_msi; + module_param_named(disable_msi, rtw_disable_msi, bool, 0644); |