[SK_BUFF]: Some more simple skb_reset_network_header conversions

[net-next-2.6.git] / net / ipv4 / ipmr.c

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 05c82ca45aaffd860dbba2d9900d514a07d09545..45435f0a5d6c3404abac587fa5553e7b1c5618a4 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1454,7 +1454,7 @@ int pim_rcv_v1(struct sk_buff * skb)
 
        skb->mac.raw = skb->nh.raw;
        skb_pull(skb, (u8*)encap - skb->data);
-       skb->nh.iph = (struct iphdr *)skb->data;
+       skb_reset_network_header(skb);
        skb->dev = reg_dev;
        skb->protocol = htons(ETH_P_IP);
        skb->ip_summed = 0;
@@ -1509,7 +1509,7 @@ static int pim_rcv(struct sk_buff * skb)
 
        skb->mac.raw = skb->nh.raw;
        skb_pull(skb, (u8*)encap - skb->data);
-       skb->nh.iph = (struct iphdr *)skb->data;
+       skb_reset_network_header(skb);
        skb->dev = reg_dev;
        skb->protocol = htons(ETH_P_IP);
        skb->ip_summed = 0;