commit b0061ce49c83657563b64ffcf1ec137110230d93
author Arnaldo Carvalho de Melo <acme@redhat.com> Wed Apr 25 18:02:22 2007 -0700
committer David S. Miller <davem@sunset.davemloft.net> Wed Apr 25 22:25:27 2007 -0700
tree be6788071fdbc53261ee395f596705e1418461d1
parent aa8223c7bb0b05183e1737881ed21827aa5b9e73

[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>

net/ipv4/xfrm4_mode_tunnel.c

diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index edba756..521e52f 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 @@
 	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 @@
 	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);
 	}