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/xfrm6_mode_transport.c | |
| parent | bbe735e4247dba32568a305553b010081c8dea99 (diff) | |
| download | linux-stable-d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc.tar.gz linux-stable-d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc.tar.bz2 linux-stable-d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc.zip | |
[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/xfrm6_mode_transport.c')
| -rw-r--r-- | net/ipv6/xfrm6_mode_transport.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/xfrm6_mode_transport.c b/net/ipv6/xfrm6_mode_transport.c index 3a4b39b12bad..ace0bbf4f25d 100644 --- a/net/ipv6/xfrm6_mode_transport.c +++ b/net/ipv6/xfrm6_mode_transport.c @@ -53,8 +53,10 @@ static int xfrm6_transport_input(struct xfrm_state *x, struct sk_buff *skb) { int ihl = skb->data - skb->h.raw; - if (skb->h.raw != skb->nh.raw) - skb->nh.raw = memmove(skb->h.raw, skb->nh.raw, ihl); + if (skb->h.raw != skb->nh.raw) { + memmove(skb->h.raw, skb_network_header(skb), ihl); + skb->nh.raw = skb->h.raw; + } skb->nh.ipv6h->payload_len = htons(skb->len + ihl - sizeof(struct ipv6hdr)); skb->h.raw = skb->data; |