Merge tag 'drm-intel-next-2014-09-01' of git://anongit.freedesktop.org/drm-intel...

[firefly-linux-kernel-4.4.55.git] / net / ipv6 / reassembly.c

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index beb6872a8fa51395d0d2618b5bbdbd6104c1da5e..c6557d9f7808c42e686582f31e8cc535a7067f3f 100644 (file)
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -60,6 +60,8 @@
 #include <net/inet_frag.h>
 #include <net/inet_ecn.h>
 
+static const char ip6_frag_cache_name[] = "ip6-frags";
+
 struct ip6frag_skb_cb
 {
        struct inet6_skb_parm   h;
@@ -748,7 +750,10 @@ int __init ipv6_frag_init(void)
        ip6_frags.qsize = sizeof(struct frag_queue);
        ip6_frags.match = ip6_frag_match;
        ip6_frags.frag_expire = ip6_frag_expire;
-       inet_frags_init(&ip6_frags);
+       ip6_frags.frags_cache_name = ip6_frag_cache_name;
+       ret = inet_frags_init(&ip6_frags);
+       if (ret)
+               goto err_pernet;
 out:
        return ret;