diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-21 01:47:35 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:25:10 -0400 |
commit | eddc9ec53be2ecdbf4efe0efd4a83052594f0ac0 (patch) | |
tree | 4a38ab4dbd9d61fdf5a5ea6ed61463e0b9e33ba7 /net/ipv6/sit.c | |
parent | e023dd643798c4f06c16466af90b4d250e4b8bd7 (diff) |
[SK_BUFF]: Introduce ip_hdr(), remove skb->nh.iph
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
-rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 62883d41b6c3..e33ac3c3a9ca 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -377,7 +377,7 @@ static int ipip6_rcv(struct sk_buff *skb) | |||
377 | if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) | 377 | if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) |
378 | goto out; | 378 | goto out; |
379 | 379 | ||
380 | iph = skb->nh.iph; | 380 | iph = ip_hdr(skb); |
381 | 381 | ||
382 | read_lock(&ipip6_lock); | 382 | read_lock(&ipip6_lock); |
383 | if ((tunnel = ipip6_tunnel_lookup(iph->saddr, iph->daddr)) != NULL) { | 383 | if ((tunnel = ipip6_tunnel_lookup(iph->saddr, iph->daddr)) != NULL) { |
@@ -565,7 +565,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) | |||
565 | * Push down and install the IPIP header. | 565 | * Push down and install the IPIP header. |
566 | */ | 566 | */ |
567 | 567 | ||
568 | iph = skb->nh.iph; | 568 | iph = ip_hdr(skb); |
569 | iph->version = 4; | 569 | iph->version = 4; |
570 | iph->ihl = sizeof(struct iphdr)>>2; | 570 | iph->ihl = sizeof(struct iphdr)>>2; |
571 | if (mtu > IPV6_MIN_MTU) | 571 | if (mtu > IPV6_MIN_MTU) |