summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGoliathLabs2020-06-07 18:50:42 +0200
committerGoliathLabs2020-06-07 18:50:42 +0200
commitcd0c374a8e214c7039d0adc75b42e424689d8a04 (patch)
treeecdcc7affee9c43fb0ea3576f38c77433fbfcd64
parent28c927de77d4453c0984e65e81bc5495ac5af3f9 (diff)
downloadaur-cd0c374a8e214c7039d0adc75b42e424689d8a04.tar.gz
Added: 5.6 patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
-rw-r--r--linux-5.6.patch85
3 files changed, 100 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a4c61204adb0..953a055ffddb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = 8188fu-dkms-git
pkgdesc = Driver for Realtek RTL8188FU USB wireless adapter
pkgver = r7.2dd10a1
- pkgrel = 1
+ pkgrel = 2
url = http://www.realtek.com.tw/
install = 8188fu-dkms.install
arch = any
@@ -11,9 +11,11 @@ pkgbase = 8188fu-dkms-git
source = 8188fu::git+https://github.com/corneal64/Realtek-USB-Wireless-Adapter-Drivers.git
source = blacklist-r8188fu.conf
source = dkms.conf
+ source = linux-5.6.patch
sha256sums = SKIP
sha256sums = 48bc8d2270ea8db1e5c0be51012419753b22a106028e153919b37d583c422cc6
sha256sums = e2b146ffbe6b81c6a8c963ee2826aecc3a092497fd9b33c6290751da5706d103
+ sha256sums = 0bc53698eba30a8f635c595f905230d18371c1738903a1da80f9bbca58dd8ec5
pkgname = 8188fu-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index f45ed0d81941..96fc0549d63c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
_pkgname=8188fu
pkgname="$_pkgname-dkms-git"
pkgver=r7.2dd10a1
-pkgrel=1
+pkgrel=2
pkgdesc='Driver for Realtek RTL8188FU USB wireless adapter'
arch=('any')
url='http://www.realtek.com.tw/'
@@ -17,10 +17,12 @@ makedepends=('git')
install="${_pkgname}-dkms.install"
source=("$_pkgname::git+https://github.com/corneal64/Realtek-USB-Wireless-Adapter-Drivers.git"
blacklist-r8188fu.conf
- dkms.conf)
+ dkms.conf
+ linux-5.6.patch)
sha256sums=('SKIP'
'48bc8d2270ea8db1e5c0be51012419753b22a106028e153919b37d583c422cc6'
- 'e2b146ffbe6b81c6a8c963ee2826aecc3a092497fd9b33c6290751da5706d103')
+ 'e2b146ffbe6b81c6a8c963ee2826aecc3a092497fd9b33c6290751da5706d103'
+ '0bc53698eba30a8f635c595f905230d18371c1738903a1da80f9bbca58dd8ec5')
@@ -31,7 +33,13 @@ pkgver() {
prepare() {
cd "$srcdir/$_pkgname/rtl$_pkgname"
-
+ local i;for i in "${source[@]}";do
+ case $i in
+ *.patch)
+ echo "Applying patch ${i}"
+ patch -p1 -i "${srcdir}/${i}"
+ esac
+ done
# Disable power saving (possibly already done below?)
sed -i 's/^CONFIG_POWER_SAVING \= y/CONFIG_POWER_SAVING = n/' Makefile
}
diff --git a/linux-5.6.patch b/linux-5.6.patch
new file mode 100644
index 000000000000..e599fc5d4db4
--- /dev/null
+++ b/linux-5.6.patch
@@ -0,0 +1,85 @@
+diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c
+index 9ecc542..8e0f7dd 100644
+--- a/os_dep/linux/rtw_proc.c
++++ b/os_dep/linux/rtw_proc.c
+@@ -64,7 +64,11 @@ inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_
+ }
+
+ inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
++ const struct proc_ops *fops, void * data)
++#else
+ const struct file_operations *fops, void * data)
++#endif
+ {
+ struct proc_dir_entry *entry;
+
+@@ -165,6 +169,14 @@ static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer,
+ return -EROFS;
+ }
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
++static const struct proc_ops rtw_drv_proc_fops = {
++ .proc_open = rtw_drv_proc_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++ .proc_write = rtw_drv_proc_write,
++#else
+ static const struct file_operations rtw_drv_proc_fops = {
+ .owner = THIS_MODULE,
+ .open = rtw_drv_proc_open,
+@@ -172,6 +184,7 @@ static const struct file_operations rtw_drv_proc_fops = {
+ .llseek = seq_lseek,
+ .release = single_release,
+ .write = rtw_drv_proc_write,
++#endif
+ };
+
+ int rtw_drv_proc_init(void)
+@@ -532,6 +545,14 @@ static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buff
+ return -EROFS;
+ }
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
++static const struct proc_ops rtw_adapter_proc_fops = {
++ .proc_open = rtw_adapter_proc_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++ .proc_write = rtw_adapter_proc_write,
++#else
+ static const struct file_operations rtw_adapter_proc_fops = {
+ .owner = THIS_MODULE,
+ .open = rtw_adapter_proc_open,
+@@ -539,6 +560,7 @@ static const struct file_operations rtw_adapter_proc_fops = {
+ .llseek = seq_lseek,
+ .release = single_release,
+ .write = rtw_adapter_proc_write,
++#endif
+ };
+
+ int proc_get_odm_dbg_comp(struct seq_file *m, void *v)
+@@ -710,6 +732,14 @@ static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer,
+ return -EROFS;
+ }
+
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
++static const struct proc_ops rtw_odm_proc_fops = {
++ .proc_open = rtw_odm_proc_open,
++ .proc_read = seq_read,
++ .proc_lseek = seq_lseek,
++ .proc_release = single_release,
++ .proc_write = rtw_odm_proc_write,
++#else
+ static const struct file_operations rtw_odm_proc_fops = {
+ .owner = THIS_MODULE,
+ .open = rtw_odm_proc_open,
+@@ -717,6 +747,7 @@ static const struct file_operations rtw_odm_proc_fops = {
+ .llseek = seq_lseek,
+ .release = single_release,
+ .write = rtw_odm_proc_write,
++#endif
+ };
+
+ struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev)