diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-12 23:01:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-12 23:01:55 -0400 |
| commit | 5c5095494fb545f53b80cbb7539679a10a3472a6 (patch) | |
| tree | d7c40cd66a58030ddef369bcb9acd8d95e2ac864 /net/ipv4 | |
| parent | 4d586b823acc46c55c889ae1798de236c9d403da (diff) | |
| parent | def57687e9579b7a797681990dff763c411f5347 (diff) | |
| download | kernel_samsung_smdk4412-5c5095494fb545f53b80cbb7539679a10a3472a6.zip kernel_samsung_smdk4412-5c5095494fb545f53b80cbb7539679a10a3472a6.tar.gz kernel_samsung_smdk4412-5c5095494fb545f53b80cbb7539679a10a3472a6.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_forward.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ip_options.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c index 99461f0..fcbc0c8 100644 --- a/net/ipv4/ip_forward.c +++ b/net/ipv4/ip_forward.c @@ -84,7 +84,7 @@ int ip_forward(struct sk_buff *skb) rt = skb_rtable(skb); - if (opt->is_strictroute && rt->rt_dst != rt->rt_gateway) + if (opt->is_strictroute && iph->daddr != rt->rt_gateway) goto sr_failed; if (unlikely(skb->len > dst_mtu(&rt->dst) && !skb_is_gso(skb) && diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 01fc409..c5c2619 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -601,7 +601,7 @@ int ip_options_rcv_srr(struct sk_buff *skb) unsigned long orefdst; int err; - if (!opt->srr || !rt) + if (!rt) return 0; if (skb->pkt_type != PACKET_HOST) @@ -635,7 +635,7 @@ int ip_options_rcv_srr(struct sk_buff *skb) if (rt2->rt_type != RTN_LOCAL) break; /* Superfast 8) loopback forward */ - memcpy(&iph->daddr, &optptr[srrptr-1], 4); + iph->daddr = nexthop; opt->is_changed = 1; } if (srrptr <= srrspace) { |