--- 5a2275c4ee79d8ad6b4432916af37e73982c92ea +++ 5f42f30dd1682bdc2427e7b387390fe231ab305e @@ -246,11 +246,7 @@ static struct notifier_block phonet_devi /* Per-namespace Phonet devices handling */ static int phonet_init_net(struct net *net) { - struct phonet_net *pnn; - - if (!net_eq(net, &init_net)) - return 0; - pnn = kmalloc(sizeof(*pnn), GFP_KERNEL); + struct phonet_net *pnn = kmalloc(sizeof(*pnn), GFP_KERNEL); if (!pnn) return -ENOMEM; @@ -267,13 +263,9 @@ static int phonet_init_net(struct net *n static void phonet_exit_net(struct net *net) { - struct phonet_net *pnn; + struct phonet_net *pnn = net_generic(net, phonet_net_id); struct net_device *dev; - if (!net_eq(net, &init_net)) - return; - pnn = net_generic(net, phonet_net_id); - rtnl_lock(); for_each_netdev(net, dev) phonet_device_destroy(dev);