2015-07-03 07:42:16

by Li, Liang Z

[permalink] [raw]
Subject: [PATCH] xen-netback: remove duplicated function definition

There are two duplicated xenvif_zerocopy_callback() definitions.
Remove one of them.

Signed-off-by: Liang Li <[email protected]>
---
drivers/net/xen-netback/common.h | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
index 8a495b3..c6cb85a 100644
--- a/drivers/net/xen-netback/common.h
+++ b/drivers/net/xen-netback/common.h
@@ -325,9 +325,6 @@ static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue)
queue->pending_prod + queue->pending_cons;
}

-/* Callback from stack when TX packet can be released */
-void xenvif_zerocopy_callback(struct ubuf_info *ubuf, bool zerocopy_success);
-
irqreturn_t xenvif_interrupt(int irq, void *dev_id);

extern bool separate_tx_rx_irq;
--
1.9.1


2015-07-03 16:54:59

by David Miller

[permalink] [raw]
Subject: Re: [PATCH] xen-netback: remove duplicated function definition

From: Liang Li <[email protected]>
Date: Sat, 4 Jul 2015 03:33:00 +0800

> There are two duplicated xenvif_zerocopy_callback() definitions.
> Remove one of them.
>
> Signed-off-by: Liang Li <[email protected]>

You really need to fix the date on your computer.

If your date is in the future, as your's is, then your patch appears
out-of-order in the patchwork patch queue since it is ordered by the
Date: field in the email.

2015-07-05 09:06:13

by Li, Liang Z

[permalink] [raw]
Subject: RE: [PATCH] xen-netback: remove duplicated function definition

> Cc: [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]
> Subject: Re: [PATCH] xen-netback: remove duplicated function definition
>
> From: Liang Li <[email protected]>
> Date: Sat, 4 Jul 2015 03:33:00 +0800
>
> > There are two duplicated xenvif_zerocopy_callback() definitions.
> > Remove one of them.
> >
> > Signed-off-by: Liang Li <[email protected]>
>
> You really need to fix the date on your computer.
>
> If your date is in the future, as your's is, then your patch appears out-of-
> order in the patchwork patch queue since it is ordered by the
> Date: field in the email.

OK. Thanks for your reminding.

2015-07-05 19:48:32

by Wei Liu

[permalink] [raw]
Subject: Re: [PATCH] xen-netback: remove duplicated function definition

On Sat, Jul 04, 2015 at 03:33:00AM +0800, Liang Li wrote:
> There are two duplicated xenvif_zerocopy_callback() definitions.
> Remove one of them.
>
> Signed-off-by: Liang Li <[email protected]>

Acked-by: Wei Liu <[email protected]>

Please fix the time of your computer and resend.

Wei.

> ---
> drivers/net/xen-netback/common.h | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h
> index 8a495b3..c6cb85a 100644
> --- a/drivers/net/xen-netback/common.h
> +++ b/drivers/net/xen-netback/common.h
> @@ -325,9 +325,6 @@ static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue)
> queue->pending_prod + queue->pending_cons;
> }
>
> -/* Callback from stack when TX packet can be released */
> -void xenvif_zerocopy_callback(struct ubuf_info *ubuf, bool zerocopy_success);
> -
> irqreturn_t xenvif_interrupt(int irq, void *dev_id);
>
> extern bool separate_tx_rx_irq;
> --
> 1.9.1