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/ipv4/xfrm4_mode_beet.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/ipv4/xfrm4_mode_beet.c')
-rw-r--r-- | net/ipv4/xfrm4_mode_beet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/xfrm4_mode_beet.c b/net/ipv4/xfrm4_mode_beet.c index eaaf3565f3b2..505fca034a1f 100644 --- a/net/ipv4/xfrm4_mode_beet.c +++ b/net/ipv4/xfrm4_mode_beet.c | |||
@@ -98,7 +98,7 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb) | |||
98 | } | 98 | } |
99 | 99 | ||
100 | skb->nh.raw = skb->data + (phlen - sizeof(*iph)); | 100 | skb->nh.raw = skb->data + (phlen - sizeof(*iph)); |
101 | memmove(skb->nh.raw, iph, sizeof(*iph)); | 101 | memmove(skb_network_header(skb), iph, sizeof(*iph)); |
102 | skb->h.raw = skb->data + (phlen + optlen); | 102 | skb->h.raw = skb->data + (phlen + optlen); |
103 | skb->data = skb->h.raw; | 103 | skb->data = skb->h.raw; |
104 | 104 | ||
@@ -112,7 +112,7 @@ static int xfrm4_beet_input(struct xfrm_state *x, struct sk_buff *skb) | |||
112 | else | 112 | else |
113 | iph->protocol = protocol; | 113 | iph->protocol = protocol; |
114 | iph->check = 0; | 114 | iph->check = 0; |
115 | iph->check = ip_fast_csum(skb->nh.raw, iph->ihl); | 115 | iph->check = ip_fast_csum(skb_network_header(skb), iph->ihl); |
116 | err = 0; | 116 | err = 0; |
117 | out: | 117 | out: |
118 | return err; | 118 | return err; |