From 1ee97120ddd3e29f338ee13bead6d6308e552c35 Mon Sep 17 00:00:00 2001
From: Li Wei <lw@cn.fujitsu.com>
Date: Tue, 8 Nov 2011 21:39:28 +0000
Subject: [PATCH] --- yaml --- r: 275667 b: refs/heads/master c:
 b12f62efb8ec0b9523bdb6c2d412c07193086de9 h: refs/heads/master i:   275665:
 230416aabe6253488dceb3ac5d7dccac7a39deba   275663:
 0e978dca4caf2ffc27a7a17c4084447e81aa2a47 v: v3

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

diff --git a/[refs] b/[refs]
index 941149af2cfb..2bddeba64049 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7ea81a58adc123a4e980cb0eff9eb5c144b5dc7
+refs/heads/master: b12f62efb8ec0b9523bdb6c2d412c07193086de9
diff --git a/trunk/net/ipv4/ip_options.c b/trunk/net/ipv4/ip_options.c
index ec93335901dd..05d20cca9d66 100644
--- a/trunk/net/ipv4/ip_options.c
+++ b/trunk/net/ipv4/ip_options.c
@@ -640,6 +640,7 @@ int ip_options_rcv_srr(struct sk_buff *skb)
 	}
 	if (srrptr <= srrspace) {
 		opt->srr_is_hit = 1;
+		iph->daddr = nexthop;
 		opt->is_changed = 1;
 	}
 	return 0;