From: Johannes Berg <johannes@sipsolutions.net>
To: backports@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH 1/3] patches: add spatch to adjust to changed ethtool ringparam API
Date: Fri, 28 Jan 2022 09:52:28 +0100 [thread overview]
Message-ID: <20220128095230.da47bbe7d248.I29005f305b7808de21837d75e992b07444b4eaaa@changeid> (raw)
From: Johannes Berg <johannes.berg@intel.com>
This changed in 5.17-rc1, so add the necessary ifdefs via a
new spatch.
ticket=none
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
patches/0106-ethtool-ringparam.cocci | 45 ++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 patches/0106-ethtool-ringparam.cocci
diff --git a/patches/0106-ethtool-ringparam.cocci b/patches/0106-ethtool-ringparam.cocci
new file mode 100644
index 000000000000..6f78668e37b6
--- /dev/null
+++ b/patches/0106-ethtool-ringparam.cocci
@@ -0,0 +1,45 @@
+@set@
+identifier ops, fn;
+@@
+const struct ethtool_ops ops = {
+ .set_ringparam = fn,
+ ...
+};
+
+@@
+identifier set.fn;
+identifier dev, rp;
+@@
+int fn(struct net_device *dev,
+ struct ethtool_ringparam *rp
++#if LINUX_VERSION_IS_GEQ(5,17,0)
++ , struct kernel_ethtool_ringparam *krp,
++ struct netlink_ext_ack *extack
++#endif
+ )
+{
+...
+}
+
+@get@
+identifier ops, fn;
+@@
+const struct ethtool_ops ops = {
+ .get_ringparam = fn,
+ ...
+};
+
+@@
+identifier get.fn;
+identifier dev, rp;
+@@
+void fn(struct net_device *dev,
+ struct ethtool_ringparam *rp
++#if LINUX_VERSION_IS_GEQ(5,17,0)
++ , struct kernel_ethtool_ringparam *krp,
++ struct netlink_ext_ack *extack
++#endif
+ )
+{
+...
+}
--
2.34.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next reply other threads:[~2022-01-28 8:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 8:52 Johannes Berg [this message]
2022-01-28 8:52 ` [PATCH 2/3] main: add module_exit() Johannes Berg
2022-01-28 8:52 ` [PATCH 3/3] backports: add kthread.h Johannes Berg
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=20220128095230.da47bbe7d248.I29005f305b7808de21837d75e992b07444b4eaaa@changeid \
--to=johannes@sipsolutions.net \
--cc=backports@vger.kernel.org \
--cc=johannes.berg@intel.com \
/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).