From: Hauke Mehrtens <hauke@hauke-m.de>
To: backports@vger.kernel.org
Cc: johannes@sipsolutions.net, Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 06/11] backports: skbuff.h: Add skb_mac_offset()
Date: Thu, 3 Oct 2019 17:56:37 +0200 [thread overview]
Message-ID: <20191003155642.14909-7-hauke@hauke-m.de> (raw)
In-Reply-To: <20191003155642.14909-1-hauke@hauke-m.de>
Add skb_mac_offset() from upstream kernel commit ea6da4fd388a
("net/skbuff: Introduce skb_mac_offset()") which is used by the wil6210
driver.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
backport/backport-include/linux/skbuff.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h
index 589d2499..41e5724b 100644
--- a/backport/backport-include/linux/skbuff.h
+++ b/backport/backport-include/linux/skbuff.h
@@ -380,6 +380,14 @@ static inline struct sk_buff *__skb_peek(const struct sk_buff_head *list_)
}
#endif
+#if LINUX_VERSION_IS_LESS(4,11,0)
+#define skb_mac_offset LINUX_BACKPORT(skb_mac_offset)
+static inline int skb_mac_offset(const struct sk_buff *skb)
+{
+ return skb_mac_header(skb) - skb->data;
+}
+#endif
+
#if LINUX_VERSION_IS_LESS(5,4,0)
/**
* skb_frag_off() - Returns the offset of a skb fragment
--
2.20.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next prev parent reply other threads:[~2019-10-03 17:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-03 15:56 [PATCH 00/11] backports: Update to kernel 5.4-rc1 Hauke Mehrtens
2019-10-03 15:56 ` [PATCH 01/11] backports: patches: refresh against " Hauke Mehrtens
2019-10-03 15:56 ` [PATCH 02/11] backports: pci: include linux/pci-aspm.h Hauke Mehrtens
2019-10-03 15:56 ` [PATCH 03/11] backports: build_bug.h: Add static_assert() Hauke Mehrtens
2019-10-03 15:56 ` [PATCH 04/11] backports: platform_device.h: Add devm_platform_ioremap_resource() Hauke Mehrtens
2019-10-03 15:56 ` [PATCH 05/11] backports: skbuf.h: Add skb_frag_off() Hauke Mehrtens
2019-10-03 15:56 ` Hauke Mehrtens [this message]
2019-10-03 15:56 ` [PATCH 07/11] backports: io.h: Add __ioread32_copy() Hauke Mehrtens
2019-10-03 15:56 ` [PATCH 08/11] backports: io: Add writel_relaxed() Hauke Mehrtens
2019-10-03 15:56 ` [PATCH 09/11] backports: dependencies: make ATH9K OWL depend on kernel 3.14 Hauke Mehrtens
2019-10-04 8:55 ` Johannes Berg
2019-10-04 19:34 ` Hauke Mehrtens
2019-10-03 15:56 ` [PATCH 10/11] backports: lib-arc4: Do not build when activated in kernel Hauke Mehrtens
2019-10-03 15:56 ` [PATCH 11/11] backports: ckmake: limit load to number of CPUs Hauke Mehrtens
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=20191003155642.14909-7-hauke@hauke-m.de \
--to=hauke@hauke-m.de \
--cc=backports@vger.kernel.org \
--cc=johannes@sipsolutions.net \
/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 NNTP newsgroup(s).