From af0da2bfdd31815f540ed4245b86bc0986f83180 Mon Sep 17 00:00:00 2001
From: Weiping Pan <wpan@redhat.com>
Date: Fri, 28 Sep 2012 20:15:30 +0000
Subject: [PATCH] --- yaml --- r: 328400 b: refs/heads/master c:
 f4b549a5ac818722fc13d789584f41f4e00d78b5 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 74560c26f302..a72480eca4f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4d680c706284ca0413a84bd2a28fda76b360904
+refs/heads/master: f4b549a5ac818722fc13d789584f41f4e00d78b5
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index d607bae075d5..cdc28598f4ef 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -3483,8 +3483,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
 		    skb_shinfo(from)->nr_frags > MAX_SKB_FRAGS)
 			return false;
 
-		delta = from->truesize -
-			SKB_TRUESIZE(skb_end_pointer(from) - from->head);
+		delta = from->truesize - SKB_TRUESIZE(skb_end_offset(from));
 	}
 
 	WARN_ON_ONCE(delta < len);