From: Shay Bar <shay.bar@celeno.com>
To: hauke@hauke-m.de, mcgrof@kernel.org
Cc: backports@vger.kernel.org, eliav.farber@celeno.com
Subject: [PATCH] backports: Add time64_to_tm and ipv6_mc_check_mld
Date: Tue, 10 Nov 2020 16:03:44 +0200 [thread overview]
Message-ID: <20201110140344.17330-1-shay.bar@celeno.com> (raw)
ipv6_mc_check_mld() was added in kernel version 4.2.0.
The 2nd parameter was removed in kernel version 5.1.0.
time64_to_tm() was added in kernel version 4.8.0.
Signed-off-by: Shay Bar <shay.bar@celeno.com>
---
backport/backport-include/linux/time.h | 8 ++++++++
backport/backport-include/net/addrconf.h | 15 +++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/backport/backport-include/linux/time.h b/backport/backport-include/linux/time.h
index 3191047d..ce8a1b03 100644
--- a/backport/backport-include/linux/time.h
+++ b/backport/backport-include/linux/time.h
@@ -4,4 +4,12 @@
#include <linux/time64.h>
+#if LINUX_VERSION_IS_LESS(4,8,0)
+static inline void time64_to_tm(time64_t totalsecs, int offset,
+ struct tm *result)
+{
+ time_to_tm((time_t)totalsecs, 0, result);
+}
+#endif
+
#endif /* __BACKPORT_LINUX_TIME_H */
diff --git a/backport/backport-include/net/addrconf.h b/backport/backport-include/net/addrconf.h
index f1e8e627..67d44e19 100644
--- a/backport/backport-include/net/addrconf.h
+++ b/backport/backport-include/net/addrconf.h
@@ -22,4 +22,19 @@ static inline bool ipv6_addr_is_solict_mult(const struct in6_addr *addr)
}
#endif /* LINUX_VERSION_IS_LESS(3,9,0) */
+#if LINUX_VERSION_IS_LESS(4,2,0)
+static inline int ipv6_mc_check_mld(struct sk_buff *skb)
+{
+ WARN_ON(1);
+
+ return -1;
+}
+#elif LINUX_VERSION_IS_LESS(5,1,0)
+static inline int backport_ipv6_mc_check_mld(struct sk_buff *skb)
+{
+ return ipv6_mc_check_mld(skb, NULL);
+}
+#define ipv6_mc_check_mld LINUX_BACKPORT(ipv6_mc_check_mld)
+#endif
+
#endif /* _BACKPORT_NET_ADDRCONF_H */
--
2.17.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next reply other threads:[~2020-11-10 14:04 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-10 14:03 Shay Bar [this message]
2020-11-15 13:46 ` [PATCH] backports: Add time64_to_tm and ipv6_mc_check_mld Hauke Mehrtens
2020-11-15 14:07 ` Shay Bar
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=20201110140344.17330-1-shay.bar@celeno.com \
--to=shay.bar@celeno.com \
--cc=backports@vger.kernel.org \
--cc=eliav.farber@celeno.com \
--cc=hauke@hauke-m.de \
--cc=mcgrof@kernel.org \
/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).