X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdp_notify.c;h=1415833fdda4a756b32e9194f637a1751324a76c;hb=83c19ab15aa7b2d63632ac9694541759bc8d2351;hp=b6bb90ec7ec415ccd25a00b2b4b6a404c3cd9b8b;hpb=d295e8e97acae13552a5b220d3fbcff8201064a2;p=openvswitch

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index b6bb90ec..1415833f 100644
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -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,24 +29,22 @@ 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, 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;