X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=datapath%2Fdp_notify.c;h=1415833fdda4a756b32e9194f637a1751324a76c;hb=31ac1e590b9bb2a2ce7c70cd7c8fd2db0fb8e481;hp=e73a731a3fdaffc60d0b6705ea99eac052e02951;hpb=d8b5d43a04fba8ba09d5bb3c745808964f371d80;p=openvswitch

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index e73a731a..1415833f 100644
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -14,41 +14,37 @@
 #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)) {
+			mutex_lock(&dp->mutex);
+			dp_detach_port(vport);
+			mutex_unlock(&dp->mutex);
+		}
 		break;
 
 	case NETDEV_CHANGENAME:
-		if (p->port_no != ODPP_LOCAL) {
+		if (vport->port_no != ODPP_LOCAL) {
 			mutex_lock(&dp->mutex);
-			dp_sysfs_del_if(p);
-			dp_sysfs_add_if(p);
+			dp_sysfs_del_if(vport);
+			dp_sysfs_add_if(vport);
 			mutex_unlock(&dp->mutex);
 		}
 		break;