---

yaml --- r: 275667 b: refs/heads/master c: b12f62e h: refs/heads/master i: 275665: 230416a 275663: 0e978dc v: v3
git-mirror · Nov 9, 2011 · 1ee9712 · 1ee9712
1 parent e99d0af
commit 1ee9712
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;