diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-10 23:50:43 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:59 -0400 |
commit | d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc (patch) | |
tree | 3b9073cecfbb3b6a1e25ab2b5dd2a22a43aef238 /net/ipv6/esp6.c | |
parent | bbe735e4247dba32568a305553b010081c8dea99 (diff) |
[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/esp6.c')
-rw-r--r-- | net/ipv6/esp6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 363e63ffecca..6e6b57ac8013 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
@@ -92,8 +92,8 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb) | |||
92 | top_iph = (struct ipv6hdr *)__skb_push(skb, hdr_len); | 92 | top_iph = (struct ipv6hdr *)__skb_push(skb, hdr_len); |
93 | esph = (struct ipv6_esp_hdr *)skb->h.raw; | 93 | esph = (struct ipv6_esp_hdr *)skb->h.raw; |
94 | top_iph->payload_len = htons(skb->len + alen - sizeof(*top_iph)); | 94 | top_iph->payload_len = htons(skb->len + alen - sizeof(*top_iph)); |
95 | *(u8*)(trailer->tail - 1) = *skb->nh.raw; | 95 | *(u8 *)(trailer->tail - 1) = *skb_network_header(skb); |
96 | *skb->nh.raw = IPPROTO_ESP; | 96 | *skb_network_header(skb) = IPPROTO_ESP; |
97 | 97 | ||
98 | esph->spi = x->id.spi; | 98 | esph->spi = x->id.spi; |
99 | esph->seq_no = htonl(++x->replay.oseq); | 99 | esph->seq_no = htonl(++x->replay.oseq); |