diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-25 17:55:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:25:16 -0700 |
| commit | ea2ae17d6443abddc79480dc9f7af8feacabddc4 (patch) | |
| tree | 2d6f48a5e4a40f761b5b510af9aac1fca55004cb /net/ipv6/reassembly.c | |
| parent | badff6d01a8589a1c828b0bf118903ca38627f4e (diff) | |
| download | op-kernel-dev-ea2ae17d6443abddc79480dc9f7af8feacabddc4.zip op-kernel-dev-ea2ae17d6443abddc79480dc9f7af8feacabddc4.tar.gz | |
[SK_BUFF]: Introduce skb_transport_offset()
For the quite common 'skb->h.raw - skb->data' sequence.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/reassembly.c')
| -rw-r--r-- | net/ipv6/reassembly.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 2594f0f..ef29a7b 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -718,7 +718,8 @@ static int ipv6_frag_rcv(struct sk_buff **skbp) icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, skb->h.raw-skb->nh.raw); return -1; } - if (!pskb_may_pull(skb, (skb->h.raw-skb->data)+sizeof(struct frag_hdr))) { + if (!pskb_may_pull(skb, (skb_transport_offset(skb) + + sizeof(struct frag_hdr)))) { IP6_INC_STATS(ip6_dst_idev(skb->dst), IPSTATS_MIB_INHDRERRORS); icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, skb->h.raw-skb->nh.raw); return -1; |
