aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-10 17:04:55 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 01:24:50 -0400
commit31c7711b509d470ab1e175e7bb98ea66a82aa916 (patch)
tree0d6465c947d163bf7bf0803624533e6af964ef50 /net/ipv4/ipmr.c
parent4209fb601c0a0e0a9d90c0008f350dd345c8b7de (diff)
[SK_BUFF]: Some more simple skb_reset_network_header conversions
This time of the type: skb->nh.iph = (struct iphdr *)skb->data; That is completely equivalent to: skb->nh.raw = skb->data; Wonder why people love casts... :-) Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r--net/ipv4/ipmr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 05c82ca45aaf..45435f0a5d6c 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1454,7 +1454,7 @@ int pim_rcv_v1(struct sk_buff * skb)
1454 1454
1455 skb->mac.raw = skb->nh.raw; 1455 skb->mac.raw = skb->nh.raw;
1456 skb_pull(skb, (u8*)encap - skb->data); 1456 skb_pull(skb, (u8*)encap - skb->data);
1457 skb->nh.iph = (struct iphdr *)skb->data; 1457 skb_reset_network_header(skb);
1458 skb->dev = reg_dev; 1458 skb->dev = reg_dev;
1459 skb->protocol = htons(ETH_P_IP); 1459 skb->protocol = htons(ETH_P_IP);
1460 skb->ip_summed = 0; 1460 skb->ip_summed = 0;
@@ -1509,7 +1509,7 @@ static int pim_rcv(struct sk_buff * skb)
1509 1509
1510 skb->mac.raw = skb->nh.raw; 1510 skb->mac.raw = skb->nh.raw;
1511 skb_pull(skb, (u8*)encap - skb->data); 1511 skb_pull(skb, (u8*)encap - skb->data);
1512 skb->nh.iph = (struct iphdr *)skb->data; 1512 skb_reset_network_header(skb);
1513 skb->dev = reg_dev; 1513 skb->dev = reg_dev;
1514 skb->protocol = htons(ETH_P_IP); 1514 skb->protocol = htons(ETH_P_IP);
1515 skb->ip_summed = 0; 1515 skb->ip_summed = 0;