| Message ID | 20211209162516.25022-2-sven.dembianny@bshg.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | backports: fix build on recent v4.14 kernels | expand |
On 12/9/21 5:25 PM, Dembianny, Sven (GDE-EDSO) wrote: > From: "Dembianny, Sven" <sven.dembianny@bshg.com> > Please add a Signed-off-by line to this patch. > --- > backport/backport-include/linux/skbuff.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > 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; > -- To unsubscribe from this list: send the line "unsubscribe backports" in
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;
From: "Dembianny, Sven" <sven.dembianny@bshg.com> --- backport/backport-include/linux/skbuff.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)