Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next...

[cascardo/linux.git] / net / core / dst.c

diff --git a/net/core/dst.c b/net/core/dst.c
index a1656e3..b5cbbe0 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -265,7 +265,7 @@ again:
        lwtstate_put(dst->lwtstate);
 
        if (dst->flags & DST_METADATA)
-               kfree(dst);
+               metadata_dst_free((struct metadata_dst *)dst);
        else
                kmem_cache_free(dst->ops->kmem_cachep, dst);
 
@@ -395,6 +395,14 @@ struct metadata_dst *metadata_dst_alloc(u8 optslen, gfp_t flags)
 }
 EXPORT_SYMBOL_GPL(metadata_dst_alloc);
 
+void metadata_dst_free(struct metadata_dst *md_dst)
+{
+#ifdef CONFIG_DST_CACHE
+       dst_cache_destroy(&md_dst->u.tun_info.dst_cache);
+#endif
+       kfree(md_dst);
+}
+
 struct metadata_dst __percpu *metadata_dst_alloc_percpu(u8 optslen, gfp_t flags)
 {
        int cpu;