Subject: Re: linux-next: manual merge of the bpf-next tree with the net-next tree

From: Lorenzo Bianconi <[email-masked]>
Date: Tue, 21 Jul 2020 10:53:55 +0200

[...]

> diff --cc include/net/xdp.h
> index d3005bef812f,5be0d4d65b94..000000000000
> --- a/include/net/xdp.h
> +++ b/include/net/xdp.h
> @@@ -104,15 -98,12 +104,21 @@@ struct xdp_frame 
>   	struct net_device *dev_rx; /* used by cpumap */
>   };
>   
>  +static inline struct skb_shared_info *
>  +xdp_get_shared_info_from_frame(struct xdp_frame *frame)
>  +{
>  +	void *data_hard_start = frame->data - frame->headroom - sizeof(*frame);
>  +
>  +	return (struct skb_shared_info *)(data_hard_start + frame->frame_sz -
>  +				SKB_DATA_ALIGN(sizeof(struct skb_shared_info)));
>  +}
>  +
> + struct xdp_cpumap_stats {
> + 	unsigned int redirect;
> + 	unsigned int pass;
> + 	unsigned int drop;
> + };

Hi Stephen,

the fix is correct, thanks and sorry for the noise. I will point out possible
conflicts next time.

Regards,
Lorenzo

> + 
>   /* Clear kernel pointers in xdp_frame */
>   static inline void xdp_scrub_frame(struct xdp_frame *frame)
>   {