diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-16 22:47:00 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-16 22:47:00 +0100 |
| commit | 66cbdd6b9fc81b801e5a2a829090685830cf43c9 (patch) | |
| tree | 9553303fb2f1bb33a432f6b215d382ccadfc3dff /sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.6.patch | |
| parent | ac8e95fce9e65d8b24d50ecc33b4340bf9a90027 (diff) | |
Revert "sys-kernel/broadcom-sta-dkms : rediff and merge all patches from 3.18 to 5.6"
This reverts commit ac8e95fce9e65d8b24d50ecc33b4340bf9a90027.
Diffstat (limited to 'sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.6.patch')
| -rw-r--r-- | sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.6.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.6.patch b/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.6.patch new file mode 100644 index 00000000..cfacd027 --- /dev/null +++ b/sys-kernel/broadcom-sta-dkms/files/broadcom-sta-6.30.223.271-r4-linux-5.6.patch @@ -0,0 +1,41 @@ +diff -Naur src/shared/linux_osl.c scr-crap-o-meter/shared/linux_osl.c +--- src/shared/linux_osl.c 2015-09-19 00:47:30.000000000 +0200 ++++ scr-crap-o-meter/shared/linux_osl.c 2020-03-31 00:30:59.667169330 +0200 +@@ -30,6 +30,7 @@ + #include <pcicfg.h> + + #include <linux/fs.h> ++#include <linux/io.h> + + #define PCI_CFG_RETRY 10 + +diff -Naur src/wl/sys/wl_linux.c scr-crap-o-meter/wl/sys/wl_linux.c +--- src/wl/sys/wl_linux.c 2015-09-19 00:47:30.000000000 +0200 ++++ scr-crap-o-meter/wl/sys/wl_linux.c 2020-03-31 00:39:52.180068119 +0200 +@@ -93,6 +93,8 @@ + + #include <wlc_wowl.h> + ++#include <linux/io.h> ++ + static void wl_timer(ulong data); + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); +@@ -3335,10 +3337,17 @@ + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,6,0) + static const struct file_operations wl_fops = { + .owner = THIS_MODULE, + .read = wl_proc_read, + .write = wl_proc_write, ++#else ++static const struct proc_ops wl_fops = { ++ .proc_owner = THIS_MODULE, ++ .proc_read = wl_proc_read, ++ .proc_write = wl_proc_write, ++#endif + }; + #endif + |