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

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index e7d08bc3..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.
@@ -33,17 +33,14 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
 
 	switch (event) {
 	case NETDEV_UNREGISTER:
-		mutex_lock(&dp->mutex);
-		dp_detach_port(vport);
-		mutex_unlock(&dp->mutex);
+		if (!is_internal_dev(dev))
+			dp_detach_port(vport);
 		break;
 
 	case NETDEV_CHANGENAME:
-		if (vport->port_no != ODPP_LOCAL) {
-			mutex_lock(&dp->mutex);
+		if (vport->port_no != OVSP_LOCAL) {
 			dp_sysfs_del_if(vport);
 			dp_sysfs_add_if(vport);
-			mutex_unlock(&dp->mutex);
 		}
 		break;