From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 2/4] xen: netback: handle NET_SKBUFF_DATA_USES_OFFSET correctly Date: Fri, 11 Jun 2010 15:19:09 +0100 Message-ID: <1276265951-24490-2-git-send-email-ian.campbell@citrix.com> References: <1276265928.19091.3469.camel@zakaz.uk.xensource.com> Return-path: In-Reply-To: <1276265928.19091.3469.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: jeremy@goop.org Cc: Steven.Smith@eu.citrix.com, xen-devel@lists.xensource.com, Ian Campbell , JBeulich@novell.com List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell Cc: Jan Beulich --- drivers/xen/netback/netback.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/xen/netback/netback.c b/drivers/xen/netback/netback.c index 9e4793f..8cd7875 100644 --- a/drivers/xen/netback/netback.c +++ b/drivers/xen/netback/netback.c @@ -218,7 +218,11 @@ static struct sk_buff *netbk_copy_skb(struct sk_buff *skb) len -= copy; } +#ifdef NET_SKBUFF_DATA_USES_OFFSET + offset = 0; +#else offset = nskb->data - skb->data; +#endif nskb->transport_header = skb->transport_header + offset; nskb->network_header = skb->network_header + offset; -- 1.5.6.5