diff mbox series

[1/1] backports: fix build on recent v4.14 kernels

Message ID 20211213103700.14935-1-sven.dembianny@bshg.com (mailing list archive)
State New, archived
Headers show
Series [1/1] backports: fix build on recent v4.14 kernels | expand

Commit Message

Dembianny, Sven (GDE-EDSO) Dec. 13, 2021, 10:37 a.m. UTC 
Signed-off-by: Sven Dembianny <sven.dembianny@bshg.com>
---
 backport/backport-include/linux/skbuff.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Hauke Mehrtens Dec. 14, 2021, 10:56 p.m. UTC | #1 
On 12/13/21 11:37 AM, Dembianny, Sven (GDE-EDSO) wrote:
> Signed-off-by: Sven Dembianny <sven.dembianny@bshg.com>
> ---

Thank you for your patch, I added it to master and the 5.10 branch.

Hauke
--
To unsubscribe from this list: send the line "unsubscribe backports" in
diff mbox series

Patch

diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h
index 1fd25fcd..c5015e9d 100644
--- a/backport/backport-include/linux/skbuff.h
+++ b/backport/backport-include/linux/skbuff.h
@@ -62,7 +62,8 @@  static inline struct sk_buff *__skb_peek(const struct sk_buff_head *list_)
 	return list_->next;
 }
 
-#if !LINUX_VERSION_IN_RANGE(4,19,10, 4,20,0)
+#if !LINUX_VERSION_IN_RANGE(4,19,10, 4,20,0) && \
+    !LINUX_VERSION_IN_RANGE(4,14,217, 4,15,0)
 static inline void skb_mark_not_on_list(struct sk_buff *skb)
 {
 	skb->next = NULL;