diff options
| author | Weiping Pan <wpan@redhat.com> | 2012-09-28 22:15:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-01 22:43:17 +0200 |
| commit | f4b549a5ac818722fc13d789584f41f4e00d78b5 (patch) | |
| tree | 2ff1b310ec9315e3f66e4bd352ee85cdc7001dae /net/core | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-f4b549a5ac818722fc13d789584f41f4e00d78b5.tar.xz linux-f4b549a5ac818722fc13d789584f41f4e00d78b5.zip | |
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/core')
| -rw-r--r-- | net/core/skbuff.c | 3 |
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, 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); |