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

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 1843d756..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.
@@ -19,7 +19,6 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
 {
 	struct net_device *dev = ptr;
 	struct vport *vport;
-	struct dp_port *p;
 	struct datapath *dp;
 
 	if (is_internal_dev(dev))
@@ -30,25 +29,18 @@ 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);
-		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;