1 files changed, 12 insertions, 11 deletions

diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 682c0fedf36..842d6e0402f 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -11,7 +11,6 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ":%s(): " fmt, __func__
 
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
 #include <linux/net.h>
@@ -53,7 +52,6 @@ struct cfcnfg *get_cfcnfg(struct net *net)
         struct caif_net *caifn;
         BUG_ON(!net);
         caifn = net_generic(net, caif_net_id);
-        BUG_ON(!caifn);
         return caifn->cfg;
 }
 EXPORT_SYMBOL(get_cfcnfg);
@@ -63,7 +61,6 @@ static struct caif_device_entry_list *caif_device_list(struct net *net)
         struct caif_net *caifn;
         BUG_ON(!net);
         caifn = net_generic(net, caif_net_id);
-        BUG_ON(!caifn);
         return &caifn->caifdevs;
 }
 
@@ -92,12 +89,15 @@ static struct caif_device_entry *caif_device_alloc(struct net_device *dev)
         struct caif_device_entry *caifd;
 
         caifdevs = caif_device_list(dev_net(dev));
-        BUG_ON(!caifdevs);
 
-        caifd = kzalloc(sizeof(*caifd), GFP_ATOMIC);
+        caifd = kzalloc(sizeof(*caifd), GFP_KERNEL);
         if (!caifd)
                 return NULL;
         caifd->pcpu_refcnt = alloc_percpu(int);
+        if (!caifd->pcpu_refcnt) {
+                kfree(caifd);
+                return NULL;
+        }
         caifd->netdev = dev;
         dev_hold(dev);
         return caifd;
@@ -108,7 +108,7 @@ static struct caif_device_entry *caif_get(struct net_device *dev)
         struct caif_device_entry_list *caifdevs =
             caif_device_list(dev_net(dev));
         struct caif_device_entry *caifd;
-        BUG_ON(!caifdevs);
+
         list_for_each_entry_rcu(caifd, &caifdevs->list, list) {
                 if (caifd->netdev == dev)
                         return caifd;
@@ -209,8 +209,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
         enum cfcnfg_phy_preference pref;
         enum cfcnfg_phy_type phy_type;
         struct cfcnfg *cfg;
-        struct caif_device_entry_list *caifdevs =
-            caif_device_list(dev_net(dev));
+        struct caif_device_entry_list *caifdevs;
 
         if (dev->type != ARPHRD_CAIF)
                 return 0;
@@ -219,6 +218,8 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
         if (cfg == NULL)
                 return 0;
 
+        caifdevs = caif_device_list(dev_net(dev));
+
         switch (what) {
         case NETDEV_REGISTER:
                 caifd = caif_device_alloc(dev);
@@ -348,7 +349,7 @@ static struct notifier_block caif_device_notifier = {
 static int caif_init_net(struct net *net)
 {
         struct caif_net *caifn = net_generic(net, caif_net_id);
-        BUG_ON(!caifn);
+
         INIT_LIST_HEAD(&caifn->caifdevs.list);
         mutex_init(&caifn->caifdevs.lock);
 
@@ -413,7 +414,7 @@ static int __init caif_device_init(void)
 {
         int result;
 
-        result = register_pernet_device(&caif_net_ops);
+        result = register_pernet_subsys(&caif_net_ops);
 
         if (result)
                 return result;
@@ -426,7 +427,7 @@ static int __init caif_device_init(void)
 
 static void __exit caif_device_exit(void)
 {
-        unregister_pernet_device(&caif_net_ops);
+        unregister_pernet_subsys(&caif_net_ops);
         unregister_netdevice_notifier(&caif_device_notifier);
         dev_remove_pack(&caif_packet_type);
 }