Global replace of Nicira Networks.

[sliver-openvswitch.git] / datapath / dp_notify.c

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 0278988..683f624 100644 (file)
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -1,62 +1,74 @@
 /*
- * Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) 2007, 2008, 2009 Nicira Networks.
+ * Copyright (c) 2007-2012 Nicira, Inc.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
-/* Handle changes to managed devices */
-
 #include <linux/netdevice.h>
+#include <net/genetlink.h>
 
 #include "datapath.h"
-#include "dp_dev.h"
+#include "vport-internal_dev.h"
+#include "vport-netdev.h"
 
-static int dp_device_event(struct notifier_block *unused, unsigned long event, 
-               void *ptr) 
+static int dp_device_event(struct notifier_block *unused, unsigned long event,
+                          void *ptr)
 {
        struct net_device *dev = ptr;
-       struct net_bridge_port *p;
-       struct datapath *dp;
-
-       if (is_dp_dev(dev)) {
-               struct dp_dev *dp_dev = dp_dev_priv(dev);
-               p = dp_dev->dp->ports[dp_dev->port_no];
-       } else {
-               p = dev->br_port;
-       }
-       if (!p)
+       struct vport *vport;
+
+       if (ovs_is_internal_dev(dev))
+               vport = ovs_internal_dev_get_vport(dev);
+       else
+               vport = ovs_netdev_get_vport(dev);
+
+       if (!vport)
                return NOTIFY_DONE;
-       dp = p->dp;
 
        switch (event) {
        case NETDEV_UNREGISTER:
-               mutex_lock(&dp->mutex);
-               dp_del_port(p);
-               mutex_unlock(&dp->mutex);
-               break;
+               if (!ovs_is_internal_dev(dev)) {
+                       struct sk_buff *notify;
 
-       case NETDEV_CHANGENAME:
-               if (p->port_no != ODPP_LOCAL) {
-                       mutex_lock(&dp->mutex);
-                       dp_sysfs_del_if(p);
-                       dp_sysfs_add_if(p);
-                       mutex_unlock(&dp->mutex);
+                       notify = ovs_vport_cmd_build_info(vport, 0, 0,
+                                                         OVS_VPORT_CMD_DEL);
+                       ovs_dp_detach_port(vport);
+                       if (IS_ERR(notify)) {
+                               netlink_set_err(GENL_SOCK(ovs_dp_get_net(vport->dp)), 0,
+                                               ovs_dp_vport_multicast_group.id,
+                                               PTR_ERR(notify));
+                               break;
+                       }
+
+                       genlmsg_multicast_netns(ovs_dp_get_net(vport->dp), notify, 0,
+                                               ovs_dp_vport_multicast_group.id,
+                                               GFP_KERNEL);
                }
                break;
 
-       case NETDEV_CHANGEMTU:
-               if (!is_dp_dev(dev)) {
-                       mutex_lock(&dp->mutex);
-                       set_dp_devs_mtu(dp, dev);
-                       mutex_unlock(&dp->mutex);
+       case NETDEV_CHANGENAME:
+               if (vport->port_no != OVSP_LOCAL) {
+                       ovs_dp_sysfs_del_if(vport);
+                       ovs_dp_sysfs_add_if(vport);
                }
                break;
        }
+
        return NOTIFY_DONE;
 }
 
-struct notifier_block dp_device_notifier = {
+struct notifier_block ovs_dp_device_notifier = {
        .notifier_call = dp_device_event
 };