diff options
| author | Patrick McHardy <kaber@trash.net> | 2005-09-08 14:27:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-09-08 14:27:47 -0700 |
| commit | a57ebc90f1350296edded12d33d7c278831bc3bf (patch) | |
| tree | 271f478173fb6e1d1869320e81779e6c7165cede /net | |
| parent | baed16a7ff5194487764db300c2753ac7409c4c5 (diff) | |
| download | kernel_samsung_aries-a57ebc90f1350296edded12d33d7c278831bc3bf.zip kernel_samsung_aries-a57ebc90f1350296edded12d33d7c278831bc3bf.tar.gz kernel_samsung_aries-a57ebc90f1350296edded12d33d7c278831bc3bf.tar.bz2 | |
[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>
Diffstat (limited to '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 0961372..cf94372 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) if ((dst = ip6_tnl_dst_check(t)) != NULL) dst_hold(dst); - else + else { dst = ip6_route_output(NULL, &fl); - if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0) < 0) - goto tx_err_link_failure; + if (dst->error || xfrm_lookup(&dst, &fl, NULL, 0) < 0) + goto tx_err_link_failure; + } tdev = dst->dev; |