aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/xfrm4_mode_tunnel.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-25 18:02:22 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:25:27 -0700
commitb0061ce49c83657563b64ffcf1ec137110230d93 (patch)
treebe6788071fdbc53261ee395f596705e1418461d1 /net/ipv4/xfrm4_mode_tunnel.c
parent[SK_BUFF]: Introduce tcp_hdr(), remove skb->h.th (diff)
downloadlinux-dev-b0061ce49c83657563b64ffcf1ec137110230d93.tar.xz
linux-dev-b0061ce49c83657563b64ffcf1ec137110230d93.zip
[SK_BUFF]: Introduce ipip_hdr(), remove skb->h.ipiph
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_tunnel.c')
-rw-r--r--net/ipv4/xfrm4_mode_tunnel.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index edba75610a46..521e52f055c1 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -17,7 +17,7 @@
static inline void ipip_ecn_decapsulate(struct sk_buff *skb)
{
struct iphdr *outer_iph = ip_hdr(skb);
- struct iphdr *inner_iph = skb->h.ipiph;
+ struct iphdr *inner_iph = ipip_hdr(skb);
if (INET_ECN_is_ce(outer_iph->tos))
IP_ECN_set_ce(inner_iph);
@@ -47,7 +47,7 @@ static int xfrm4_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
int flags;
iph = ip_hdr(skb);
- skb->h.ipiph = iph;
+ skb->h.raw = skb->nh.raw;
skb_push(skb, x->props.header_len);
skb_reset_network_header(skb);
@@ -116,7 +116,7 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
iph = ip_hdr(skb);
if (iph->protocol == IPPROTO_IPIP) {
if (x->props.flags & XFRM_STATE_DECAP_DSCP)
- ipv4_copy_dscp(iph, skb->h.ipiph);
+ ipv4_copy_dscp(iph, ipip_hdr(skb));
if (!(x->props.flags & XFRM_STATE_NOECN))
ipip_ecn_decapsulate(skb);
}