On 3/12/20 4:59 PM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@xxxxxxxxx>
>
> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
> ---
> backport/backport-include/linux/skbuff.h | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h
> index 8af34146432e..3b63ce76a0b5 100644
> --- a/backport/backport-include/linux/skbuff.h
> +++ b/backport/backport-include/linux/skbuff.h
> @@ -380,6 +380,11 @@ static inline struct sk_buff *__skb_peek(const struct sk_buff_head *list_)
> {
> return list_->next;
> }
> +
> +static inline void skb_mark_not_on_list(struct sk_buff *skb)
> +{
> + skb->next = NULL;
> +}
> #endif
skb_mark_not_on_list() was backported to kernel 4.19.10 and this
definition conflicts.
I added this around it:
#if !LINUX_VERSION_IN_RANGE(4,19,10, 4,20,0)
Hauke
--
To unsubscribe from this list: send the line "unsubscribe backports" in
