From 3b00e847c6fbb36773bb077f0872c8550254e86d Mon Sep 17 00:00:00 2001 From: Simon Graham Date: Thu, 24 May 2012 06:26:07 +0000 Subject: [PATCH] --- yaml --- r: 309482 b: refs/heads/master c: e26b203ede31fffd52571a5ba607a26c79dc5c0d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/xen-netback/netback.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 82eeb6039671..de07bcf10183 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4bd8ad9bb311e8536f726f7a633620ccd358cde +refs/heads/master: e26b203ede31fffd52571a5ba607a26c79dc5c0d diff --git a/trunk/drivers/net/xen-netback/netback.c b/trunk/drivers/net/xen-netback/netback.c index 2596401308a8..f4a6fcaeffb1 100644 --- a/trunk/drivers/net/xen-netback/netback.c +++ b/trunk/drivers/net/xen-netback/netback.c @@ -325,8 +325,7 @@ unsigned int xen_netbk_count_skb_slots(struct xenvif *vif, struct sk_buff *skb) unsigned int count; int i, copy_off; - count = DIV_ROUND_UP( - offset_in_page(skb->data)+skb_headlen(skb), PAGE_SIZE); + count = DIV_ROUND_UP(skb_headlen(skb), PAGE_SIZE); copy_off = skb_headlen(skb) % PAGE_SIZE;