net: introduce dev_net notifier register/unregister variants

[tomoyo/tomoyo-test1.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index b521b50..38bc35d 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1874,6 +1874,48 @@ int unregister_netdevice_notifier_net(struct net *net,
 }
 EXPORT_SYMBOL(unregister_netdevice_notifier_net);
 
+int register_netdevice_notifier_dev_net(struct net_device *dev,
+                                       struct notifier_block *nb,
+                                       struct netdev_net_notifier *nn)
+{
+       int err;
+
+       rtnl_lock();
+       err = __register_netdevice_notifier_net(dev_net(dev), nb, false);
+       if (!err) {
+               nn->nb = nb;
+               list_add(&nn->list, &dev->net_notifier_list);
+       }
+       rtnl_unlock();
+       return err;
+}
+EXPORT_SYMBOL(register_netdevice_notifier_dev_net);
+
+int unregister_netdevice_notifier_dev_net(struct net_device *dev,
+                                         struct notifier_block *nb,
+                                         struct netdev_net_notifier *nn)
+{
+       int err;
+
+       rtnl_lock();
+       list_del(&nn->list);
+       err = __unregister_netdevice_notifier_net(dev_net(dev), nb);
+       rtnl_unlock();
+       return err;
+}
+EXPORT_SYMBOL(unregister_netdevice_notifier_dev_net);
+
+static void move_netdevice_notifiers_dev_net(struct net_device *dev,
+                                            struct net *net)
+{
+       struct netdev_net_notifier *nn;
+
+       list_for_each_entry(nn, &dev->net_notifier_list, list) {
+               __unregister_netdevice_notifier_net(dev_net(dev), nn->nb);
+               __register_netdevice_notifier_net(net, nn->nb, true);
+       }
+}
+
 /**
  *     call_netdevice_notifiers_info - call all network notifier blocks
  *     @val: value passed unmodified to notifier function
@@ -9786,6 +9828,7 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name,
        INIT_LIST_HEAD(&dev->adj_list.lower);
        INIT_LIST_HEAD(&dev->ptype_all);
        INIT_LIST_HEAD(&dev->ptype_specific);
+       INIT_LIST_HEAD(&dev->net_notifier_list);
 #ifdef CONFIG_NET_SCHED
        hash_init(dev->qdisc_hash);
 #endif
@@ -10049,6 +10092,9 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
        kobject_uevent(&dev->dev.kobj, KOBJ_REMOVE);
        netdev_adjacent_del_links(dev);
 
+       /* Move per-net netdevice notifiers that are following the netdevice */
+       move_netdevice_notifiers_dev_net(dev, net);
+
        /* Actually switch the network namespace */
        dev_net_set(dev, net);
        dev->ifindex = new_ifindex;