2015-07-06 00:43:26

by Li, Liang Z

Subject: [RESEND] 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-08 21:13:31

by David Miller

Subject: Re: [RESEND] xen-netback: remove duplicated function definition

From: Liang Li <[email protected]>
Date: Mon, 6 Jul 2015 08:42:56 +0800

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

Applied, thanks.