Re: [PATCH][net-next] xdp: remove redundant variable 'headroom'

[BjÃrn TÃpel]

On 2018-08-30 16:27, Colin King wrote:
> From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
>
> Variable 'headroom' is being assigned but is never used hence it is
> redundant and can be removed.
>
> Cleans up clang warning:
> variable âheadroomâ set but not used [-Wunused-but-set-variable]
>
> Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> ---
>   net/core/xdp.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/net/core/xdp.c b/net/core/xdp.c
> index 654dbb19707e..4b2b194f4f1f 100644
> --- a/net/core/xdp.c
> +++ b/net/core/xdp.c
> @@ -412,7 +412,7 @@ EXPORT_SYMBOL_GPL(xdp_attachment_setup);
>   
>   struct xdp_frame *xdp_convert_zc_to_xdp_frame(struct xdp_buff *xdp)
>   {
> -	unsigned int metasize, headroom, totsize;
> +	unsigned int metasize, totsize;
>   	void *addr, *data_to_copy;
>   	struct xdp_frame *xdpf;
>   	struct page *page;
> @@ -420,7 +420,6 @@ struct xdp_frame *xdp_convert_zc_to_xdp_frame(struct xdp_buff *xdp)
>   	/* Clone into a MEM_TYPE_PAGE_ORDER0 xdp_frame. */
>   	metasize = xdp_data_meta_unsupported(xdp) ? 0 :
>   		   xdp->data - xdp->data_meta;
> -	headroom = xdp->data - xdp->data_hard_start;
>   	totsize = xdp->data_end - xdp->data + metasize;
>   
>   	if (sizeof(*xdpf) + totsize > PAGE_SIZE)

This should go via bpf-next. Thanks for the fix!

Acked-by: BjÃrn TÃpel <bjorn.topel@xxxxxxxxx>