diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-10 20:50:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 22:24:59 -0700 |
| commit | d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc (patch) | |
| tree | 3b9073cecfbb3b6a1e25ab2b5dd2a22a43aef238 /net/ipv6/ip6_input.c | |
| parent | bbe735e4247dba32568a305553b010081c8dea99 (diff) | |
| download | kernel_goldelico_gta04-d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc.zip kernel_goldelico_gta04-d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc.tar.gz kernel_goldelico_gta04-d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc.tar.bz2 | |
[SK_BUFF]: Introduce skb_network_header()
For the places where we need a pointer to the network header, it is still legal
to touch skb->nh.raw directly if just adding to, subtracting from or setting it
to another layer header.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_input.c')
| -rw-r--r-- | net/ipv6/ip6_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index 61e7a6c..aecc74d 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -163,7 +163,7 @@ resubmit: if (!pskb_pull(skb, skb->h.raw - skb->data)) goto discard; nhoff = IP6CB(skb)->nhoff; - nexthdr = skb->nh.raw[nhoff]; + nexthdr = skb_network_header(skb)[nhoff]; raw_sk = sk_head(&raw_v6_htable[nexthdr & (MAX_INET_PROTOS - 1)]); if (raw_sk && !ipv6_raw_deliver(skb, nexthdr)) @@ -181,7 +181,7 @@ resubmit: indefinitely. */ nf_reset(skb); - skb_postpull_rcsum(skb, skb->nh.raw, + skb_postpull_rcsum(skb, skb_network_header(skb), skb->h.raw - skb->nh.raw); hdr = skb->nh.ipv6h; if (ipv6_addr_is_multicast(&hdr->daddr) && |