* [PATCH][net-next] xdp: remove redundant variable 'headroom'
@ 2018-08-30 14:27 Colin King
2018-08-30 14:37 ` Björn Töpel
0 siblings, 1 reply; 3+ messages in thread
From: Colin King @ 2018-08-30 14:27 UTC (permalink / raw)
To: David S . Miller, Björn Töpel, Jesper Dangaard Brouer,
netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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@canonical.com>
---
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)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][net-next] xdp: remove redundant variable 'headroom'
2018-08-30 14:27 [PATCH][net-next] xdp: remove redundant variable 'headroom' Colin King
@ 2018-08-30 14:37 ` Björn Töpel
2018-08-31 2:50 ` Alexei Starovoitov
0 siblings, 1 reply; 3+ messages in thread
From: Björn Töpel @ 2018-08-30 14:37 UTC (permalink / raw)
To: Colin King, David S . Miller, Jesper Dangaard Brouer, netdev,
Alexei Starovoitov, daniel@iogearbox.net
Cc: kernel-janitors, linux-kernel
On 2018-08-30 16:27, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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@canonical.com>
> ---
> 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@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][net-next] xdp: remove redundant variable 'headroom'
2018-08-30 14:37 ` Björn Töpel
@ 2018-08-31 2:50 ` Alexei Starovoitov
0 siblings, 0 replies; 3+ messages in thread
From: Alexei Starovoitov @ 2018-08-31 2:50 UTC (permalink / raw)
To: Björn Töpel
Cc: Colin King, David S . Miller, Jesper Dangaard Brouer, netdev,
Alexei Starovoitov, daniel@iogearbox.net, kernel-janitors,
linux-kernel
On Thu, Aug 30, 2018 at 04:37:50PM +0200, Björn Töpel wrote:
> On 2018-08-30 16:27, Colin King wrote:
> > From: Colin Ian King <colin.king@canonical.com>
> >
> > 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@canonical.com>
> > ---
> > 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@intel.com>
Applied, Thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-08-31 6:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-30 14:27 [PATCH][net-next] xdp: remove redundant variable 'headroom' Colin King
2018-08-30 14:37 ` Björn Töpel
2018-08-31 2:50 ` Alexei Starovoitov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).