enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: remove 5.6.y support in wifi patch

Browse Source 
They were integrated upstream and breaking compilation on 5.4.y

Signed-off-by: Igor Pecovnik <igor.pecovnik@gmail.com>
This commit is contained in:
Igor Pecovnik 2020-04-08 13:12:06 +02:00
parent b9a572832a
commit 49a6c4a4af
No known key found for this signature in database
GPG Key ID: 93D6889F9F0E78D5
2 changed files with 0 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/compilation-prepare.sh
View File

@ -388,9 +388,6 @@ compilation_prepare()
sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl88x2bu\/Kconfig"' \
$SRC/cache/sources/${LINUXSOURCEDIR}/drivers/net/wireless/Kconfig
# kernel 5.6 ->
process_patch_file "${SRC}/patch/misc/wireless-rtl88x2bu.patch" "applying"
fi

148
patch/misc/wireless-rtl88x2bu.patch
View File

@ -1,148 +0,0 @@
--- a/drivers/net/wireless/rtl88x2bu/os_dep/linux/rtw_proc.c
+++ b/drivers/net/wireless/rtl88x2bu/os_dep/linux/rtw_proc.c
@@ -61,8 +61,14 @@
return entry;
}
-inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent,
- const struct file_operations *fops, void * data)
+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,
+#else
+ const struct file_operations *fops,
+#endif
+ void * data)
{
struct proc_dir_entry *entry;
@@ -230,6 +236,15 @@
return -EROFS;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops rtw_drv_proc_seq_fops = {
+ .proc_open = rtw_drv_proc_open,
+ .proc_read = seq_read,
+ .proc_lseek = seq_lseek,
+ .proc_release = seq_release,
+ .proc_write = rtw_drv_proc_write,
+};
+#else
static const struct file_operations rtw_drv_proc_seq_fops = {
.owner = THIS_MODULE,
.open = rtw_drv_proc_open,
@@ -238,7 +253,17 @@
.release = seq_release,
.write = rtw_drv_proc_write,
};
-
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops rtw_drv_proc_sseq_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_sseq_fops = {
.owner = THIS_MODULE,
.open = rtw_drv_proc_open,
@@ -247,6 +272,7 @@
.release = single_release,
.write = rtw_drv_proc_write,
};
+#endif
int rtw_drv_proc_init(void)
{
@@ -3499,6 +3525,15 @@
return -EROFS;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops rtw_adapter_proc_seq_fops = {
+ .proc_open = rtw_adapter_proc_open,
+ .proc_read = seq_read,
+ .proc_lseek = seq_lseek,
+ .proc_release = seq_release,
+ .proc_write = rtw_adapter_proc_write,
+};
+#else
static const struct file_operations rtw_adapter_proc_seq_fops = {
.owner = THIS_MODULE,
.open = rtw_adapter_proc_open,
@@ -3507,7 +3542,17 @@
.release = seq_release,
.write = rtw_adapter_proc_write,
};
-
+#endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops rtw_adapter_proc_sseq_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_sseq_fops = {
.owner = THIS_MODULE,
.open = rtw_adapter_proc_open,
@@ -3516,6 +3561,7 @@
.release = single_release,
.write = rtw_adapter_proc_write,
};
+#endif
int proc_get_odm_adaptivity(struct seq_file *m, void *v)
{
@@ -3671,6 +3717,15 @@
return -EROFS;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops rtw_odm_proc_seq_fops = {
+ .proc_open = rtw_odm_proc_open,
+ .proc_read = seq_read,
+ .proc_lseek = seq_lseek,
+ .proc_release = seq_release,
+ .proc_write = rtw_odm_proc_write,
+};
+#else
static const struct file_operations rtw_odm_proc_seq_fops = {
.owner = THIS_MODULE,
.open = rtw_odm_proc_open,
@@ -3679,7 +3734,16 @@
.release = seq_release,
.write = rtw_odm_proc_write,
};
-
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+static const struct proc_ops rtw_odm_proc_sseq_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_sseq_fops = {
.owner = THIS_MODULE,
.open = rtw_odm_proc_open,
@@ -3688,6 +3752,7 @@
.release = single_release,
.write = rtw_odm_proc_write,
};
+#endif
struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev)
{