X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=7b3b219ac2a97fcd1f0f7a8b4a2826e7231b01a4;hb=f14d80834e73e5e91892e4763e01ccfd3a2d3be2;hp=e0bd14c5227226aea32de0d559ce8a43c0fc362b;hpb=63db6ec35ddc2432dda059f277257886c2d1ba8f;p=sliver-openvswitch.git

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index e0bd14c52..7b3b219ac 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, 2010 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,17 +9,17 @@
 /* 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 vport *vport;
-	struct dp_port *p;
 	struct datapath *dp;
 
 	if (is_internal_dev(dev))
@@ -30,25 +30,33 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
 	if (!vport)
 		return NOTIFY_DONE;
 
-	p = vport_get_dp_port(vport);
-
-	if (!p)
-		return NOTIFY_DONE;
-	dp = p->dp;
+	dp = vport->dp;
 
 	switch (event) {
 	case NETDEV_UNREGISTER:
-		mutex_lock(&dp->mutex);
-		dp_detach_port(p, 1);
-		mutex_unlock(&dp->mutex);
+		if (!is_internal_dev(dev)) {
+			struct sk_buff *reply;
+
+			dp_detach_port(vport);
+			reply = ovs_vport_cmd_build_info(vport, 0, 0,
+							 OVS_VPORT_CMD_DEL);
+			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 (p->port_no != ODPP_LOCAL) {
-			mutex_lock(&dp->mutex);
-			dp_sysfs_del_if(p);
-			dp_sysfs_add_if(p);
-			mutex_unlock(&dp->mutex);
+		if (vport->port_no != OVSP_LOCAL) {
+			dp_sysfs_del_if(vport);
+			dp_sysfs_add_if(vport);
 		}
 		break;