From: Jan Kiszka <jan.kiszka@siemens.com>
To: Xenomai <xenomai@lists.linux.dev>
Cc: Florian Bezdeka <florian.bezdeka@siemens.com>
Subject: [PATCH v4] cobalt: Adjust dev_addr_set wrapper to 5.10 backport
Date: Tue, 29 Aug 2023 17:37:14 +0200 [thread overview]
Message-ID: <ca31f19f-af44-4e5a-86ec-a3233cec9889@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
5.10.188 gained this helper meanwhile as well.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
v4 is actually what was in next before as v1 but was never posted as
such. v2 and v3 tried to address kernels < 5.10 as well, but that is
irrelevant for master (dovetail only).
kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
index ea7ed3ad56..c86ab16029 100644
--- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
+++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
@@ -54,7 +54,9 @@
#define close_fd(__ufd) __close_fd(current->files, __ufd)
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,15,0) && \
+ (LINUX_VERSION_CODE >= KERNEL_VERSION(5,11,0) || \
+ LINUX_VERSION_CODE < KERNEL_VERSION(5,10,188))
#define dev_addr_set(dev, addr) memcpy((dev)->dev_addr, addr, MAX_ADDR_LEN)
#define eth_hw_addr_set(dev, addr) memcpy((dev)->dev_addr, addr, ETH_ALEN)
#endif
--
2.35.3
reply other threads:[~2023-08-29 15:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ca31f19f-af44-4e5a-86ec-a3233cec9889@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=florian.bezdeka@siemens.com \
--cc=xenomai@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).