From: David S. Miller <davem@davemloft.net>
Date: Thu, 12 May 2011 23:30:58 +0000 (-0400)
Subject: ipv4: Simplify iph->daddr overwrite in ip_options_rcv_srr().
X-Git-Tag: MMI-PSA29.97-13-9~19691^2~104^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c30883bdff0b3544900a5c4aba18b8985436878f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ipv4: Simplify iph->daddr overwrite in ip_options_rcv_srr().

We already copy the 4-byte nexthop from the options block into
local variable "nexthop" for the route lookup.

Re-use that variable instead of memcpy()'ing again when assigning
to iph->daddr after the route lookup succeeds.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
index e82c304806bb..c5c26192b057 100644
--- a/net/ipv4/ip_options.c
+++ b/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) {