a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
111 lines
3.4 KiB
Diff
111 lines
3.4 KiB
Diff
From e0ed05200e6e4b86e26e092dc1f16fc8fc1e2b67 Mon Sep 17 00:00:00 2001
|
|
From: Christian Stewart <christian@paral.in>
|
|
Date: Tue, 8 Sep 2020 23:08:39 -0700
|
|
Subject: [PATCH] rtw_proc: convert file_operations to proc_ops for 5.6.x
|
|
compat
|
|
|
|
Signed-off-by: Christian Stewart <christian@paral.in>
|
|
[Fix < 5.6.x compile - missing semicolon]
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
os_dep/linux/rtw_proc.c | 40 ++++++++++++++++++++++++++++++++++++++--
|
|
1 file changed, 38 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c
|
|
index 048080a..6295f66 100644
|
|
--- a/os_dep/linux/rtw_proc.c
|
|
+++ b/os_dep/linux/rtw_proc.c
|
|
@@ -65,9 +65,15 @@ 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,
|
|
- const struct file_operations *fops, void * data)
|
|
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0))
|
|
+ const struct file_operations *fops,
|
|
+ #else
|
|
+ const struct proc_ops *fops,
|
|
+ #endif
|
|
+ void * data
|
|
+ )
|
|
{
|
|
- struct proc_dir_entry *entry;
|
|
+ struct proc_dir_entry *entry;
|
|
|
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26))
|
|
entry = proc_create_data(name, S_IFREG|S_IRUGO|S_IWUGO, parent, fops, data);
|
|
@@ -167,6 +173,7 @@ 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 file_operations rtw_drv_proc_fops = {
|
|
.owner = THIS_MODULE,
|
|
.open = rtw_drv_proc_open,
|
|
@@ -175,6 +182,15 @@ static const struct file_operations rtw_drv_proc_fops = {
|
|
.release = single_release,
|
|
.write = rtw_drv_proc_write,
|
|
};
|
|
+#else
|
|
+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 = seq_release,
|
|
+ .proc_write = rtw_drv_proc_write,
|
|
+};
|
|
+#endif
|
|
|
|
int rtw_drv_proc_init(void)
|
|
{
|
|
@@ -776,6 +792,7 @@ 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 file_operations rtw_adapter_proc_fops = {
|
|
.owner = THIS_MODULE,
|
|
.open = rtw_adapter_proc_open,
|
|
@@ -784,6 +801,15 @@ static const struct file_operations rtw_adapter_proc_fops = {
|
|
.release = single_release,
|
|
.write = rtw_adapter_proc_write,
|
|
};
|
|
+#else
|
|
+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,
|
|
+};
|
|
+#endif
|
|
|
|
int proc_get_odm_dbg_comp(struct seq_file *m, void *v)
|
|
{
|
|
@@ -1030,6 +1056,7 @@ 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 file_operations rtw_odm_proc_fops = {
|
|
.owner = THIS_MODULE,
|
|
.open = rtw_odm_proc_open,
|
|
@@ -1038,6 +1065,15 @@ static const struct file_operations rtw_odm_proc_fops = {
|
|
.release = single_release,
|
|
.write = rtw_odm_proc_write,
|
|
};
|
|
+#else
|
|
+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,
|
|
+};
|
|
+#endif
|
|
|
|
struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev)
|
|
{
|
|
--
|
|
2.29.0
|
|
|