---

yaml --- r: 328400 b: refs/heads/master c: f4b549a h: refs/heads/master v: v3
git-mirror · Oct 1, 2012 · af0da2b · af0da2b
1 parent e975254
commit af0da2b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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);