diff options
author | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-03-01 09:15:01 -0600 |
commit | 5ee07f2a498e0a5f4a9994317c0f2e451e27b4f2 (patch) | |
tree | 8d8cc50a7de738e1e6b7a66ec27120f616b3919a /net/ipv4/ip_options.c | |
parent | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (diff) | |
parent | 44fb3170ae46f8de964a4bb5b0504e865a6dd7da (diff) |
Merge commit 'v3.2.9' into rt-3.2.9-rt13v3.2.9-rt13
Diffstat (limited to 'net/ipv4/ip_options.c')
-rw-r--r-- | net/ipv4/ip_options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index 1e60f7679075..42dd1a90edea 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -573,8 +573,8 @@ void ip_forward_options(struct sk_buff *skb) } if (srrptr + 3 <= srrspace) { opt->is_changed = 1; - ip_rt_get_source(&optptr[srrptr-1], skb, rt); ip_hdr(skb)->daddr = opt->nexthop; + ip_rt_get_source(&optptr[srrptr-1], skb, rt); optptr[2] = srrptr+4; } else if (net_ratelimit()) printk(KERN_CRIT "ip_forward(): Argh! Destination lost!\n"); |