Skip to content

Commit

Permalink
ipv4: optimize fib_compute_spec_dst call in ip_options_echo
Browse files Browse the repository at this point in the history
Move fib_compute_spec_dst at the only place where it
is needed.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Julian Anastasov authored and davem330 committed Jul 19, 2012
1 parent a16a0d2 commit 6255e5e
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions net/ipv4/ip_options.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -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];
Expand Down Expand Up @@ -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];
Expand Down

0 comments on commit 6255e5e

Please sign in to comment.