From aa6912d90f64b12240d4a85d3eea2dfe31213b04 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 12 May 2011 19:30:58 -0400
Subject: [PATCH] --- yaml --- r: 247425 b: refs/heads/master c:
 c30883bdff0b3544900a5c4aba18b8985436878f h: refs/heads/master i:   247423:
 823a5dba79fe06a279b72942560cec2a519636cc v: v3

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

diff --git a/[refs] b/[refs]
index a24776a15f0f..6b9ea5e3d5ac 100644
--- 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
index e82c304806bb..c5c26192b057 100644
--- 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) {