diff options
| author | Julian Anastasov <ja@ssi.bg> | 2012-07-18 21:34:24 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-19 08:30:49 -0700 |
| commit | 6255e5ead00cf96554f623ba51e2ac4c8ac27276 (patch) | |
| tree | e0357164a2aa9726a923c876fed3245f0f944480 /net | |
| parent | a16a0d2fb8e0726f5d92572cc6ba5ba52f5cdcc1 (diff) | |
| download | linux-3.10-6255e5ead00cf96554f623ba51e2ac4c8ac27276.tar.gz linux-3.10-6255e5ead00cf96554f623ba51e2ac4c8ac27276.tar.bz2 linux-3.10-6255e5ead00cf96554f623ba51e2ac4c8ac27276.zip | |
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 <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_options.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index a19d6471a31..1dc01f9793d 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]; |