AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[IPMR]: Fix bug introduced when converting to skb_network_reset_header

Browse Source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo 2007-03-12 20:09:36 -03:00 committed by David S. Miller
parent c9bdd4b525
commit e023dd6437
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv4/ipmr.c
View File

@ -1096,6 +1096,7 @@ static struct notifier_block ip_mr_notifier={
static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr)
{
struct iphdr *iph;
struct iphdr *old_iph = skb->nh.iph;
skb_push(skb, sizeof(struct iphdr));
skb->h.ipiph = skb->nh.iph;
@ -1103,8 +1104,8 @@ static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr)
iph = skb->nh.iph;
iph->version = 4;
iph->tos = skb->nh.iph->tos;
iph->ttl = skb->nh.iph->ttl;
iph->tos = old_iph->tos;
iph->ttl = old_iph->ttl;
iph->frag_off = 0;
iph->daddr = daddr;
iph->saddr = saddr;