From: Julian Anastasov Date: Wed, 18 Jul 2012 21:34:24 +0000 (+0000) Subject: ipv4: optimize fib_compute_spec_dst call in ip_options_echo X-Git-Tag: MMI-PSA29.97-13-9~16302^2~87 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6255e5ead00cf96554f623ba51e2ac4c8ac27276;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ipv4: optimize fib_compute_spec_dst call in ip_options_echo Move fib_compute_spec_dst at the only place where it is needed. Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller --- diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index a19d6471a318..1dc01f9793d5 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c @@ -93,7 +93,6 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb) unsigned char *sptr, *dptr; int soffset, doffset; int optlen; - __be32 daddr; memset(dopt, 0, sizeof(struct ip_options)); @@ -105,8 +104,6 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb) sptr = skb_network_header(skb); dptr = dopt->__data; - daddr = fib_compute_spec_dst(skb); - if (sopt->rr) { optlen = sptr[sopt->rr+1]; soffset = sptr[sopt->rr+2]; @@ -180,6 +177,8 @@ int ip_options_echo(struct ip_options *dopt, struct sk_buff *skb) doffset -= 4; } if (doffset > 3) { + __be32 daddr = fib_compute_spec_dst(skb); + memcpy(&start[doffset-1], &daddr, 4); dopt->faddr = faddr; dptr[0] = start[0];