---

yaml --- r: 247425 b: refs/heads/master c: c30883b h: refs/heads/master i: 247423: 823a5db v: v3
git-mirror · May 12, 2011 · aa6912d · aa6912d
1 parent c186724
commit aa6912d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10949550bd1e50cc91c0f5085f7080a44b0871fe
+refs/heads/master: c30883bdff0b3544900a5c4aba18b8985436878f
diff --git a/trunk/net/ipv4/ip_options.c b/trunk/net/ipv4/ip_options.c
@@ -635,7 +635,7 @@ int ip_options_rcv_srr(struct sk_buff *skb)
 		if (rt2->rt_type != RTN_LOCAL)
 			break;
 		/* Superfast 8) loopback forward */
-		memcpy(&iph->daddr, &optptr[srrptr-1], 4);
+		iph->daddr = nexthop;
 		opt->is_changed = 1;
 	}
 	if (srrptr <= srrspace) {