From 330e2323698becec2cd96997709e770a4283c755 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 13 May 2011 17:15:50 -0400
Subject: [PATCH] --- yaml --- r: 247451 b: refs/heads/master c:
 0374d9ceb02eb12fcd65be9dd5df9c911ef93424 h: refs/heads/master i:   247449:
 ea3eb0e7d1146fac072994edd347a17240c38595   247447:
 09657fd0d6d5adcbdf32a121fffd0020af5ed491 v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv4/ip_options.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 917c751cbbf8..42d16b640b38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48e20467227fe540e6bbf3d98df98c2c0fca10f3
+refs/heads/master: 0374d9ceb02eb12fcd65be9dd5df9c911ef93424
diff --git a/trunk/net/ipv4/ip_options.c b/trunk/net/ipv4/ip_options.c
index c5c26192b057..c6474cd1cbfa 100644
--- a/trunk/net/ipv4/ip_options.c
+++ b/trunk/net/ipv4/ip_options.c
@@ -573,7 +573,6 @@ void ip_forward_options(struct sk_buff *skb)
 		if (srrptr + 3 <= srrspace) {
 			opt->is_changed = 1;
 			ip_rt_get_source(&optptr[srrptr-1], rt);
-			ip_hdr(skb)->daddr = rt->rt_dst;
 			optptr[2] = srrptr+4;
 		} else if (net_ratelimit())
 			printk(KERN_CRIT "ip_forward(): Argh! Destination lost!\n");