Commit c30883bd authored May 12, 2011 by David S. Miller

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>

parent 10949550

net/ipv4/ip_options.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {