diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-10-29 00:13:19 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-03 14:59:05 -0400 |
| commit | 94e187c01512c9cf29e2ff54bf1a1b045f38293d (patch) | |
| tree | 2149f4652fb0fc997ce5728f9574e1ab5351f0e5 /net/ipv6/ip6_tunnel.c | |
| parent | 6da025fa23bb10c82f80de319c837ed2b02306e4 (diff) | |
| download | linux-3.10-94e187c01512c9cf29e2ff54bf1a1b045f38293d.tar.gz linux-3.10-94e187c01512c9cf29e2ff54bf1a1b045f38293d.tar.bz2 linux-3.10-94e187c01512c9cf29e2ff54bf1a1b045f38293d.zip | |
ipv6: introduce ip6_rt_put()
As suggested by Eric, we could introduce a helper function
for ipv6 too, to avoid checking if rt is NULL before
dst_release().
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index cb7e2ded6f0..09482f72306 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -663,8 +663,7 @@ ip6ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, icmpv6_send(skb2, rel_type, rel_code, rel_info); - if (rt) - dst_release(&rt->dst); + ip6_rt_put(rt); kfree_skb(skb2); } @@ -1208,7 +1207,7 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) if (dev->mtu < IPV6_MIN_MTU) dev->mtu = IPV6_MIN_MTU; } - dst_release(&rt->dst); + ip6_rt_put(rt); } } |