diff options
author | Patrick McHardy <kaber@trash.net> | 2005-09-08 17:27:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-09-08 17:27:47 -0400 |
commit | a57ebc90f1350296edded12d33d7c278831bc3bf (patch) | |
tree | 271f478173fb6e1d1869320e81779e6c7165cede | |
parent | baed16a7ff5194487764db300c2753ac7409c4c5 (diff) |
[IPV6]: Don't redo xfrm_lookup for cached dst entries
The xfrm lookup is already done when the dst entry is looked up first and
stored in the cache.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv6/ip6_tunnel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 09613729404c..cf94372d1af3 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c | |||
@@ -673,11 +673,12 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) | |||
673 | 673 | ||
674 | if ((dst = ip6_tnl_dst_check(t)) != NULL) | 674 | if ((dst = ip6_tnl_dst_check(t)) != NULL) |
675 | dst_hold(dst); | 675 | dst_hold(dst); |
676 | else | 676 | else { |
677 | dst = ip6_route_output(NULL, &fl); | 677 | dst = ip6_route_output(NULL, &fl); |
678 | 678 | ||
679 | if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0) < 0) | 679 | if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0) < 0) |
680 | goto tx_err_link_failure; | 680 | goto tx_err_link_failure; |
681 | } | ||
681 | 682 | ||
682 | tdev = dst->dev; | 683 | tdev = dst->dev; |
683 | 684 | ||