use skb_end_offset() in skb_try_coalesce()
authorWeiping Pan <wpan@redhat.com>
Fri, 28 Sep 2012 20:15:30 +0000 (20:15 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Oct 2012 20:43:17 +0000 (16:43 -0400)
Commit ec47ea824774(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>
net/core/skbuff.c

index d607bae075d5cad5ef78e4e35e23a6c8bcfd3084..cdc28598f4efadb83b79a006a71ea676b508a655 100644 (file)
@@ -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);