Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753056AbbGETsc (ORCPT ); Sun, 5 Jul 2015 15:48:32 -0400 Received: from smtp.citrix.com ([66.165.176.89]:20860 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752609AbbGETs0 (ORCPT ); Sun, 5 Jul 2015 15:48:26 -0400 X-IronPort-AV: E=Sophos;i="5.15,410,1432598400"; d="scan'208";a="278209518" Date: Sun, 5 Jul 2015 20:48:22 +0100 From: Wei Liu To: Liang Li CC: , , , , Subject: Re: [PATCH] xen-netback: remove duplicated function definition Message-ID: <20150705194822.GA22267@zion.uk.xensource.com> References: <1435951980-16265-1-git-send-email-liang.z.li@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <1435951980-16265-1-git-send-email-liang.z.li@intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1236 Lines: 37 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 Acked-by: Wei Liu 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/