diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-10 23:46:21 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:47 -0400 |
commit | e2d1bca7e6134671bcb19810d004a252aa6a644d (patch) | |
tree | 5d8ee962cd69cd886aaedff8ac253590a985dd1c /net/ipv4/ipmr.c | |
parent | c1d2bbe1cd6c7bbdc6d532cefebb66c7efb789ce (diff) |
[SK_BUFF]: Use skb_reset_network_header in skb_push cases
skb_push updates and returns skb->data, so we can just call
skb_reset_network_header after the call to skb_push.
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index f73f4e402f72..05c82ca45aaf 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1593,7 +1593,8 @@ int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait) | |||
1593 | return -ENOMEM; | 1593 | return -ENOMEM; |
1594 | } | 1594 | } |
1595 | 1595 | ||
1596 | skb2->nh.raw = skb_push(skb2, sizeof(struct iphdr)); | 1596 | skb_push(skb2, sizeof(struct iphdr)); |
1597 | skb_reset_network_header(skb2); | ||
1597 | skb2->nh.iph->ihl = sizeof(struct iphdr)>>2; | 1598 | skb2->nh.iph->ihl = sizeof(struct iphdr)>>2; |
1598 | skb2->nh.iph->saddr = rt->rt_src; | 1599 | skb2->nh.iph->saddr = rt->rt_src; |
1599 | skb2->nh.iph->daddr = rt->rt_dst; | 1600 | skb2->nh.iph->daddr = rt->rt_dst; |