use skb_end_offset() in skb_try_coalesce()

Weiping Pan · davem330 · commit f4b549a5ac81 · 2012-10-01T16:43:17.000-04:00
Commit ec47ea8(skb: Add inline helper for getting the skb end offset from head) introduces this helper function, skb_end_offset(), we should make use of it. Signed-off-by: Weiping Pan <wpan@redhat.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/skbuff.c b/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);

Original file line number	Diff line number	Diff line change
`@@ -3483,8 +3483,7 @@ bool skb_try_coalesce(struct sk_buff to, struct sk_buff from,`
`3483`	`3483`	`skb_shinfo(from)->nr_frags > MAX_SKB_FRAGS)`
`3484`	`3484`	`return false;`
`3485`	`3485`
`3486`		`- delta = from->truesize -`
`3487`		`- SKB_TRUESIZE(skb_end_pointer(from) - from->head);`
	`3486`	`+ delta = from->truesize - SKB_TRUESIZE(skb_end_offset(from));`
`3488`	`3487`	`}`
`3489`	`3488`
`3490`	`3489`	`WARN_ON_ONCE(delta < len);`