X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=94d671dd37a13df626de6b29c84cd9fbf2f3c6b5;hb=df2c07f4338faac04f4969f243fe4e8083b309ac;hp=e73a731a3fdaffc60d0b6705ea99eac052e02951;hpb=d8b5d43a04fba8ba09d5bb3c745808964f371d80;p=openvswitch

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index e73a731a..94d671dd 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.
@@ -14,42 +14,33 @@
 #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))
 		vport = internal_dev_get_vport(dev);
-	else {
+	else
 		vport = netdev_get_vport(dev);
 
-		if (!vport)
-			return NOTIFY_DONE;
-	}
-
-	p = vport_get_dp_port(vport);
-
-	if (!p)
+	if (!vport)
 		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))
+			dp_detach_port(vport);
 		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;