X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=8c54d68315a8d43696cff4c2dbea9c7de1dfe3bb;hb=de06dce673979eb9208c539bad15fae855e1d4c5;hp=4a16a93fdc5356d24620b94690b8476a16b03774;hpb=f2459fe7d91c4c325dfaa3ed18f56200b63ae27e;p=openvswitch

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 4a16a93f..8c54d683 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,51 +14,39 @@
 #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 != ODPP_LOCAL) {
+			dp_sysfs_del_if(vport);
+			dp_sysfs_add_if(vport);
 		}
 		break;
 
 	case NETDEV_CHANGEMTU:
-		if (!is_internal_dev(dev)) {
-			mutex_lock(&dp->mutex);
+		if (!is_internal_dev(dev))
 			set_internal_devs_mtu(dp);
-			mutex_unlock(&dp->mutex);
-		}
 		break;
 	}
 	return NOTIFY_DONE;