---

yaml --- r: 247451 b: refs/heads/master c: 0374d9c h: refs/heads/master i: 247449: ea3eb0e 247447: 09657fd v: v3
git-mirror · May 13, 2011 · 330e232 · 330e232
1 parent a49f3fa
commit 330e232
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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");