aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWeiping Pan <wpan@redhat.com>2012-09-28 16:15:30 -0400
committerDavid S. Miller <davem@davemloft.net>2012-10-01 16:43:17 -0400
commitf4b549a5ac818722fc13d789584f41f4e00d78b5 (patch)
tree2ff1b310ec9315e3f66e4bd352ee85cdc7001dae /net
parente4d680c706284ca0413a84bd2a28fda76b360904 (diff)
use skb_end_offset() in skb_try_coalesce()
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/skbuff.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index d607bae075d5..cdc28598f4ef 100644
--- 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,
3483 skb_shinfo(from)->nr_frags > MAX_SKB_FRAGS) 3483 skb_shinfo(from)->nr_frags > MAX_SKB_FRAGS)
3484 return false; 3484 return false;
3485 3485
3486 delta = from->truesize - 3486 delta = from->truesize - SKB_TRUESIZE(skb_end_offset(from));
3487 SKB_TRUESIZE(skb_end_pointer(from) - from->head);
3488 } 3487 }
3489 3488
3490 WARN_ON_ONCE(delta < len); 3489 WARN_ON_ONCE(delta < len);