X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=07fd222de297d20812f83a7d89407ed6ec66b249;hb=77912ae717298cb06544f1bebd9701d0b3c2f2f0;hp=6203470e566102ff298dca1fa65064c87fb22d55;hpb=34e63086edddcae06d7c1a4fa84fec0861e50758;p=openvswitch

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 6203470e..07fd222d 100644
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -1,6 +1,6 @@
 /*
  * Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) 2007, 2008, 2009 Nicira Networks.
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Significant portions of this file may be copied from parts of the Linux
  * kernel, by Linus Torvalds and others.
@@ -9,20 +9,56 @@
 /* Handle changes to managed devices */
 
 #include <linux/netdevice.h>
+#include <net/genetlink.h>
 
 #include "datapath.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 = dev->br_port;
-	if (event == NETDEV_UNREGISTER && p) {
-		struct datapath *dp = p->dp;
-		mutex_lock(&dp->mutex);
-		dp_del_port(p, NULL);
-		mutex_unlock(&dp->mutex);
+	struct vport *vport;
+	struct datapath *dp;
+
+	if (is_internal_dev(dev))
+		vport = internal_dev_get_vport(dev);
+	else
+		vport = netdev_get_vport(dev);
+
+	if (!vport)
+		return NOTIFY_DONE;
+
+	dp = vport->dp;
+
+	switch (event) {
+	case NETDEV_UNREGISTER:
+		if (!is_internal_dev(dev)) {
+			struct sk_buff *reply;
+
+			reply = ovs_vport_cmd_build_info(vport, 0, 0,
+							 OVS_VPORT_CMD_DEL);
+			dp_detach_port(vport);
+			if (IS_ERR(reply)) {
+				netlink_set_err(INIT_NET_GENL_SOCK, 0,
+						dp_vport_multicast_group.id,
+						PTR_ERR(reply));
+				break;
+			}
+
+			genl_notify(reply, dev_net(dev), 0,
+				    dp_vport_multicast_group.id, NULL,
+				    GFP_KERNEL);
+		}
+		break;
+
+	case NETDEV_CHANGENAME:
+		if (vport->port_no != OVSP_LOCAL) {
+			dp_sysfs_del_if(vport);
+			dp_sysfs_add_if(vport);
+		}
+		break;
 	}
 	return NOTIFY_DONE;
 }